Merge branch 'hotfix-2.1.1' into 'master'

Hotfix 2.1.1 See merge request hand-yanqianyun-yq-devops/choerodon-starters!19
open-hand · Jul 29, 2022 · 6744467 · 6744467
2 parents b54e41d + ab3f718
commit 6744467
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
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
@@ -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));
     }

diff --git a/choerodon-starter-asgard/pom.xml b/choerodon-starter-asgard/pom.xml
@@ -49,4 +49,4 @@
     </dependencies>
 
 
-</project>
+</project>
diff --git a/choerodon-starter-core/pom.xml b/choerodon-starter-core/pom.xml
@@ -25,4 +25,4 @@
     </dependencies>
 
 
-</project>
+</project>
diff --git a/choerodon-starter-fragment/pom.xml b/choerodon-starter-fragment/pom.xml
@@ -23,4 +23,4 @@
             <artifactId>hzero-starter-core</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/choerodon-starter-only-office/pom.xml b/choerodon-starter-only-office/pom.xml
@@ -53,4 +53,4 @@
 
     </dependencies>
 
-</project>
+</project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,4 +49,4 @@
		</dependencies>


		</project>
		</project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,4 @@
		</dependencies>


		</project>
		</project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,4 +53,4 @@

		</dependencies>

		</project>
		</project>