From b189cd0ba7ddcc0c478167f1a5680e0a8bd3376e Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Wed, 24 Jun 2020 16:49:58 +0800
Subject: [PATCH] [dev] change pom to version 3.1.1

---
 others/script/jenkins_auto_build.sh | 9 +++++----
 powerjob-client/pom.xml             | 4 ++--
 powerjob-common/pom.xml             | 2 +-
 powerjob-server/pom.xml             | 4 ++--
 powerjob-worker-agent/pom.xml       | 4 ++--
 powerjob-worker-samples/pom.xml     | 4 ++--
 powerjob-worker/pom.xml             | 4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 others/script/jenkins_auto_build.sh

diff --git a/others/script/jenkins_auto_build.sh b/others/script/jenkins_auto_build.sh
old mode 100644
new mode 100755
index a0b60f6a..1d4e9958
--- a/others/script/jenkins_auto_build.sh
+++ b/others/script/jenkins_auto_build.sh
@@ -29,26 +29,27 @@ docker run -d \
        -e PARAMS="--spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://124.70.67.79:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://124.70.67.79:27017/powerjob-product" \
        -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \
        tjqq/powerjob-server:latest
-echo "================== powerjob-client 启动完成 =================="
-sleep 45
+sleep 60
 echo "================== 准备启动 powerjob-agent =================="
 serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' powerjob-server)
 serverAddress="$serverIP:7700"
 echo "使用的Server地址：$serverAddress"
 
 docker run -d \
+       --restart=always \
        --name powerjob-agent \
        -p 27777:27777 -p 5002:5005 -p 10002:10000 \
        -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
        -e PARAMS="--app powerjob-agent-test --server $serverAddress" \
        -v ~/docker/powerjob-agent:/root \
-       tjqq/powerjob-agent:$version
+       tjqq/powerjob-agent:latest
 
 docker run -d \
        --name powerjob-agent2 \
+       --restart=always \
        -p 27778:27777 -p 5003:5005 -p 10003:10000 \
        -e JVMOPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=10000 -Dcom.sun.management.jmxremote.rmi.port=10000 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" \
        -e PARAMS="--app powerjob-agent-test --server $serverAddress" \
        -v ~/docker/powerjob-agent2:/root \
-       tjqq/powerjob-agent:$version
+       tjqq/powerjob-agent:latest
 
diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml
index 951ca22b..475ca9b9 100644
--- a/powerjob-client/pom.xml
+++ b/powerjob-client/pom.xml
@@ -10,11 +10,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-client</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>jar</packaging>
 
     <properties>
-        <powerjob.common.version>3.1.0</powerjob.common.version>
+        <powerjob.common.version>3.1.1</powerjob.common.version>
         <junit.version>5.6.1</junit.version>
     </properties>
 
diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml
index 0e9d02c1..117fc938 100644
--- a/powerjob-common/pom.xml
+++ b/powerjob-common/pom.xml
@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-common</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml
index 59d9120e..43bdc1bd 100644
--- a/powerjob-server/pom.xml
+++ b/powerjob-server/pom.xml
@@ -10,13 +10,13 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-server</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>jar</packaging>
 
     <properties>
         <swagger.version>2.9.2</swagger.version>
         <springboot.version>2.2.6.RELEASE</springboot.version>
-        <powerjob.common.version>3.1.0</powerjob.common.version>
+        <powerjob.common.version>3.1.1</powerjob.common.version>
         <mysql.version>8.0.19</mysql.version>
         <h2.db.version>1.4.200</h2.db.version>
         <zip4j.version>2.5.2</zip4j.version>
diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml
index 89629745..a8f934da 100644
--- a/powerjob-worker-agent/pom.xml
+++ b/powerjob-worker-agent/pom.xml
@@ -10,12 +10,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker-agent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>jar</packaging>
 
 
     <properties>
-        <powerjob.worker.version>3.1.0</powerjob.worker.version>
+        <powerjob.worker.version>3.1.1</powerjob.worker.version>
         <logback.version>1.2.3</logback.version>
         <picocli.version>4.3.2</picocli.version>
 
diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml
index cb063bd8..618d9c31 100644
--- a/powerjob-worker-samples/pom.xml
+++ b/powerjob-worker-samples/pom.xml
@@ -10,11 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>powerjob-worker-samples</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
 
     <properties>
         <springboot.version>2.2.6.RELEASE</springboot.version>
-        <powerjob.worker.version>3.1.0</powerjob.worker.version>
+        <powerjob.worker.version>3.1.1</powerjob.worker.version>
         <fastjson.version>1.2.68</fastjson.version>
 
         <!-- 部署时跳过该module -->
diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml
index a46e28b2..f9b3c669 100644
--- a/powerjob-worker/pom.xml
+++ b/powerjob-worker/pom.xml
@@ -10,12 +10,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>powerjob-worker</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>jar</packaging>
 
     <properties>
         <spring.version>5.2.4.RELEASE</spring.version>
-        <powerjob.common.version>3.1.0</powerjob.common.version>
+        <powerjob.common.version>3.1.1</powerjob.common.version>
         <h2.db.version>1.4.200</h2.db.version>
         <hikaricp.version>3.4.2</hikaricp.version>
         <junit.version>5.6.1</junit.version>