Merge branch 'release/12.5.3'

iitsoftware · Feb 16, 2023 · 40f3acc · 40f3acc
2 parents b319d34 + 57cd74c
commit 40f3acc
Show file tree

Hide file tree

Showing 34 changed files with 348 additions and 184 deletions.
diff --git a/distribution/disttemplates/router/scripts/preconfigproc b/distribution/disttemplates/router/scripts/preconfigproc
@@ -0,0 +1 @@
+java -cp ../jars/swiftmq.jar com.swiftmq.preconfig.Processor $1 $2
diff --git a/distribution/disttemplates/router/scripts/preconfigproc.bat b/distribution/disttemplates/router/scripts/preconfigproc.bat
@@ -0,0 +1 @@
+java -cp ../jars/swiftmq.jar com.swiftmq.preconfig.Processor %1 %2
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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.swiftmq.swiftlets</groupId>
       <artifactId>sys_xa</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.05.02
+release=12.05.03
 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.5.2</version>
+  <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.swiftmq</groupId>
   <artifactId>router</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq</groupId>
   <artifactId>router</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <dependencies>
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_amqp</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_authentication</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_deploy</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_jms</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_jndi</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</version>
     </dependency>
   </dependencies>
   <build>

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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_log</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_mgmt</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/swiftlets/sys_mgmt/src/main/java/com/swiftmq/impl/mgmt/standard/jmx/EntityMBean.java b/swiftlets/sys_mgmt/src/main/java/com/swiftmq/impl/mgmt/standard/jmx/EntityMBean.java
@@ -22,10 +22,7 @@
 import com.swiftmq.util.SwiftUtilities;
 
 import javax.management.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 public class EntityMBean implements DynamicMBean, EntityWatchListener {
     SwiftletContext ctx = null;
@@ -62,7 +59,7 @@ private void createChildren() {
     private Command findCommand(CommandRegistry cr, String name) {
         if (cr == null)
             return null;
-        ArrayList list = cr.getCommands();
+        List list = cr.getCommands();
         if (list == null)
             return null;
         for (int i = 0; i < list.size(); i++) {
@@ -74,7 +71,7 @@ private Command findCommand(CommandRegistry cr, String name) {
     }
 
     private MBeanAttributeInfo[] createAttributeInfo() {
-        ArrayList list = new ArrayList();
+        List list = new ArrayList();
         Map props = entity.getProperties();
         if (props != null && props.size() > 0) {
             for (Iterator iter = props.entrySet().iterator(); iter.hasNext(); ) {
@@ -90,7 +87,7 @@ private MBeanOperationInfo[] createEntityOperationInfo() {
         ArrayList list = new ArrayList();
         CommandRegistry cmdReg = entity.getCommandRegistry();
         if (cmdReg != null) {
-            ArrayList cmdList = cmdReg.getCommands();
+            List cmdList = cmdReg.getCommands();
             if (cmdList != null) {
                 for (int i = 0; i < cmdList.size(); i++) {
                     Command cmd = (Command) cmdList.get(i);
@@ -103,7 +100,7 @@ private MBeanOperationInfo[] createEntityOperationInfo() {
         if (entity.getParent() != null && entity.getParent() instanceof EntityList) {
             CommandRegistry cr = entity.getParent().getCommandRegistry();
             if (cr != null) {
-                ArrayList al = cr.getCommands();
+                List al = cr.getCommands();
                 if (al != null) {
                     for (int i = 0; i < al.size(); i++) {
                         Command c = (Command) al.get(i);

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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_mqtt</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</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.5.2</version>
+    <version>12.5.3</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <groupId>com.swiftmq.swiftlets</groupId>
   <artifactId>sys_net_netty</artifactId>
-  <version>12.5.2</version>
+  <version>12.5.3</version>
 
   <properties>
       <jar.finalName>${project.artifactId}</jar.finalName>
@@ -39,12 +39,12 @@
     <dependency>
         <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
-      <version>4.1.66.Final</version>
+      <version>4.1.89.Final</version>
     </dependency>
     <dependency>
       <groupId>com.swiftmq</groupId>
       <artifactId>swiftmq-client</artifactId>
-      <version>12.5.2</version>
+      <version>12.5.3</version>
     </dependency>
   </dependencies>
   <build>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		java -cp ../jars/swiftmq.jar com.swiftmq.preconfig.Processor $1 $2