From 29d6df72443ad93ad3f654e4f69f0f2f5c3252cb Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@dlib32.isti.cnr.it>
Date: Wed, 18 Dec 2019 19:00:06 +0100
Subject: [PATCH] ref 18318: Problems in creating a SAI project in
 BlueCloud-Lab VRE

https://support.d4science.org/issues/18318

Updated library org.eclipse.egit.github.core to open-jdk8 and TLSv1.2
---
 .classpath                                    |  7 +++---
 .settings/org.eclipse.jdt.core.prefs          |  3 +++
 .settings/org.eclipse.wst.common.component    |  6 +++++
 ....eclipse.wst.common.project.facet.core.xml |  5 ++++
 .settings/org.eclipse.wst.validation.prefs    |  2 ++
 changelog.xml                                 |  6 +++--
 pom.xml                                       | 24 +++++++++++++++++--
 .../githubconnector/GitHubConnectorTest.java  | 18 +++++++++-----
 8 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 .settings/org.eclipse.wst.common.component
 create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 .settings/org.eclipse.wst.validation.prefs

diff --git a/.classpath b/.classpath
index 7634a17..0664b3f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/github-connector-1.5.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/github-connector-1.5.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/github-connector-1.5.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/github-connector-1.5.3-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -25,8 +25,9 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/github-connector-1.5.2-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/github-connector-1.5.3-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index e52a276..b257af7 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..52669df
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="github-connector">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+    </wb-module>
+</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..1b22d70
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/changelog.xml b/changelog.xml
index 105fca9..527bd65 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,6 +1,8 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.portlets.widgets.githubconnector.1-5-2"
-		date="2019-12-02">
+	<Changeset component="org.gcube.portlets.widgets.githubconnector.1-5-3"
+		date="2019-12-18">
+		<Change>Updated library org.eclipse.egit.github.core to open-jdk8 and
+			TLSv1.2 [ticket #18318]</Change>
 		<Change>Updated to Git and Jenkins</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.widgets.githubconnector.1-5-1"
diff --git a/pom.xml b/pom.xml
index d57ce6c..5f4b03d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>github-connector</artifactId>
-	<version>1.5.2-SNAPSHOT</version>
+	<version>1.5.3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>github-connector</name>
@@ -179,7 +179,13 @@
 		<dependency>
 			<groupId>org.eclipse.mylyn.github</groupId>
 			<artifactId>org.eclipse.egit.github.core</artifactId>
-			<version>2.1.5</version>
+			<version>5.6.0.201912101111-r</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.6</version>
 		</dependency>
 
 
@@ -345,6 +351,20 @@
 		</pluginManagement>
 	</build>
 
+	<repositories>
+		<repository>
+			<id>egit</id>
+			<name>egit</name>
+			<url>https://repo.eclipse.org/content/groups/egit/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
diff --git a/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java b/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java
index 0a9917e..6962a5d 100644
--- a/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java
+++ b/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.widgets.githubconnector;
 
-import java.sql.Blob;
+import org.eclipse.egit.github.core.Blob;
 import java.util.List;
 
 import org.eclipse.egit.github.core.Milestone;
@@ -18,7 +18,7 @@ import org.gcube.portlets.widgets.githubconnector.shared.git.data.credential.Git
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gwt.thirdparty.debugging.sourcemap.Base64;
+//import com.google.gwt.thirdparty.debugging.sourcemap.Base64;
 
 import junit.framework.TestCase;
 
@@ -80,8 +80,11 @@ public class GitHubConnectorTest extends TestCase {
 			 * RepositoryService service = new RepositoryService(); for
 			 * (Repository repo : service.getRepositories("jonan")) {
 			 */
+			/**
+			 * Coveros/helloworld
+			 */
 			RepositoryService service = new RepositoryService();
-			Repository repo = service.getRepository("jonan", "jonan.github.io");
+			Repository repo = service.getRepository("Coveros", "helloworld");
 
 			logger.debug("Repository: [Name=" + repo.getName() + ", Watcher="
 					+ repo.getWatchers() + ", GitUrl=" + repo.getGitUrl() + "]");
@@ -108,9 +111,12 @@ public class GitHubConnectorTest extends TestCase {
 					logger.debug("Blob: [encoding=" + blob.getEncoding()
 							+ ", content=" + blob.getContent() + "]");
 					if (blob.getEncoding().compareToIgnoreCase("base64") == 0) {
-						byte[] content = Base64.decodeBase64(blob.getContent()
-								.getBytes());
-						logger.debug(new String(content));
+						//byte[] content = Base64.decodeBase64(blob.getContent()
+						//		.getBytes());
+						//logger.debug(new String(content));
+						logger.debug("Is base64 encoding");
+					} else {
+						logger.debug("Is encoding: "+blob.getEncoding());
 					}
 				}
 			}