Correct paths for public git lib

jazz-community · May 13, 2018 · 7285be6 · 7285be6
1 parent 00e7084
commit 7285be6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
@@ -47,7 +47,7 @@ Bundle-ClassPath: target/dependency/gson-2.8.2.jar,
  target/dependency/jtwig-reflection-5.86.1.RELEASE.jar,
  target/dependency/parboiled-core-1.1.7.jar,
  target/dependency/parboiled-java-1.1.7.jar,
- target/dependency/gitlib-0.0.1-SNAPSHOT.jar,
+ target/dependency/minigit-1.0.0-SNAPSHOT.jar,
  target/dependency/commonmark-0.11.0.jar,
  target/java-gen,
  .

diff --git a/...src/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/CommitLinkService.java b/...src/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/CommitLinkService.java
@@ -1,5 +1,8 @@
 package org.jazzcommunity.GitConnectorService.builder.gitlab;
 
+import ch.sbi.minigit.gitlab.GitlabApi;
+import ch.sbi.minigit.type.gitlab.commit.Commit;
+import ch.sbi.minigit.type.gitlab.project.Project;
 import com.ibm.team.repository.service.TeamRawService;
 import com.siemens.bt.jazz.services.base.rest.AbstractRestService;
 import com.siemens.bt.jazz.services.base.rest.RestRequest;
@@ -8,9 +11,6 @@
 import org.jazzcommunity.GitConnectorService.net.Request;
 import org.jazzcommunity.GitConnectorService.net.UrlBuilder;
 import org.jazzcommunity.GitConnectorService.net.UrlParameters;
-import org.jazzcommunity.gitlib.gitlab.GitlabApi;
-import org.jazzcommunity.gitlib.type.gitlab.commit.Commit;
-import org.jazzcommunity.gitlib.type.gitlab.project.Project;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
 

diff --git a/.../main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/CommitPreviewService.java b/.../main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/CommitPreviewService.java
@@ -1,5 +1,7 @@
 package org.jazzcommunity.GitConnectorService.builder.gitlab;
 
+import ch.sbi.minigit.gitlab.GitlabApi;
+import ch.sbi.minigit.type.gitlab.commit.Commit;
 import java.io.IOException;
 import java.net.URL;
 
@@ -10,12 +12,9 @@
 import com.siemens.bt.jazz.services.base.rest.AbstractRestService;
 import com.siemens.bt.jazz.services.base.rest.RestRequest;
 import org.apache.commons.logging.Log;
-import org.apache.http.auth.AuthenticationException;
 import org.jazzcommunity.GitConnectorService.data.TokenHelper;
 import org.jazzcommunity.GitConnectorService.net.Request;
 import org.jazzcommunity.GitConnectorService.net.UrlParameters;
-import org.jazzcommunity.gitlib.gitlab.GitlabApi;
-import org.jazzcommunity.gitlib.type.gitlab.commit.Commit;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
 

diff --git a/.../src/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/IssueLinkService.java b/.../src/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/IssueLinkService.java
@@ -1,6 +1,7 @@
 package org.jazzcommunity.GitConnectorService.builder.gitlab;
 
-import com.google.gson.GsonBuilder;
+import ch.sbi.minigit.gitlab.GitlabApi;
+import ch.sbi.minigit.type.gitlab.issue.Issue;
 import com.ibm.team.repository.service.TeamRawService;
 import com.siemens.bt.jazz.services.base.rest.AbstractRestService;
 import com.siemens.bt.jazz.services.base.rest.RestRequest;
@@ -10,8 +11,6 @@
 import org.jazzcommunity.GitConnectorService.net.Request;
 import org.jazzcommunity.GitConnectorService.net.UrlBuilder;
 import org.jazzcommunity.GitConnectorService.net.UrlParameters;
-import org.jazzcommunity.gitlib.gitlab.GitlabApi;
-import org.jazzcommunity.gitlib.type.gitlab.issue.Issue;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
 

diff --git a/...c/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/IssuePreviewService.java b/...c/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/IssuePreviewService.java
@@ -1,5 +1,7 @@
 package org.jazzcommunity.GitConnectorService.builder.gitlab;
 
+import ch.sbi.minigit.gitlab.GitlabApi;
+import ch.sbi.minigit.type.gitlab.issue.Issue;
 import com.ibm.team.repository.service.TeamRawService;
 import com.siemens.bt.jazz.services.base.rest.AbstractRestService;
 import com.siemens.bt.jazz.services.base.rest.RestRequest;
@@ -8,8 +10,6 @@
 import org.jazzcommunity.GitConnectorService.html.MarkdownParser;
 import org.jazzcommunity.GitConnectorService.net.Request;
 import org.jazzcommunity.GitConnectorService.net.UrlParameters;
-import org.jazzcommunity.gitlib.gitlab.GitlabApi;
-import org.jazzcommunity.gitlib.type.gitlab.issue.Issue;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
 

diff --git a/...rc/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/RequestLinkService.java b/...rc/main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/RequestLinkService.java
@@ -1,5 +1,6 @@
 package org.jazzcommunity.GitConnectorService.builder.gitlab;
 
+import ch.sbi.minigit.type.gitlab.mergerequest.MergeRequest;
 import com.ibm.team.repository.service.TeamRawService;
 import com.siemens.bt.jazz.services.base.rest.AbstractRestService;
 import com.siemens.bt.jazz.services.base.rest.RestRequest;
@@ -9,8 +10,7 @@
 import org.jazzcommunity.GitConnectorService.net.Request;
 import org.jazzcommunity.GitConnectorService.net.UrlBuilder;
 import org.jazzcommunity.GitConnectorService.net.UrlParameters;
-import org.jazzcommunity.gitlib.gitlab.GitlabApi;
-import org.jazzcommunity.gitlib.type.gitlab.mergerequest.MergeRequest;
+import ch.sbi.minigit.gitlab.GitlabApi;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;
 

diff --git a/...main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/RequestPreviewService.java b/...main/java/org/jazzcommunity/GitConnectorService/builder/gitlab/RequestPreviewService.java
@@ -1,5 +1,7 @@
 package org.jazzcommunity.GitConnectorService.builder.gitlab;
 
+import ch.sbi.minigit.gitlab.GitlabApi;
+import ch.sbi.minigit.type.gitlab.mergerequest.MergeRequest;
 import com.ibm.team.repository.service.TeamRawService;
 import com.siemens.bt.jazz.services.base.rest.AbstractRestService;
 import com.siemens.bt.jazz.services.base.rest.RestRequest;
@@ -8,8 +10,6 @@
 import org.jazzcommunity.GitConnectorService.html.MarkdownParser;
 import org.jazzcommunity.GitConnectorService.net.Request;
 import org.jazzcommunity.GitConnectorService.net.UrlParameters;
-import org.jazzcommunity.gitlib.gitlab.GitlabApi;
-import org.jazzcommunity.gitlib.type.gitlab.mergerequest.MergeRequest;
 import org.jtwig.JtwigModel;
 import org.jtwig.JtwigTemplate;