升级gitlab

512team · Nov 27, 2022 · 0d9b82b · 0d9b82b
1 parent b68cd04
commit 0d9b82b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ructure/src/main/java/org/dhorse/infrastructure/strategy/repo/GitLabCodeRepoStrategy.java b/...ructure/src/main/java/org/dhorse/infrastructure/strategy/repo/GitLabCodeRepoStrategy.java
@@ -40,7 +40,7 @@ public class GitLabCodeRepoStrategy extends CodeRepoStrategy {
 
 	@Override
 	public boolean doDownloadBranch(DeployContext context) {
-		int appId = Integer.parseInt(context.getApp().getCodeRepoPath());
+		String appId = context.getApp().getCodeRepoPath();
 		String branchName = context.getBranchName();
 		GitLabApi gitLabApi = gitLabApi(context.getGlobalConfigAgg().getCodeRepo());
 		try {
@@ -103,7 +103,7 @@ public void mergeBranch(DeployContext context) {
 		MergeRequestApi mergeRequestApi = gitLabApi.getMergeRequestApi();
 		MergeRequestFilter filter = new MergeRequestFilter();
 		filter.setState(MergeRequestState.OPENED);
-		filter.setProjectId(Integer.valueOf(context.getApp().getCodeRepoPath()));
+		filter.setProjectId(Long.valueOf(context.getApp().getCodeRepoPath()));
 		MergeRequest mergeRequest = null;
 		try {
 			//1.如果存在未合并的请求，直接报错

diff --git a/pom.xml b/pom.xml
@@ -108,7 +108,7 @@
 			<dependency>
 				<groupId>org.gitlab4j</groupId>
 				<artifactId>gitlab4j-api</artifactId>
-				<version>4.17.0</version>
+				<version>5.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
@@ -138,7 +138,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>30.1.1-jre</version>
+				<version>31.1-jre</version>
 			</dependency>
 			<dependency>
 				<groupId>io.kubernetes</groupId>