Merge branch 'release/12.3.4'

iitsoftware · Oct 12, 2021 · a215d44 · a215d44
2 parents 1335caa + 9e60c67
commit a215d44
Show file tree

Hide file tree

Showing 28 changed files with 72 additions and 76 deletions.
diff --git a/distribution/disttemplates/router/scripts/checkconfig b/distribution/disttemplates/router/scripts/checkconfig
@@ -16,11 +16,5 @@ if [[ ! -e /swiftmq/data/log ]]; then
    mkdir /swiftmq/data/log
 fi
 
-PWD=`pwd`
-cd /swiftmq/optional-swiftlets/extension
-for D in */; do
-    if [[ ! -e /swiftmq/data/deploy/${D} ]]; then
-        cp -Rf /swiftmq/optional-swiftlets/extension/${D} /swiftmq/data/deploy/. >/dev/null 2>&1
-    fi
-done
+rsync -av /swiftmq/optional-swiftlets/extension/ /swiftmq/data/deploy/
 cd /swiftmq/scripts
diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile
@@ -1,4 +1,5 @@
 FROM ghcr.io/graalvm/graalvm-ce:latest
+RUN microdnf install rsync
 COPY swiftmq.tar.gz /swiftmq.tar.gz
 WORKDIR /
 RUN tar xvfz swiftmq.tar.gz

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -7,7 +7,7 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.swiftmq.swiftlets</groupId>
       <artifactId>sys_xa</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
 

diff --git a/distribution/src/assembly/filter.properties b/distribution/src/assembly/filter.properties
@@ -1,5 +1,5 @@
 vendor=IIT Software GmbH, Muenster, Germany
-release=12.03.03
+release=12.03.04
 distribution=Community Edition
 
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>com.swiftmq</groupId>
   <artifactId>swiftmq-ce</artifactId>
   <packaging>pom</packaging>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <modules>
     <module>router</module>

diff --git a/router/dependency-reduced-pom.xml b/router/dependency-reduced-pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>swiftmq-ce</artifactId>
     <groupId>com.swiftmq</groupId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.swiftmq</groupId>
   <artifactId>router</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
   <build>
     <plugins>
       <plugin>

diff --git a/router/pom.xml b/router/pom.xml
@@ -7,19 +7,19 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq</groupId>
   <artifactId>router</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <dependencies>
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
     <dependency>
       <groupId>org.graalvm.sdk</groupId>

diff --git a/swiftlets/sys_amqp/pom.xml b/swiftlets/sys_amqp/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_amqp</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_authentication/pom.xml b/swiftlets/sys_authentication/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_authentication</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
     <dependency>
         <groupId>org.jasypt</groupId>

diff --git a/swiftlets/sys_deploy/pom.xml b/swiftlets/sys_deploy/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_deploy</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_jms/pom.xml b/swiftlets/sys_jms/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_jms</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_jndi/pom.xml b/swiftlets/sys_jndi/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_jndi</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_jndi/src/main/java/com/swiftmq/impl/jndi/standard/v400/RequestVisitor.java b/swiftlets/sys_jndi/src/main/java/com/swiftmq/impl/jndi/standard/v400/RequestVisitor.java
@@ -74,6 +74,7 @@ private BytesMessageImpl createMessage(Versionable versionable, Destination repl
         msg.setJMSDeliveryMode(javax.jms.DeliveryMode.NON_PERSISTENT);
         msg.setJMSDestination(new TopicImpl(JNDISwiftlet.JNDI_TOPIC));
         msg.setJMSPriority(MessageImpl.MAX_PRIORITY);
+        msg.setJMSExpiration(System.currentTimeMillis() + 60000);
         if (replyTo != null)
             msg.setJMSReplyTo(replyTo);
         msg.setReadOnly(false);

diff --git a/swiftlets/sys_log/pom.xml b/swiftlets/sys_log/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_log</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_mgmt/pom.xml b/swiftlets/sys_mgmt/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_mgmt</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_mqtt/pom.xml b/swiftlets/sys_mqtt/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_mqtt</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_net_netty/pom.xml b/swiftlets/sys_net_netty/pom.xml
@@ -23,13 +23,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_net_netty</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_queuemanager/pom.xml b/swiftlets/sys_queuemanager/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_queuemanager</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_routing/pom.xml b/swiftlets/sys_routing/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_routing</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_scheduler/pom.xml b/swiftlets/sys_scheduler/pom.xml
@@ -6,13 +6,13 @@
   <parent>
   	  <groupId>com.swiftmq</groupId>
 	  <artifactId>swiftmq-ce</artifactId>
-    <version>12.3.3</version>
+    <version>12.3.4</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_scheduler</artifactId>
-  <version>12.3.3</version>
+  <version>12.3.4</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.3.3</version>
+      <version>12.3.4</version>
     </dependency>
   </dependencies>
   <build>