153 rename orgapacheactivemqxx to orgapacheartemisxx

.github/dependabot.yml

@@ -34,3 +34,30 @@ updates:
   - dependency-name: org.springframework:spring-core
     versions:
     - 5.3.5
+  # Ignore these until we move to Jakarta
+  - dependency-name: 'org.apache.activemq:activemq-client'
+    versions:
+    - '>= 6'
+  - dependency-name: 'org.apache.activemq:activemq-openwire-legacy'
+    versions:
+    - '>= 6'
+  - dependency-name: 'org.apache.activemq:activemq-broker'
+    versions:
+    - '>= 6'
+  - dependency-name: 'org.apache.activemq:activemq-kahadb-store'
+    versions:
+    - '>= 6'
+  - dependency-name: 'org.apache.activemq:activemq-spring'
+    versions:
+    - '>= 6'
+  - dependency-name: 'org.apache.activemq:activemq-amqp'
+    versions:
+    - '>= 6'
+  # graalvm changed a lot in 24.x
+  - dependency-name: 'org.graalvm.js:js'
+    versions:
+    - '>= 24'
+  # this fails from that version
+  - dependency-name: 'com.fasterxml.jackson.core:jackson-databind'
+    versions:
+    - '>= 2.22'

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/maven.yml

@@ -16,9 +16,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
+        distribution: 'temurin'
+        cache: 'maven'
+
     - name: Build with Maven
       run: mvn -B package --file pom.xml

pom.xml

@@ -5,14 +5,14 @@
   <version>1.6.1-SNAPSHOT</version>
 
   <properties>
-    <activemq.version>5.18.1</activemq.version>
-    <spring.version>5.3.27</spring.version>
+    <activemq.version>5.19.7</activemq.version>
+    <spring.version>7.0.7</spring.version>
     <deb.lib.dir>/usr/share/${project.artifactId}/lib</deb.lib.dir>
     <deb.bin>/usr/bin/${project.artifactId}</deb.bin>
     <deb.skip>true</deb.skip>
-    <artemis.version>2.28.0</artemis.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <artemis.version>2.54.0</artemis.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -26,27 +26,27 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-openwire-legacy</artifactId>
       <version>${activemq.version}</version>
-  </dependency>
+    </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
+      <version>1.11.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.11.0</version>
+      <version>2.22.0</version>
     </dependency>
     <dependency>
-	    <groupId>commons-codec</groupId>
-	    <artifactId>commons-codec</artifactId>
-	    <version>1.16.0</version>
-	 </dependency>
-	 <dependency>
-	    <groupId>org.apache.commons</groupId>
-	    <artifactId>commons-lang3</artifactId>
-	    <version>3.12.0</version>
-	 </dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.22.0</version>
+   </dependency>
+   <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.20.0</version>
+   </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -55,49 +55,49 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.11</version>
+      <version>1.5.34</version>
     </dependency>
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-amqp-1-0-client-jms</artifactId>
       <version>0.32</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.artemis</groupId>
       <artifactId>artemis-jms-client</artifactId>
       <version>${artemis.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.activemq</groupId>
+      <groupId>org.apache.artemis</groupId>
       <artifactId>artemis-jms-server</artifactId>
       <version>${artemis.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.logmanager</groupId>
       <artifactId>jboss-logmanager</artifactId>
-      <version>2.1.19.Final</version>
+      <version>3.2.2.Final</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-  		<groupId>com.eclipsesource.minimal-json</groupId>
-  		<artifactId>minimal-json</artifactId>
-  		<version>0.9.5</version>
-  	</dependency>
+      <groupId>com.eclipsesource.minimal-json</groupId>
+      <artifactId>minimal-json</artifactId>
+      <version>0.9.5</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.15.2</version>
+      <version>2.21.4</version>
     </dependency>
     <dependency>
       <groupId>org.graalvm.js</groupId>
       <artifactId>js</artifactId>
-      <version>22.3.2</version>
+      <version>23.0.12</version>
     </dependency>
     <dependency>
       <groupId>org.graalvm.js</groupId>
       <artifactId>js-scriptengine</artifactId>
-      <version>22.3.2</version>
+      <version>25.0.3</version>
     </dependency>
 
     <!-- Test dependencies -->
@@ -202,7 +202,7 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
-      <version>4.23</version>
+      <version>4.30</version>
       <scope>test</scope>
     </dependency>
 
@@ -261,7 +261,7 @@
       <plugin>
         <artifactId>jdeb</artifactId>
         <groupId>org.vafer</groupId>
-        <version>1.10</version>
+        <version>1.14</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -307,7 +307,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.15.0</version>
         <configuration>
           <compilerArgs>
             <arg>-Xlint:all</arg>

src/main/java/co/nordlander/a/A.java

@@ -262,7 +262,8 @@ protected void executeMove(CommandLine cmdLine) throws JMSException,
 				DEFAULT_WAIT));
 		int j = 0;
 		while (j < count || count == 0) {
-			Message msg = mq.receive(wait);
+			// some message system do not properly handle receive(0)
+			Message msg = wait == 0 ? mq.receive() : mq.receive(wait);
 			if (msg == null) {
 				output("No message received, due to the timeout expiring or the consumer is closed");
 				break;
@@ -423,7 +424,8 @@ protected void executeGet(final CommandLine cmdLine) throws JMSException,
 				DEFAULT_WAIT));
 		int i = 0;
 		while (i < count || count == 0) {
-			Message msg = mq.receive(wait);
+			// some message system do not properly handle receive(0)
+			Message msg = wait == 0 ? mq.receive() : mq.receive(wait);
 			if (msg == null) {
 				output("No message received");
 				break;
@@ -614,7 +616,8 @@ protected List<Message> consumeMessages(CommandLine cmdLine) throws JMSException
 		List<Message> msgs = new ArrayList<>();
 		int i = 0;
 		while (i < count || count == 0) {
-			Message msg = mq.receive(wait);
+			// some message system do not properly handle receive(0)
+			Message msg = wait == 0 ? mq.receive() : mq.receive(wait);
 			if (msg == null) {
 				break;
 			} else {