From d6b8ab9fab6dd45705caae915d0dbe79bd5d2286 Mon Sep 17 00:00:00 2001 From: wangxiang Date: Thu, 14 Jul 2022 23:41:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- choerodon-gitlab4j-api/pom.xml | 2 +- .../src/main/java/org/gitlab4j/api/RepositoryApi.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/choerodon-gitlab4j-api/pom.xml b/choerodon-gitlab4j-api/pom.xml index 8af64ff1..171579fe 100644 --- a/choerodon-gitlab4j-api/pom.xml +++ b/choerodon-gitlab4j-api/pom.xml @@ -4,7 +4,7 @@ 4.0.0 choerodon-gitlab4j-api - 2.1.0.RELEASE + 2.1.1.RELEASE jar choerodon-gitlab4j-api GitLab API Java Client diff --git a/choerodon-gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java b/choerodon-gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java index 5dcb8c2d..61e1e96e 100644 --- a/choerodon-gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java +++ b/choerodon-gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java @@ -464,7 +464,7 @@ public InputStream getRawBlobContent(Integer projectId, String sha) throws GitLa */ public InputStream getRepositoryArchive(Integer projectId, String sha) throws GitLabApiException { Form formData = new GitLabApiForm().withParam("sha", sha); - Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD, + Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD, "projects", projectId, "repository", "archive"); return (response.readEntity(InputStream.class)); } From a947debbd03f12d6461601ebd88b9f20a0a70895 Mon Sep 17 00:00:00 2001 From: wangxiang Date: Fri, 15 Jul 2022 09:02:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40363e9b..083dcf84 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.choerodon choerodon-starter-parent - 2.1.0.RELEASE + 2.1.1.RELEASE pom From d0228564e0f1532c8e5a68006318b9dfa1302c59 Mon Sep 17 00:00:00 2001 From: wangxiang Date: Fri, 15 Jul 2022 09:54:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=20=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- choerodon-gitlab4j-api/pom.xml | 2 +- choerodon-starter-asgard/pom.xml | 2 +- choerodon-starter-core/pom.xml | 2 +- choerodon-starter-fragment/pom.xml | 2 +- choerodon-starter-limit/pom.xml | 2 +- choerodon-starter-nacos-client/pom.xml | 2 +- choerodon-starter-only-office/pom.xml | 4 ++-- choerodon-tool-liquibase/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/choerodon-gitlab4j-api/pom.xml b/choerodon-gitlab4j-api/pom.xml index 171579fe..af2ebb89 100644 --- a/choerodon-gitlab4j-api/pom.xml +++ b/choerodon-gitlab4j-api/pom.xml @@ -21,7 +21,7 @@ io.choerodon choerodon-starter-parent - 2.1.0.RELEASE + 2.1.1.RELEASE package diff --git a/choerodon-starter-asgard/pom.xml b/choerodon-starter-asgard/pom.xml index 1e30d65b..4c53b864 100644 --- a/choerodon-starter-asgard/pom.xml +++ b/choerodon-starter-asgard/pom.xml @@ -5,7 +5,7 @@ choerodon-starter-parent io.choerodon - 2.1.0.RELEASE + 2.1.1.RELEASE 4.0.0 diff --git a/choerodon-starter-core/pom.xml b/choerodon-starter-core/pom.xml index 19dee883..7aa9ebf9 100644 --- a/choerodon-starter-core/pom.xml +++ b/choerodon-starter-core/pom.xml @@ -5,7 +5,7 @@ choerodon-starter-parent io.choerodon - 2.1.0.RELEASE + 2.1.1.RELEASE 4.0.0 diff --git a/choerodon-starter-fragment/pom.xml b/choerodon-starter-fragment/pom.xml index ea318fc9..600fbe73 100644 --- a/choerodon-starter-fragment/pom.xml +++ b/choerodon-starter-fragment/pom.xml @@ -5,7 +5,7 @@ choerodon-starter-parent io.choerodon - 2.1.0.RELEASE + 2.1.1.RELEASE 4.0.0 diff --git a/choerodon-starter-limit/pom.xml b/choerodon-starter-limit/pom.xml index 7ccac26a..793642c7 100644 --- a/choerodon-starter-limit/pom.xml +++ b/choerodon-starter-limit/pom.xml @@ -4,7 +4,7 @@ choerodon-starter-parent io.choerodon - 2.1.0.RELEASE + 2.1.1.RELEASE 4.0.0 diff --git a/choerodon-starter-nacos-client/pom.xml b/choerodon-starter-nacos-client/pom.xml index b1827937..6d5d4aa9 100644 --- a/choerodon-starter-nacos-client/pom.xml +++ b/choerodon-starter-nacos-client/pom.xml @@ -19,7 +19,7 @@ choerodon-starter-parent io.choerodon - 2.1.0.RELEASE + 2.1.1.RELEASE 4.0.0 diff --git a/choerodon-starter-only-office/pom.xml b/choerodon-starter-only-office/pom.xml index 2a21cba2..3d8638be 100644 --- a/choerodon-starter-only-office/pom.xml +++ b/choerodon-starter-only-office/pom.xml @@ -5,12 +5,12 @@ choerodon-starter-parent io.choerodon - 2.1.0.RELEASE + 2.1.1.RELEASE 4.0.0 choerodon-starter-only-office - 2.1.0.RELEASE + 2.1.1.RELEASE diff --git a/choerodon-tool-liquibase/pom.xml b/choerodon-tool-liquibase/pom.xml index 6872d27b..1ff2b00a 100644 --- a/choerodon-tool-liquibase/pom.xml +++ b/choerodon-tool-liquibase/pom.xml @@ -5,7 +5,7 @@ io.choerodon choerodon-starter-parent - 2.1.0.RELEASE + 2.1.1.RELEASE choerodon-tool-liquibase