diff --git a/.classpath b/.classpath index 7634a17..0664b3f 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -25,8 +25,9 @@ + - + 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 @@ + + + + + + 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 @@ + + + + + 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 @@ - + + Updated library org.eclipse.egit.github.core to open-jdk8 and + TLSv1.2 [ticket #18318] Updated to Git and Jenkins org.gcube.portlets.widgets github-connector - 1.5.2-SNAPSHOT + 1.5.3-SNAPSHOT jar github-connector @@ -179,7 +179,13 @@ org.eclipse.mylyn.github org.eclipse.egit.github.core - 2.1.5 + 5.6.0.201912101111-r + + + + com.google.code.gson + gson + 2.8.6 @@ -345,6 +351,20 @@ + + + egit + egit + https://repo.eclipse.org/content/groups/egit/ + + true + + + false + + + + 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()); } } }