upgrade snakeyaml to 2.0 (#331)

* upgrade snakeyaml * format code * exclude jackson-core-asl * remove snakeyaml
WeDataSphere · Nov 7, 2023 · ce058bd · ce058bd
1 parent b393fe4
commit ce058bd
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -542,7 +542,7 @@ public Message taskprediction(
       @RequestParam(value = "clustername", required = false) String clusterName,
       @RequestParam(value = "queueName", required = false) String queueName,
       @RequestParam(value = "tenant", required = false) String tenant)
-          throws PersistenceErrorException, RMErrorException {
+      throws PersistenceErrorException, RMErrorException {
     String tokenName = ModuleUserUtils.getOperationUser(req, "taskprediction");
     if (StringUtils.isBlank(username)) {
       username = tokenName;

diff --git a/linkis-dist/pom.xml b/linkis-dist/pom.xml
@@ -52,6 +52,10 @@
           <groupId>com.google.code.findbugs</groupId>
           <artifactId>jsr305</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jackson-core-asl</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 

diff --git a/linkis-engineconn-plugins/flink/pom.xml b/linkis-engineconn-plugins/flink/pom.xml
@@ -319,6 +319,10 @@
           <groupId>com.google.protobuf</groupId>
           <artifactId>protobuf-java</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jackson-core-asl</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -456,6 +460,12 @@
       <version>2.0.0</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>2.0</version>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/linkis-engineconn-plugins/sqoop/pom.xml b/linkis-engineconn-plugins/sqoop/pom.xml
@@ -91,6 +91,10 @@
           <groupId>org.apache.avro</groupId>
           <artifactId>avro</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jackson-core-asl</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

diff --git a/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml
@@ -79,6 +79,10 @@
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>snakeyaml</artifactId>
+          <groupId>org.yaml</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml
@@ -48,6 +48,10 @@
           <groupId>org.springframework.cloud</groupId>
           <artifactId>spring-cloud-starter-gateway</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jackson-core-asl</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -925,6 +925,12 @@
         <version>${spring.boot.version}</version>
         <type>pom</type>
         <scope>import</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.springframework.cloud</groupId>
@@ -997,6 +1003,10 @@
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.yaml</groupId>
+          <artifactId>snakeyaml</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -1015,11 +1025,6 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
-    </dependency>
   </dependencies>
 
   <build>