This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-openwire.git
The following commit(s) were added to refs/heads/main by this push:
new 22a33ee OPENWIRE-66 - Bring project build up to date (#3)
22a33ee is described below
commit 22a33eefc19e6c0403bb6530172a8bb9772e649d
Author: Christopher L. Shannon <christopher.l.shan...@gmail.com>
AuthorDate: Wed Dec 6 16:19:35 2023 -0500
OPENWIRE-66 - Bring project build up to date (#3)
This brings the build up to date by upgrading maven plugins, dependences
and to JDK 17. It also updates to ActiveMQ 6.0.1 for testing and
jakarta. This comimt is just for the build itself and future updates
will add the latest versions of OpenWire.
---
openwire-annotations/pom.xml | 2 +-
openwire-core/pom.xml | 6 +-
openwire-core/src/test/resources/log4j.properties | 41 -----------
.../src/test/resources/log4j2-test.properties | 54 ++++++++++++++
openwire-generator/pom.xml | 6 +-
.../openwire/generator/GeneratorUtils.java | 22 +++---
.../src/main/resources/log4j.properties | 35 ---------
.../src/main/resources/log4j2.properties | 54 ++++++++++++++
openwire-interop-tests/pom.xml | 7 +-
.../openwire/codec/MessageCompressionTest.java | 10 +--
.../openwire/codec/OpenWireInteropTestSupport.java | 2 +-
.../src/test/resources/log4j.properties | 41 -----------
.../src/test/resources/log4j2-test.properties | 54 ++++++++++++++
openwire-legacy/pom.xml | 2 +-
openwire-website/pom.xml | 6 +-
pom.xml | 86 +++++++++++-----------
16 files changed, 232 insertions(+), 196 deletions(-)
diff --git a/openwire-annotations/pom.xml b/openwire-annotations/pom.xml
index af29c42..957438f 100644
--- a/openwire-annotations/pom.xml
+++ b/openwire-annotations/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>openwire-protocol</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwire-annotations</artifactId>
diff --git a/openwire-core/pom.xml b/openwire-core/pom.xml
index 8b6d99c..1a0f995 100644
--- a/openwire-core/pom.xml
+++ b/openwire-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>openwire-protocol</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwire-core</artifactId>
@@ -54,8 +54,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/openwire-core/src/test/resources/log4j.properties
b/openwire-core/src/test/resources/log4j.properties
deleted file mode 100644
index 0588275..0000000
--- a/openwire-core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-log4j.logger.org.apache.activemq.openwire=DEBUG
-
-# Tune the ActiveMQ and it's OpenWire transport as needed for debugging.
-log4j.logger.org.apache.activemq=INFO
-log4j.logger.org.apache.activemq.broker=DEBUG
-log4j.logger.org.apache.activemq.transport.openwire=TRACE
-log4j.logger.org.apache.activemq.transport.openwire.FRAMES=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p
%-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/activemq-test.log
-log4j.appender.out.append=true
diff --git a/openwire-core/src/test/resources/log4j2-test.properties
b/openwire-core/src/test/resources/log4j2-test.properties
new file mode 100644
index 0000000..089588f
--- /dev/null
+++ b/openwire-core/src/test/resources/log4j2-test.properties
@@ -0,0 +1,54 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests
+#
+rootLogger.level=INFO
+
+rootLogger.appenderRef.console.ref=Console
+rootLogger.appenderRef.logfile.ref=RollingFile
+
+# Tune the ActiveMQ and it's OpenWire transport as needed for debugging.
+logger.1.name=org.apache.activemq.openwire
+logger.1.level=DEBUG
+#logger.2.name=org.apache.activemq.broker
+#logger.2.level=DEBUG
+#logger.3.name=org.apache.activemq.transport.openwire
+#logger.3.level=TRACE
+#logger.4.name=org.apache.activemq.transport.openwire.FRAMES
+#logger.4.level=DEBUG
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%-10.10X{activemq.broker} %-20.20X{activemq.connector}
%-10.10X{activemq.destination} - %m%n
+
+# RollingFile appender
+appender.logfile.type=RollingRandomAccessFile
+appender.logfile.name=RollingFile
+appender.logfile.fileName=target/activemq-test.log
+appender.logfile.filePattern=target/activemq-test.log.%i
+appender.logfile.append=true
+appender.logfile.layout.type=PatternLayout
+appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%-10.10X{activemq.broker} %-20.20X{activemq.connector}
%-10.10X{activemq.destination} - %m%n
+appender.logfile.policies.type=Policies
+appender.logfile.policies.size.type=SizeBasedTriggeringPolicy
+appender.logfile.policies.size.size=1MB
diff --git a/openwire-generator/pom.xml b/openwire-generator/pom.xml
index 6a84089..20464b6 100644
--- a/openwire-generator/pom.xml
+++ b/openwire-generator/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>openwire-protocol</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwire-generator</artifactId>
@@ -53,8 +53,8 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/openwire-generator/src/main/java/org/apache/activemq/openwire/generator/GeneratorUtils.java
b/openwire-generator/src/main/java/org/apache/activemq/openwire/generator/GeneratorUtils.java
index 0c27511..05b1f40 100644
---
a/openwire-generator/src/main/java/org/apache/activemq/openwire/generator/GeneratorUtils.java
+++
b/openwire-generator/src/main/java/org/apache/activemq/openwire/generator/GeneratorUtils.java
@@ -32,7 +32,6 @@ import org.apache.activemq.openwire.annotations.OpenWireType;
import org.reflections.ReflectionUtils;
import org.reflections.Reflections;
-import com.google.common.base.Predicates;
/**
* Collection of useful methods when generating OpenWire types.
@@ -95,10 +94,9 @@ public class GeneratorUtils {
if (property.getType().equals(boolean.class)) {
Set<Method> getters = getAllMethods(openWireType,
- Predicates.and(
- withModifier(Modifier.PUBLIC),
- withPrefix("is"),
- withParametersCount(0)));
+ withModifier(Modifier.PUBLIC)
+ .and(withPrefix("is"))
+ .and(withParametersCount(0)));
// Found an isX method, use that.
if (!getters.isEmpty()) {
@@ -111,10 +109,9 @@ public class GeneratorUtils {
}
Set<Method> getters = getAllMethods(openWireType,
- Predicates.and(
- withModifier(Modifier.PUBLIC),
- withPrefix("get"),
- withParametersCount(0)));
+ withModifier(Modifier.PUBLIC)
+ .and(withPrefix("get"))
+ .and(withParametersCount(0)));
// Found an getX method, use that.
if (!getters.isEmpty()) {
@@ -145,10 +142,9 @@ public class GeneratorUtils {
public static Method findSetMethodForProperty(Class<?> openWireType,
OpenWirePropertyDescriptor property) throws Exception {
Set<Method> setters = getAllMethods(openWireType,
- Predicates.and(
- withModifier(Modifier.PUBLIC),
- withPrefix("set"),
- withParametersCount(1)));
+ withModifier(Modifier.PUBLIC)
+ .and(withPrefix("set"))
+ .and(withParametersCount(1)));
// Found an getX method, use that.
if (!setters.isEmpty()) {
diff --git a/openwire-generator/src/main/resources/log4j.properties
b/openwire-generator/src/main/resources/log4j.properties
deleted file mode 100644
index 5da64b0..0000000
--- a/openwire-generator/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-log4j.logger.org.apache.activemq.openwire=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p
%-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/activemq-test.log
-log4j.appender.out.append=true
diff --git a/openwire-generator/src/main/resources/log4j2.properties
b/openwire-generator/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..089588f
--- /dev/null
+++ b/openwire-generator/src/main/resources/log4j2.properties
@@ -0,0 +1,54 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests
+#
+rootLogger.level=INFO
+
+rootLogger.appenderRef.console.ref=Console
+rootLogger.appenderRef.logfile.ref=RollingFile
+
+# Tune the ActiveMQ and it's OpenWire transport as needed for debugging.
+logger.1.name=org.apache.activemq.openwire
+logger.1.level=DEBUG
+#logger.2.name=org.apache.activemq.broker
+#logger.2.level=DEBUG
+#logger.3.name=org.apache.activemq.transport.openwire
+#logger.3.level=TRACE
+#logger.4.name=org.apache.activemq.transport.openwire.FRAMES
+#logger.4.level=DEBUG
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%-10.10X{activemq.broker} %-20.20X{activemq.connector}
%-10.10X{activemq.destination} - %m%n
+
+# RollingFile appender
+appender.logfile.type=RollingRandomAccessFile
+appender.logfile.name=RollingFile
+appender.logfile.fileName=target/activemq-test.log
+appender.logfile.filePattern=target/activemq-test.log.%i
+appender.logfile.append=true
+appender.logfile.layout.type=PatternLayout
+appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%-10.10X{activemq.broker} %-20.20X{activemq.connector}
%-10.10X{activemq.destination} - %m%n
+appender.logfile.policies.type=Policies
+appender.logfile.policies.size.type=SizeBasedTriggeringPolicy
+appender.logfile.policies.size.size=1MB
diff --git a/openwire-interop-tests/pom.xml b/openwire-interop-tests/pom.xml
index 3a4a9d4..29f3312 100644
--- a/openwire-interop-tests/pom.xml
+++ b/openwire-interop-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>openwire-protocol</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwire-interop-tests</artifactId>
@@ -47,10 +47,9 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/MessageCompressionTest.java
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/MessageCompressionTest.java
index 7aa97d1..2bee6fd 100644
---
a/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/MessageCompressionTest.java
+++
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/MessageCompressionTest.java
@@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue;
import java.util.concurrent.TimeUnit;
-import javax.jms.BytesMessage;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Queue;
+import jakarta.jms.Session;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
diff --git
a/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/OpenWireInteropTestSupport.java
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/OpenWireInteropTestSupport.java
index 68fe869..cd4a664 100644
---
a/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/OpenWireInteropTestSupport.java
+++
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/OpenWireInteropTestSupport.java
@@ -26,7 +26,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.jms.JMSException;
+import jakarta.jms.JMSException;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
diff --git a/openwire-interop-tests/src/test/resources/log4j.properties
b/openwire-interop-tests/src/test/resources/log4j.properties
deleted file mode 100644
index 0588275..0000000
--- a/openwire-interop-tests/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-log4j.logger.org.apache.activemq.openwire=DEBUG
-
-# Tune the ActiveMQ and it's OpenWire transport as needed for debugging.
-log4j.logger.org.apache.activemq=INFO
-log4j.logger.org.apache.activemq.broker=DEBUG
-log4j.logger.org.apache.activemq.transport.openwire=TRACE
-log4j.logger.org.apache.activemq.transport.openwire.FRAMES=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] - %-5p
%-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/activemq-test.log
-log4j.appender.out.append=true
diff --git a/openwire-interop-tests/src/test/resources/log4j2-test.properties
b/openwire-interop-tests/src/test/resources/log4j2-test.properties
new file mode 100644
index 0000000..089588f
--- /dev/null
+++ b/openwire-interop-tests/src/test/resources/log4j2-test.properties
@@ -0,0 +1,54 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests
+#
+rootLogger.level=INFO
+
+rootLogger.appenderRef.console.ref=Console
+rootLogger.appenderRef.logfile.ref=RollingFile
+
+# Tune the ActiveMQ and it's OpenWire transport as needed for debugging.
+logger.1.name=org.apache.activemq.openwire
+logger.1.level=DEBUG
+#logger.2.name=org.apache.activemq.broker
+#logger.2.level=DEBUG
+#logger.3.name=org.apache.activemq.transport.openwire
+#logger.3.level=TRACE
+#logger.4.name=org.apache.activemq.transport.openwire.FRAMES
+#logger.4.level=DEBUG
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%-10.10X{activemq.broker} %-20.20X{activemq.connector}
%-10.10X{activemq.destination} - %m%n
+
+# RollingFile appender
+appender.logfile.type=RollingRandomAccessFile
+appender.logfile.name=RollingFile
+appender.logfile.fileName=target/activemq-test.log
+appender.logfile.filePattern=target/activemq-test.log.%i
+appender.logfile.append=true
+appender.logfile.layout.type=PatternLayout
+appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+#appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} -
%-10.10X{activemq.broker} %-20.20X{activemq.connector}
%-10.10X{activemq.destination} - %m%n
+appender.logfile.policies.type=Policies
+appender.logfile.policies.size.type=SizeBasedTriggeringPolicy
+appender.logfile.policies.size.size=1MB
diff --git a/openwire-legacy/pom.xml b/openwire-legacy/pom.xml
index 9695616..33f9834 100644
--- a/openwire-legacy/pom.xml
+++ b/openwire-legacy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>openwire-protocol</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwire-legacy</artifactId>
diff --git a/openwire-website/pom.xml b/openwire-website/pom.xml
index 3032a35..1843c1f 100644
--- a/openwire-website/pom.xml
+++ b/openwire-website/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>openwire-protocol</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openwire-website</artifactId>
@@ -63,8 +63,8 @@
<version>${scalamd-version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<!-- testing -->
diff --git a/pom.xml b/pom.xml
index ed9116c..dd564d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>17</version>
+ <version>30</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,39 +27,38 @@
<groupId>org.apache.activemq</groupId>
<name>openwire-protocol</name>
<description>An OpenWire implementation for client and broker
development</description>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<!-- base url for site deployment. See distribution management for full
url. Override this in settings.xml for staging -->
<website-base-url>svn:https://svn.apache.org/repos/infra/websites/production/activemq/content/openwire</website-base-url>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <source-version>1.7</source-version>
- <target-version>1.7</target-version>
+ <source-version>17</source-version>
+ <target-version>17</target-version>
<!-- Dependency Versions for this Project -->
- <ant-version>1.9.6</ant-version>
+ <ant-version>1.10.14</ant-version>
<junit-version>4.13.1</junit-version>
- <slf4j-version>1.7.13</slf4j-version>
- <activemq-version>5.12.1</activemq-version>
- <jetty-version>8.1.15.v20140411</jetty-version>
- <mockito-version>1.10.19</mockito-version>
- <reflections-version>0.9.10</reflections-version>
+ <slf4j-version>2.0.9</slf4j-version>
+ <log4j-version>2.22.0</log4j-version>
+ <activemq-version>6.0.1</activemq-version>
+ <jetty-version>11.0.18</jetty-version>
+ <mockito-version>5.4.0</mockito-version>
+ <reflections-version>0.10.2</reflections-version>
<!-- Maven Plugin Version for this Project -->
- <maven-antrun-plugin-version>1.3</maven-antrun-plugin-version>
- <maven-surefire-plugin-version>2.18.1</maven-surefire-plugin-version>
- <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version>
- <maven-release-plugin-version>2.4.1</maven-release-plugin-version>
- <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
- <maven-idea-plugin-version>2.5</maven-idea-plugin-version>
- <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
- <maven-antrun-plugin-version>1.8</maven-antrun-plugin-version>
- <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
+ <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
+ <maven-surefire-plugin-version>3.2.1</maven-surefire-plugin-version>
+ <maven-assembly-plugin-version>3.6.0</maven-assembly-plugin-version>
+ <maven-release-plugin-version>3.0.1</maven-release-plugin-version>
+ <maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
+ <maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
+ <findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
</properties>
<prerequisites>
- <maven>3.0.4</maven>
+ <maven>3.8.0</maven>
</prerequisites>
<url>http://activemq.apache.org</url>
@@ -70,10 +69,10 @@
</issueManagement>
<scm>
-
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/activemq-openwire.git</connection>
-
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/activemq-openwire.git</developerConnection>
- <url>https://fisheye6.atlassian.com/browse/~br=master/activemq-git</url>
- <tag>HEAD</tag>
+
<connection>scm:git:http://gitbox.apache.org/repos/asf/activemq-openwire.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/activemq-openwire.git</developerConnection>
+ <url>https://github.com/apache/activemq-openwire</url>
+ <tag>main</tag>
</scm>
<mailingLists>
@@ -137,6 +136,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ </dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
@@ -160,9 +164,19 @@
<version>${slf4j-version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
+ <version>${log4j-version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -193,24 +207,6 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>${maven-eclipse-plugin-version}</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>${maven-idea-plugin-version}</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
