1. update version to '0.3.1'

2. update linkis version to '1.5.0' 3. refactor pom.xml
WeBankFinTech · Jun 5, 2024 · e2f56e7 · e2f56e7
1 parent 49d496f
commit e2f56e7
Show file tree

Hide file tree

Showing 35 changed files with 55 additions and 95 deletions.
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/conf/config.sh b/conf/config.sh
@@ -40,6 +40,6 @@ GATEWAY_PORT=9001
 STREAMIS_SERVER_INSTALL_IP=127.0.0.1
 STREAMIS_SERVER_INSTALL_PORT=9400
 
-STREAMIS_VERSION=0.3.1-SNAPSHOT
+STREAMIS_VERSION=0.3.1
 
 STREAMIS_FILE_NAME="STREAMIS-$STREAMIS_VERSION"
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>com.webank.wedatasphere.streamis</groupId>
     <artifactId>streamis</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
+    <version>0.3.1</version>
     <packaging>pom</packaging>
 
     <name>Streamis Project Parent POM</name>
@@ -45,10 +45,10 @@
     </modules>
 
     <properties>
-        <linkis.version>1.5.0</linkis.version>
+        <linkis.version>1.4.0</linkis.version>
         <junit.version>4.12</junit.version>
         <dss.version>1.1.0.18-SNAPSHOT</dss.version>
-        <streamis.version>0.3.1-SNAPSHOT</streamis.version>
+        <streamis.version>0.3.1</streamis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>

diff --git a/streamis-appconn/pom.xml b/streamis-appconn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/streamis-jobmanager/pom.xml b/streamis-jobmanager/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/streamis-jobmanager/streamis-job-audit-log/pom.xml b/streamis-jobmanager/streamis-job-audit-log/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/streamis-jobmanager/streamis-job-entrypoint/pom.xml b/streamis-jobmanager/streamis-job-entrypoint/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-common/pom.xml b/streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-job-entrypoint</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-jobmanager-common</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-flink/pom.xml b/streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-flink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-entrypoint-common</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.1</version>
         </dependency>
     </dependencies>
 

diff --git a/streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-spark/pom.xml b/streamis-jobmanager/streamis-job-entrypoint/streamis-job-entrypoint-spark/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-entrypoint-common</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.1</version>
         </dependency>
     </dependencies>
 

diff --git a/streamis-jobmanager/streamis-job-errorcode/pom.xml b/streamis-jobmanager/streamis-job-errorcode/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/streamis-jobmanager/streamis-job-launcher/pom.xml b/streamis-jobmanager/streamis-job-launcher/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-base/pom.xml b/streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-base/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -48,11 +48,6 @@
             <groupId>org.apache.linkis</groupId>
             <artifactId>linkis-mybatis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.webank.wedatasphere.streamis</groupId>
-            <artifactId>streamis-job-manager-base</artifactId>
-            <version>${jobmanager.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>
             <artifactId>linkis-module</artifactId>

diff --git a/streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-linkis/pom.xml b/streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-linkis/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-job-launcher</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-launcher-base</artifactId>
-            <version>${jobmanager.version}</version>
+            <version>${streamis.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-errorcode</artifactId>
-            <version>${jobmanager.version}</version>
+            <version>${streamis.version}</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-service/pom.xml b/streamis-jobmanager/streamis-job-launcher/streamis-job-launcher-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-launcher-linkis</artifactId>
-            <version>${jobmanager.version}</version>
+            <version>${streamis.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>
@@ -45,12 +45,12 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-launcher-base</artifactId>
-            <version>${jobmanager.version}</version>
+            <version>${streamis.version}</version>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-manager-base</artifactId>
-            <version>${jobmanager.version}</version>
+            <version>${streamis.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>

diff --git a/streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/pom.xml b/streamis-jobmanager/streamis-job-log/job-log-collector/flink-streamis-log-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...mis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector-core/pom.xml b/...mis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector/pom.xml b/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector1x/pom.xml b/streamis-jobmanager/streamis-job-log/job-log-collector/streamis-job-log-collector1x/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/streamis-jobmanager/streamis-job-log/job-log-collector/xspark-streamis-log-collector/pom.xml b/streamis-jobmanager/streamis-job-log/job-log-collector/xspark-streamis-log-collector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/streamis-jobmanager/streamis-job-log/pom.xml b/streamis-jobmanager/streamis-job-log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/streamis-jobmanager/streamis-job-log/streamis-job-log-common/pom.xml b/streamis-jobmanager/streamis-job-log/streamis-job-log-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/streamis-jobmanager/streamis-job-log/streamis-job-log-server/pom.xml b/streamis-jobmanager/streamis-job-log/streamis-job-log-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>streamis-job-log</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-log-common</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.streamis</groupId>
             <artifactId>streamis-job-manager-base</artifactId>
-            <version>0.3.1-SNAPSHOT</version>
+            <version>0.3.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/...ank/wedatasphere/streamis/jobmanager/log/server/service/DefaultStreamisJobLogService.java b/...ank/wedatasphere/streamis/jobmanager/log/server/service/DefaultStreamisJobLogService.java
diff --git a/streamis-jobmanager/streamis-job-manager/pom.xml b/streamis-jobmanager/streamis-job-manager/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/pom.xml b/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>streamis-jobmanager</artifactId>
         <groupId>com.webank.wedatasphere.streamis</groupId>
-        <version>0.3.1-SNAPSHOT</version>
+        <version>0.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>