Merge branch 'dev-1.1.17' of github.com:WeDataSphere/DataSphereStudio…

… into dev-1.1.17
WeDataSphere · Nov 14, 2023 · cd9db80 · cd9db80
2 parents fdcadf5 + aca8ff6
commit cd9db80
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
@@ -52,8 +52,16 @@
                     <artifactId>hibernate-validator</artifactId>
                     <groupId>org.hibernate.validator</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>xstream</artifactId>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <artifactId>xstream</artifactId>
+            <groupId>com.thoughtworks.xstream</groupId>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>

diff --git a/...rc/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java b/...rc/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
@@ -245,6 +245,9 @@ public List<AppConn> listAppConns() {
     @Override
     public AppConn getAppConn(String appConnName) {
         lazyLoadAppConns();
+        if(appConns.isEmpty()){
+            throw new AppConnWarnException(25344,"appconn list has not been loaded,please try again later.");
+        }
         return appConns.get(appConnName.toLowerCase());
     }
 

diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
@@ -341,11 +341,6 @@
 <!--            </exclusions>-->
 <!--        </dependency>-->
 
-        <dependency>
-            <artifactId>xstream</artifactId>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <version>1.4.19</version>
-        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-sso-integration-standard</artifactId>

diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
@@ -67,6 +67,10 @@
                     <artifactId>linkis-common</artifactId>
                     <groupId>org.apache.linkis</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>xstream</artifactId>
+                    <groupId>com.thoughtworks.xstream</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -226,11 +230,6 @@
             <version>1.5.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <artifactId>xstream</artifactId>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <version>1.4.19</version>
-        </dependency>
 
     </dependencies>
     <build>

diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <commons.math.version>3.1.1</commons.math.version>
         <commons.lang3.version>3.8.1</commons.lang3.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <xstream.version>1.4.19</xstream.version>
+        <xstream.version>1.4.20</xstream.version>
         <jersey.version>2.30.1</jersey.version>
     </properties>