diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2b3b887..89f8644 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -34,3 +34,26 @@ 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'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3df33b0..47f5403 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.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
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 74c342f..074d7e4 100644
--- a/.github/workflows/maven.yml
+++ b/.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
diff --git a/pom.xml b/pom.xml
index f547d28..79fe643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
1.6.1-SNAPSHOT
- 5.18.1
- 5.3.27
+ 5.19.7
+ 7.0.7
/usr/share/${project.artifactId}/lib
/usr/bin/${project.artifactId}
true
- 2.28.0
- 11
- 11
+ 2.54.0
+ 17
+ 17
UTF-8
@@ -26,27 +26,27 @@
org.apache.activemq
activemq-openwire-legacy
${activemq.version}
-
+
commons-cli
commons-cli
- 1.5.0
+ 1.11.0
commons-io
commons-io
- 2.11.0
+ 2.20.0
- commons-codec
- commons-codec
- 1.16.0
-
-
- org.apache.commons
- commons-lang3
- 3.12.0
-
+ commons-codec
+ commons-codec
+ 1.19.0
+
+
+ org.apache.commons
+ commons-lang3
+ 3.20.0
+
org.apache.geronimo.specs
geronimo-jms_1.1_spec
@@ -55,7 +55,7 @@
ch.qos.logback
logback-classic
- 1.4.11
+ 1.5.34
org.apache.qpid
@@ -76,28 +76,28 @@
org.jboss.logmanager
jboss-logmanager
- 2.1.19.Final
+ 3.1.2.Final
test
- com.eclipsesource.minimal-json
- minimal-json
- 0.9.5
-
+ com.eclipsesource.minimal-json
+ minimal-json
+ 0.9.5
+
com.fasterxml.jackson.core
jackson-databind
- 2.15.2
+ 2.19.2
org.graalvm.js
js
- 22.3.2
+ 23.0.12
org.graalvm.js
js-scriptengine
- 22.3.2
+ 25.0.3
@@ -202,7 +202,7 @@
org.apache.xbean
xbean-spring
- 4.23
+ 4.27
test
@@ -261,7 +261,7 @@
jdeb
org.vafer
- 1.10
+ 1.14
package
@@ -307,7 +307,7 @@
maven-compiler-plugin
- 3.11.0
+ 3.15.0
-Xlint:all
diff --git a/src/main/java/co/nordlander/a/A.java b/src/main/java/co/nordlander/a/A.java
index 1e6abd2..1124a52 100755
--- a/src/main/java/co/nordlander/a/A.java
+++ b/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 consumeMessages(CommandLine cmdLine) throws JMSException
List 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 {