You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2020/06/15 13:27:56 UTC
[activemq-artemis] branch master updated (181743f -> 3810146)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 181743f This closes #3171
new efe0f46 ARTEMIS-2109: Updating the build to be able to execute it on Java 11 and Java 8.
new d2c4676 ARTEMIS-2109: fix javadoc errors, remove doclint config for JDK8, remove superfluous plugin versions, update to 3.0.1 javadoc plugin
new 36dbfd9 ARTEMIS-2109: Apply modified version of Franz artemis-dto xsd workaround from #2720
new 502bfcf ARTEMIS-2109: Update extra-tests bits. Disable errorprone for examples, at least for now, to avoid updating hundreds of poms. Allows building on 11+
new f69f03a ARTEMIS-2109: updating mockito for Java 14 support and working round a javadoc issue
new 12bc494 ARTEMIS-2109: use default 1.8 compiler source/target config as with other examples, newest JDKs no longer target 1.6. Fix SSL example. Allows building on JDK 14+.
new 95d8b89 ARTEMIS-2109: enable JDK11 + JDK14 builds in Travs CI, and fix before_cache config
new 3810146 This closes #3179
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 4 +-
artemis-boot/pom.xml | 4 +
artemis-cdi-client/pom.xml | 4 +
artemis-cli/pom.xml | 4 +
.../artemis/cli/commands/check/QueueCheck.java | 2 +-
artemis-commons/pom.xml | 4 +
.../org/apache/activemq/artemis/utils/Base64.java | 32 +--
.../activemq/artemis/utils/InetAddresses.java | 10 +-
.../activemq/artemis/utils/SpawnedVMSupport.java | 2 +-
.../ConcurrentAppendOnlyChunkedList.java | 2 +-
.../utils/collections/ConcurrentLongHashMap.java | 4 +-
.../utils/collections/ConcurrentLongHashSet.java | 2 +-
.../artemis/utils/collections/LongHashSet.java | 2 +-
.../utils/collections/SparseArrayLinkedList.java | 2 +-
.../utils/collections/UpdatableIterator.java | 2 -
.../artemis/utils/critical/CriticalComponent.java | 2 +-
.../artemis/utils/collections/LongHashSetTest.java | 1 +
artemis-core-client-all/pom.xml | 6 +-
artemis-core-client/pom.xml | 5 +-
.../apache/activemq/artemis/api/core/Message.java | 3 +-
.../artemis/api/core/RefCountMessageListener.java | 2 +-
.../artemis/api/core/client/ClientSession.java | 3 +-
.../api/core/management/ActiveMQServerControl.java | 2 +-
.../api/core/management/AddressControl.java | 2 +-
.../artemis/core/message/impl/CoreMessage.java | 1 -
.../server/ComponentConfigurationRoutingType.java | 2 +-
.../spi/core/protocol/RemotingConnection.java | 2 +-
artemis-dto/pom.xml | 18 +-
artemis-features/pom.xml | 226 ++++++++++-----------
artemis-hawtio/activemq-branding/pom.xml | 4 +
artemis-hawtio/artemis-plugin/pom.xml | 4 +
artemis-hawtio/pom.xml | 3 -
artemis-jdbc-store/pom.xml | 4 +
.../artemis/jdbc/store/drivers/JDBCUtils.java | 4 +-
artemis-jms-client-all/pom.xml | 2 +-
artemis-jms-client/pom.xml | 5 +-
.../jms/client/DefaultConnectionProperties.java | 3 +-
artemis-jms-server/pom.xml | 5 +-
.../artemis/jms/bridge/QualityOfServiceMode.java | 8 +-
artemis-journal/pom.xml | 6 +
.../artemis/core/io/buffer/TimedBuffer.java | 1 -
.../artemis/core/io/util/ByteBufferPool.java | 2 +-
.../artemis/core/journal/impl/JournalImpl.java | 6 +-
artemis-junit/pom.xml | 4 +
.../artemis/junit/ActiveMQConsumerResource.java | 4 +-
.../junit/ActiveMQDynamicProducerResource.java | 4 +-
.../artemis/junit/ActiveMQProducerResource.java | 4 +-
.../artemis/junit/EmbeddedActiveMQResource.java | 4 +-
.../artemis/junit/EmbeddedJMSResource.java | 4 +-
artemis-maven-plugin/pom.xml | 6 +-
artemis-protocols/artemis-amqp-protocol/pom.xml | 4 +
.../amqp/converter/AMQPMessageIdHelper.java | 2 +-
artemis-protocols/artemis-hornetq-protocol/pom.xml | 4 +
.../artemis-hqclient-protocol/pom.xml | 5 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 11 +
.../artemis/core/protocol/mqtt/MQTTConnection.java | 1 -
.../artemis-openwire-protocol/pom.xml | 5 +-
artemis-protocols/artemis-stomp-protocol/pom.xml | 4 +
artemis-protocols/pom.xml | 1 -
artemis-ra/pom.xml | 4 +
artemis-rest/pom.xml | 4 +
artemis-selector/pom.xml | 38 +++-
.../activemq/artemis/selector/impl/LRUCache.java | 6 +-
artemis-server-osgi/pom.xml | 5 +-
artemis-server/pom.xml | 5 +-
.../core/config/impl/LegacyJMSConfiguration.java | 2 -
.../deployers/impl/FileConfigurationParser.java | 1 -
.../core/postoffice/impl/SimpleAddressManager.java | 4 +-
.../artemis/core/server/ServerSession.java | 2 +-
.../protocol/AbstractProtocolManagerFactory.java | 2 +-
artemis-service-extensions/pom.xml | 4 +
artemis-tools/pom.xml | 4 +
artemis-web/pom.xml | 6 +
artemis-website/pom.xml | 2 +-
etc/checkstyle-suppressions.xml | 3 +-
examples/features/sub-modules/tomcat/pom.xml | 12 +-
examples/pom.xml | 13 ++
.../stomp/stomp-dual-authentication/readme.md | 4 +-
.../example/StompDualAuthenticationExample.java | 4 -
.../activemq/server0/client-side-keystore.jks | Bin 1303 -> 2597 bytes
.../activemq/server0/client-side-truststore.jks | Bin 963 -> 1170 bytes
.../activemq/server0/server-side-keystore.jks | Bin 2253 -> 2565 bytes
.../activemq/server0/server-side-truststore.jks | Bin 1732 -> 1202 bytes
integration/activemq-spring-integration/pom.xml | 4 +
pom.xml | 111 +++++-----
tests/artemis-test-support/pom.xml | 4 +
.../transport/amqp/client/AmqpSession.java | 15 +-
.../transport/amqp/client/util/IdGenerator.java | 4 +-
tests/compatibility-tests/pom.xml | 37 ++--
.../tests/compatibility/base/ClasspathBase.java | 21 +-
tests/extra-tests/pom.xml | 14 +-
tests/integration-tests/pom.xml | 4 +
.../integration/openwire/amq/JMSConsumer9Test.java | 3 +
tests/jms-tests/pom.xml | 4 +
.../artemis/jms/tests/TransactedSessionTest.java | 3 +
.../tests/message/BodyIsAssignableFromTest.java | 3 +-
tests/joram-tests/pom.xml | 4 +
tests/karaf-client-integration-tests/pom.xml | 4 +
tests/performance-tests/pom.xml | 4 +
tests/smoke-tests/pom.xml | 4 +
tests/soak-tests/pom.xml | 4 +
tests/stress-tests/pom.xml | 4 +
tests/timing-tests/pom.xml | 4 +
tests/unit-tests/pom.xml | 4 +
104 files changed, 531 insertions(+), 332 deletions(-)
[activemq-artemis] 04/08: ARTEMIS-2109: Update extra-tests bits.
Disable errorprone for examples, at least for now,
to avoid updating hundreds of poms. Allows building on 11+
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 502bfcfc567cf13615727a767b9e5ae29871b5a3
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jun 11 15:04:14 2020 +0100
ARTEMIS-2109: Update extra-tests bits. Disable errorprone for examples, at least for now, to avoid updating hundreds of poms. Allows building on 11+
---
examples/pom.xml | 13 +++++++++++++
tests/extra-tests/pom.xml | 14 +++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index a597b04..9eefc92 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -60,6 +60,19 @@ under the License.
</pluginRepository>
</pluginRepositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs combine.self="override">
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<!-- specify -PnoServer if you don't want to start the servers on the tests -->
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 23e0b05..c63b3d5 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -33,8 +33,7 @@
<name>ActiveMQ Artemis Extra Tests</name>
<properties>
- <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
- <byteman.version>3.0.10</byteman.version>
+ <byteman.version>4.0.11</byteman.version>
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
<jboss-jts.version>4.17.13.Final</jboss-jts.version>
<hornetq.version>2.4.7.Final</hornetq.version>
@@ -45,6 +44,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman</artifactId>
<version>${byteman.version}</version>
@@ -80,13 +83,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.7</version>
- <scope>system</scope>
- <systemPath>${tools.jar}</systemPath>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
[activemq-artemis] 05/08: ARTEMIS-2109: updating mockito for Java
14 support and working round a javadoc issue
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit f69f03a2055b4396dfe8b5338007d930cfe3898b
Author: Emmanuel Hugonnet <eh...@redhat.com>
AuthorDate: Thu Jun 11 15:53:48 2020 +0200
ARTEMIS-2109: updating mockito for Java 14 support and working round a javadoc issue
---
.../apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java | 8 ++++----
pom.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
index fdf2aa3..38ee3d7 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
@@ -17,9 +17,9 @@
package org.apache.activemq.artemis.jms.bridge;
/**
- * <h3>Quality of server (QoS) levels</h3>
+ * <h2>Quality of server (QoS) levels</h2>
*
- * <h4>QOS_AT_MOST_ONCE</h4>
+ * <h3>QOS_AT_MOST_ONCE</h3>
*
* With this QoS mode messages will reach the destination from the source at
* most once. The messages are consumed from the source and acknowledged before
@@ -28,7 +28,7 @@ package org.apache.activemq.artemis.jms.bridge;
* destination they could be lost. Hence delivery will occur at most once. This
* mode is available for both persistent and non persistent messages.
*
- * <h4>QOS_DUPLICATES_OK</h4>
+ * <h3>QOS_DUPLICATES_OK</h3>
*
* With this QoS mode, the messages are consumed from the source and then
* acknowledged after they have been successfully sent to the destination.
@@ -38,7 +38,7 @@ package org.apache.activemq.artemis.jms.bridge;
* failure. This mode is available for both persistent and non persistent
* messages.
*
- * <h4>QOS_ONCE_AND_ONLY_ONCE</h4>
+ * <h3>QOS_ONCE_AND_ONLY_ONCE</h3>
*
* This QoS mode ensures messages will reach the destination from the source
* once and only once. (Sometimes this mode is known as "exactly once"). If both
diff --git a/pom.xml b/pom.xml
index 92913d2..38af255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
<jetty.version>9.4.26.v20200117</jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
- <mockito.version>2.25.0</mockito.version>
+ <mockito.version>3.3.3</mockito.version>
<jctools.version>2.1.2</jctools.version>
<netty.version>4.1.48.Final</netty.version>
[activemq-artemis] 01/08: ARTEMIS-2109: Updating the build to be
able to execute it on Java 11 and Java 8.
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit efe0f468de2ffa0b354974d20df2087557b7cf7f
Author: Emmanuel Hugonnet <eh...@redhat.com>
AuthorDate: Wed Apr 29 18:14:47 2020 +0200
ARTEMIS-2109: Updating the build to be able to execute it on Java 11 and Java 8.
---
artemis-boot/pom.xml | 4 +
artemis-cdi-client/pom.xml | 4 +
artemis-cli/pom.xml | 4 +
.../artemis/cli/commands/check/QueueCheck.java | 2 +-
artemis-commons/pom.xml | 4 +
.../artemis/utils/collections/LongHashSetTest.java | 1 +
artemis-core-client-all/pom.xml | 6 +-
artemis-core-client/pom.xml | 4 +
.../apache/activemq/artemis/api/core/Message.java | 1 -
.../artemis/api/core/RefCountMessageListener.java | 2 +-
.../artemis/api/core/client/ClientSession.java | 3 +-
.../api/core/management/ActiveMQServerControl.java | 2 +-
.../api/core/management/AddressControl.java | 2 +-
.../spi/core/protocol/RemotingConnection.java | 2 +-
artemis-dto/pom.xml | 11 +-
artemis-features/pom.xml | 226 ++++++++++-----------
artemis-hawtio/activemq-branding/pom.xml | 4 +
artemis-hawtio/artemis-plugin/pom.xml | 4 +
artemis-hawtio/pom.xml | 3 -
artemis-jdbc-store/pom.xml | 4 +
artemis-jms-client-all/pom.xml | 2 +-
artemis-jms-client/pom.xml | 4 +
.../jms/client/DefaultConnectionProperties.java | 3 +-
artemis-jms-server/pom.xml | 4 +
artemis-journal/pom.xml | 6 +
artemis-junit/pom.xml | 4 +
artemis-maven-plugin/pom.xml | 6 +-
artemis-protocols/artemis-amqp-protocol/pom.xml | 4 +
artemis-protocols/artemis-hornetq-protocol/pom.xml | 4 +
.../artemis-hqclient-protocol/pom.xml | 5 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 11 +
.../artemis-openwire-protocol/pom.xml | 5 +-
artemis-protocols/artemis-stomp-protocol/pom.xml | 4 +
artemis-protocols/pom.xml | 1 -
artemis-ra/pom.xml | 4 +
artemis-rest/pom.xml | 4 +
artemis-selector/pom.xml | 38 +++-
.../activemq/artemis/selector/impl/LRUCache.java | 6 +-
artemis-server-osgi/pom.xml | 5 +-
artemis-server/pom.xml | 4 +
.../protocol/AbstractProtocolManagerFactory.java | 2 +-
artemis-service-extensions/pom.xml | 4 +
artemis-tools/pom.xml | 4 +
artemis-web/pom.xml | 6 +
artemis-website/pom.xml | 2 +-
etc/checkstyle-suppressions.xml | 3 +-
integration/activemq-spring-integration/pom.xml | 4 +
pom.xml | 92 +++++----
tests/artemis-test-support/pom.xml | 4 +
tests/compatibility-tests/pom.xml | 37 ++--
.../tests/compatibility/base/ClasspathBase.java | 21 +-
tests/integration-tests/pom.xml | 4 +
.../integration/openwire/amq/JMSConsumer9Test.java | 3 +
tests/jms-tests/pom.xml | 4 +
.../artemis/jms/tests/TransactedSessionTest.java | 3 +
.../tests/message/BodyIsAssignableFromTest.java | 3 +-
tests/joram-tests/pom.xml | 4 +
tests/karaf-client-integration-tests/pom.xml | 4 +
tests/performance-tests/pom.xml | 4 +
tests/smoke-tests/pom.xml | 4 +
tests/soak-tests/pom.xml | 4 +
tests/stress-tests/pom.xml | 4 +
tests/timing-tests/pom.xml | 4 +
tests/unit-tests/pom.xml | 4 +
64 files changed, 435 insertions(+), 210 deletions(-)
diff --git a/artemis-boot/pom.xml b/artemis-boot/pom.xml
index 1803632..7b6655b 100644
--- a/artemis-boot/pom.xml
+++ b/artemis-boot/pom.xml
@@ -36,6 +36,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml
index b79c691..7720ba7 100644
--- a/artemis-cdi-client/pom.xml
+++ b/artemis-cdi-client/pom.xml
@@ -49,6 +49,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index c95ee0d..c0f6353 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -109,6 +109,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/QueueCheck.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/QueueCheck.java
index 45ddc3e..5bd4fd9 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/QueueCheck.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/QueueCheck.java
@@ -101,7 +101,7 @@ public class QueueCheck extends CheckAbstract {
if (browse != null) {
if (browse == -1) {
- checkTasks.add(new CheckTask(String.format("a consumer can browse the queue",
+ checkTasks.add(new CheckTask(String.format("a consumer can browse the queue %s",
getName()), this::checkQueueBrowse));
} else if (browse > 0) {
checkTasks.add(new CheckTask(String.format("a consumer can browse %d messages from the queue %s",
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 7f5408f..cbf6952 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -51,6 +51,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<scope>provided</scope>
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java
index 09d18d0..e322ffa 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java
@@ -247,6 +247,7 @@ public class LongHashSetTest {
Assert.assertEquals(1, testSet.size());
}
+ @SuppressWarnings("CollectionToArraySafeParameter")
@Test(expected = ArrayStoreException.class)
public void toArrayThrowsArrayStoreExceptionForWrongType() {
testSet.toArray(new String[1]);
diff --git a/artemis-core-client-all/pom.xml b/artemis-core-client-all/pom.xml
index 9ddde60..2428f8c 100644
--- a/artemis-core-client-all/pom.xml
+++ b/artemis-core-client-all/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.3</version>
<executions>
<execution>
<phase>package</phase>
@@ -97,8 +97,8 @@
</transformers>
<relocations>
<relocation>
- <pattern>org.apache.activemq</pattern>
- <shadedPattern>org.apache.activemq</shadedPattern>
+ <pattern>org.apache.activemq</pattern>
+ <shadedPattern>org.apache.activemq</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.geronimo</pattern>
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 8af9d3d..3048279 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -57,6 +57,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
<scope>provided</scope>
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index fdb5188..f8053c9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -676,7 +676,6 @@ public interface Message {
/**
* @see #usageUp()
* @return
- * @throws Exception
*/
int usageDown();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/RefCountMessageListener.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/RefCountMessageListener.java
index 91fa7f8..17168bb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/RefCountMessageListener.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/RefCountMessageListener.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
-/** If {@link Message#getContext()} != null and is implementing this interface.
+/**
* These methods will be called during refCount operations */
public interface RefCountMessageListener {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
index 965a4e7..5db79aa 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
@@ -310,8 +310,7 @@ public interface ClientSession extends XAResource, AutoCloseable {
* </ul><p>
*
* @param queueConfiguration the configuration to use when creating the queue
- * @return the {@code Queue} instance that was created
- * @throws Exception
+ * @throws ActiveMQException
*/
void createQueue(QueueConfiguration queueConfiguration) throws ActiveMQException;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index b4e6c3a..643fb53 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -1763,7 +1763,7 @@ public interface ActiveMQServerControl {
* List the information about a user or all users if no username is supplied (only applicable when using the JAAS PropertiesLoginModule).
*
* @param username
- * @return JSON array of user & role information
+ * @return JSON array of user and role information
* @throws Exception
*/
@Operation(desc = "list info about a user or all users if no username is supplied (only applicable when using the JAAS PropertiesLoginModule)", impact = MBeanOperationInfo.ACTION)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
index 908fb20..23817ed 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
@@ -84,7 +84,7 @@ public interface AddressControl {
String[] getQueueNames() throws Exception;
/**
- * Returns the names of both the local & remote queue(s) bound to this address.
+ * Returns the names of both the local and remote queue(s) bound to this address.
*/
@Attribute(desc = "names of both the local & remote queue(s) bound to this address")
String[] getAllQueueNames() throws Exception;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
index 89452f6..f9f4fa5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
@@ -240,7 +240,7 @@ public interface RemotingConnection extends BufferHandler {
/**
* Sets the client ID associated with this connection
- * @return
+ * @param cID
*/
void setClientID(String cID);
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index e40bafb..7646375 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -36,6 +36,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId>
<version>${project.version}</version>
@@ -87,7 +91,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -130,6 +134,11 @@
<artifactId>jaxb-jxc</artifactId>
<version>${version.jaxb}</version>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${version.activation}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml
index 6f4c3bf..e38719e 100644
--- a/artemis-features/pom.xml
+++ b/artemis-features/pom.xml
@@ -1,19 +1,19 @@
<!--
- ~ 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.
- -->
+~ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -25,104 +25,104 @@
<packaging>pom</packaging>
<name>ActiveMQ Artemis Features</name>
- <properties>
- <karaf.version>4.1.1</karaf.version>
- </properties>
+ <properties>
+ <karaf.version>4.2.8</karaf.version>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>framework</artifactId>
- <version>${karaf.version}</version>
- <type>kar</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
- <executions>
- <execution>
- <id>verify</id>
- <phase>install</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
- <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
- </descriptors>
- <distribution>org.apache.karaf.features:framework</distribution>
- <javase>1.8</javase>
- <framework>
- <feature>framework</feature>
- </framework>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/classes/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- <artifact>
- <file>target/classes/artemis.xml</file>
- <classifier>artemis</classifier>
- <type>xml</type>
- </artifact>
- <artifact>
- <file>target/classes/org.apache.activemq.artemis.cfg</file>
- <type>cfg</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>install</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>11</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ <artifact>
+ <file>target/classes/artemis.xml</file>
+ <classifier>artemis</classifier>
+ <type>xml</type>
+ </artifact>
+ <artifact>
+ <file>target/classes/org.apache.activemq.artemis.cfg</file>
+ <type>cfg</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
index b20fa63..7c0e304 100644
--- a/artemis-hawtio/activemq-branding/pom.xml
+++ b/artemis-hawtio/activemq-branding/pom.xml
@@ -92,6 +92,10 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
index 5430b4a..79a606c 100644
--- a/artemis-hawtio/artemis-plugin/pom.xml
+++ b/artemis-hawtio/artemis-plugin/pom.xml
@@ -97,6 +97,10 @@
<artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index f386561..2b78380 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -35,9 +35,6 @@
<activemq.basedir>${project.basedir}/..</activemq.basedir>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
-
<hawtio.version>1.5.12</hawtio.version>
<jline.version>3.2.0</jline.version>
<junit-version>4.11</junit-version>
diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index edc70c0..622a477 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -41,6 +41,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-jms-client-all/pom.xml b/artemis-jms-client-all/pom.xml
index 24e6c71..e55607d 100644
--- a/artemis-jms-client-all/pom.xml
+++ b/artemis-jms-client-all/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.3</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/artemis-jms-client/pom.xml b/artemis-jms-client/pom.xml
index 378637b..c844950 100644
--- a/artemis-jms-client/pom.xml
+++ b/artemis-jms-client/pom.xml
@@ -39,6 +39,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
index aba1c8b..6a6ac27 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
@@ -23,7 +23,8 @@ import java.security.PrivilegedAction;
/**
* <p>This class will provide default properties for constructors</p>
*
- * <table border='1' summary=''>
+ * <table border='1'>
+ * <caption>Default properties</caption>
* <tr> <td>Name</td> <td>Default Value</td></tr>
* <tr> <td>AMQ_HOST or org.apache.activemq.AMQ_HOST</td> <td>localhost</td></tr>
* <tr><td>AMQ_PORT or org.apache.activemq.AMQ_PORT</td> <td>61616</td></tr>
diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml
index b7785c5..82e54c4 100644
--- a/artemis-jms-server/pom.xml
+++ b/artemis-jms-server/pom.xml
@@ -45,6 +45,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-journal/pom.xml b/artemis-journal/pom.xml
index d799d90..16ff724 100644
--- a/artemis-journal/pom.xml
+++ b/artemis-journal/pom.xml
@@ -44,6 +44,12 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<!--
JBoss Logging
diff --git a/artemis-junit/pom.xml b/artemis-junit/pom.xml
index 3e8bbfe..ea26169 100644
--- a/artemis-junit/pom.xml
+++ b/artemis-junit/pom.xml
@@ -38,6 +38,10 @@
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
<!--
-->
<dependency>
diff --git a/artemis-maven-plugin/pom.xml b/artemis-maven-plugin/pom.xml
index 01b8da2..f99d166 100644
--- a/artemis-maven-plugin/pom.xml
+++ b/artemis-maven-plugin/pom.xml
@@ -82,6 +82,10 @@
<version>3.4</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -90,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.5.2</version>
+ <version>3.6.0</version>
<executions>
<execution>
<id>default-descriptor</id>
diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
index c321b3e..1143fc9 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -60,6 +60,10 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
<!--
JBoss Logging
diff --git a/artemis-protocols/artemis-hornetq-protocol/pom.xml b/artemis-protocols/artemis-hornetq-protocol/pom.xml
index 9ace768..d3f578f 100644
--- a/artemis-protocols/artemis-hornetq-protocol/pom.xml
+++ b/artemis-protocols/artemis-hornetq-protocol/pom.xml
@@ -79,6 +79,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/artemis-protocols/artemis-hqclient-protocol/pom.xml b/artemis-protocols/artemis-hqclient-protocol/pom.xml
index b48eaa7..fbfab9b 100644
--- a/artemis-protocols/artemis-hqclient-protocol/pom.xml
+++ b/artemis-protocols/artemis-hqclient-protocol/pom.xml
@@ -46,6 +46,10 @@
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -53,7 +57,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index d70a913..be18065 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -41,6 +41,10 @@
<artifactId>jboss-logging-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -124,6 +128,13 @@
<version>4.0.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
+ <scope>test</scope>
+ <type>jar</type>
+ </dependency>
</dependencies>
<repositories>
diff --git a/artemis-protocols/artemis-openwire-protocol/pom.xml b/artemis-protocols/artemis-openwire-protocol/pom.xml
index 90d76ec..ca2b3f2 100644
--- a/artemis-protocols/artemis-openwire-protocol/pom.xml
+++ b/artemis-protocols/artemis-openwire-protocol/pom.xml
@@ -39,6 +39,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -123,7 +127,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/artemis-protocols/artemis-stomp-protocol/pom.xml b/artemis-protocols/artemis-stomp-protocol/pom.xml
index 204594c..005f300 100644
--- a/artemis-protocols/artemis-stomp-protocol/pom.xml
+++ b/artemis-protocols/artemis-stomp-protocol/pom.xml
@@ -45,6 +45,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-protocols/pom.xml b/artemis-protocols/pom.xml
index b2d84db..6fba27d 100644
--- a/artemis-protocols/pom.xml
+++ b/artemis-protocols/pom.xml
@@ -46,7 +46,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/artemis-ra/pom.xml b/artemis-ra/pom.xml
index 41ed652..ebf8e65 100644
--- a/artemis-ra/pom.xml
+++ b/artemis-ra/pom.xml
@@ -45,6 +45,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index e3a9e04..fe7158c 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -49,6 +49,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 11dde61..49aa25b 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -33,6 +33,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId>
<version>${project.version}</version>
@@ -81,14 +85,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- version 3.2 is having problems with the APT processor resulting in
- java.lang.IllegalStateException: endPosTable already set -->
- <version>3.1</version>
<configuration combine.self="override" />
</plugin>
</plugins>
</build>
</profile>
+<!-- <profile>
+ <id>java9on</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs>
+ <arg>-XDcompilePolicy=simple</arg>
+ TODO: do this only for generated-sources
+ <arg>-Xplugin:ErrorProne -Xep:MissingOverride:WARN</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>-->
</profiles>
<build>
@@ -99,20 +121,20 @@
</resource>
</resources>
<plugins>
- <plugin>
+<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
- <!-- TODO: do this only for generated-sources -->
- <arg>-Xep:MissingOverride:WARN</arg>
+ <arg>-XDcompilePolicy=simple</arg>
+ TODO: do this only for generated-sources
+ <arg>-Xplugin:ErrorProne -Xep:MissingOverride:WARN</arg>
</compilerArgs>
</configuration>
- </plugin>
+ </plugin>-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<phase>generate-sources</phase>
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
index efe3fcd..9e6a9d5 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
@@ -48,14 +48,14 @@ public class LRUCache<K, V> extends LinkedHashMap<K, V> {
}
/**
- * Constructs an empty <tt>LRUCache</tt> instance with the specified
+ * Constructs an empty <code>LRUCache</code> instance with the specified
* initial capacity, maximumCacheSize,load factor and ordering mode.
*
* @param initialCapacity the initial capacity.
* @param maximumCacheSize
* @param loadFactor the load factor.
- * @param accessOrder the ordering mode - <tt>true</tt> for access-order,
- * <tt>false</tt> for insertion-order.
+ * @param accessOrder the ordering mode - <code>true</code> for access-order,
+ * <code>false</code> for insertion-order.
* @throws IllegalArgumentException if the initial capacity is negative or
* the load factor is non-positive.
*/
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index 8d1519b..d6df4f7 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -101,6 +101,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
@@ -137,7 +141,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.3.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 9cfbdd8..f5436f3 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -45,6 +45,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java
index a8284c1..1fbeb23 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java
@@ -51,7 +51,7 @@ public abstract class AbstractProtocolManagerFactory<P extends BaseInterceptor>
/**
* org.apache.commons.beanutils.BeanUtils will log all the parameters so we strip out any password parameters
- * (e.g. passwords for SSL keystore & truststore)
+ * (e.g. passwords for SSL keystore and truststore)
*
* @param parameters
*/
diff --git a/artemis-service-extensions/pom.xml b/artemis-service-extensions/pom.xml
index 7719580..cb2a86a 100644
--- a/artemis-service-extensions/pom.xml
+++ b/artemis-service-extensions/pom.xml
@@ -64,6 +64,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
<scope>test</scope>
diff --git a/artemis-tools/pom.xml b/artemis-tools/pom.xml
index 164e665..44694da 100644
--- a/artemis-tools/pom.xml
+++ b/artemis-tools/pom.xml
@@ -33,6 +33,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml
index d512874..16c2fac 100644
--- a/artemis-web/pom.xml
+++ b/artemis-web/pom.xml
@@ -45,6 +45,12 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index 4ff0c05..a66854c 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -92,7 +92,6 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.1</version>
<executions>
<execution>
<id>javadoc-jar</id>
@@ -101,6 +100,7 @@
<goal>jar</goal>
</goals>
<configuration>
+ <source>8</source>
<useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory>
<maxmemory>512m</maxmemory>
diff --git a/etc/checkstyle-suppressions.xml b/etc/checkstyle-suppressions.xml
index 9ff360a..38d77dc 100644
--- a/etc/checkstyle-suppressions.xml
+++ b/etc/checkstyle-suppressions.xml
@@ -27,6 +27,7 @@ under the License.
<suppressions>
<!-- Suppress unfixable violations in JavaCC generated sources -->
- <suppress checks="Indentation|Whitespace|Curly|Modifier|AvoidStarImport|EmptyStatement|ArrayTypeStyle|RegexpSingleline" files="[\\/]generated-sources[\\/]javacc[\\/]"/>
+ <suppress checks="Indentation|Whitespace|Curly|Modifier|AvoidStarImport|RedundantImport|UnusedImports|EmptyStatement|ArrayTypeStyle|RegexpSingleline" files="[\\/]generated-sources[\\/]javacc[\\/]"/>
+ <suppress checks="Indentation|Whitespace|Curly|Modifier|AvoidStarImport|RedundantImport|UnusedImports|EmptyStatement|ArrayTypeStyle|RegexpSingleline" files="[\\/]generated-sources[\\/]annotations[\\/]"/>
</suppressions>
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index 56afdef..714aae2 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -48,6 +48,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 80fc80d..9a08153 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,8 @@
</prerequisites>
<properties>
+ <modular.jdk.surefire.arg></modular.jdk.surefire.arg>
+ <javac.version>9+181-r4173-1</javac.version>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
@@ -127,7 +129,7 @@
<hamcrest.version>2.1</hamcrest.version>
<!-- used on tests -->
- <groovy.version>2.4.3</groovy.version>
+ <groovy.version>2.5.10</groovy.version>
<owasp.version>1.4.3</owasp.version>
<spring.version>5.1.7.RELEASE</spring.version>
@@ -158,9 +160,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
-
<!--
note for idea users:
@@ -186,8 +185,6 @@
<skipStyleCheck>true</skipStyleCheck>
<skipOWASP>true</skipOWASP>
- <javac-compiler-id>javac-with-errorprone</javac-compiler-id>
-
<directory-version>2.0.0-M15</directory-version>
<directory-jdbm2-version>2.0.0-M1</directory-jdbm2-version>
@@ -335,6 +332,13 @@
<optional>true</optional>
<!-- License: Apache 2.0-->
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>2.4.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<!--needed to compile the logging jar-->
<dependency>
<groupId>log4j</groupId>
@@ -888,9 +892,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <!-- version 3.2 is having problems with the APT processor resulting in
- java.lang.IllegalStateException: endPosTable already set -->
- <version>3.1</version>
+ <version>3.8.1</version>
<configuration combine.self="override" />
</plugin>
<plugin>
@@ -910,6 +912,10 @@
<activation>
<jdk>1.8</jdk>
</activation>
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
<build>
<plugins>
<plugin>
@@ -923,6 +929,34 @@
</build>
</profile>
<profile>
+ <id>java9on</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showWarnings>true</showWarnings>
+ <compilerArgs>
+ <arg>-Xdiags:verbose</arg>
+ <arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
+ <arg>-XDcompilePolicy=simple</arg>
+ <arg>-Xplugin:ErrorProne -Xep:MissingOverride:ERROR -Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:WaitNotInLoop:ERROR -XepExcludedPaths:.*/generated-sources/.*</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>owasp</id>
<properties>
<skipOWASP>false</skipOWASP>
@@ -1396,34 +1430,15 @@
<artifactId>maven-compiler-plugin</artifactId>
<!-- version 3.2 is having problems with the APT processor resulting in
java.lang.IllegalStateException: endPosTable already set -->
- <version>3.1</version>
+ <version>3.8.1</version>
<!-- Enable Google's Error-Prone https://github.com/google/error-prone -->
<configuration>
- <showWarnings>true</showWarnings>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <compilerId>${javac-compiler-id}</compilerId>
- <compilerArgs>
- <arg>-Xep:MissingOverride:ERROR</arg>
- <arg>-Xep:NonAtomicVolatileUpdate:ERROR</arg>
- <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg>
- <arg>-Xep:StaticAccessedFromInstance:ERROR</arg>
- <arg>-Xep:SynchronizeOnNonFinalField:ERROR</arg>
- <arg>-Xep:WaitNotInLoop:ERROR</arg>
- <arg>-Xdiags:verbose</arg>
- </compilerArgs>
+ <showWarnings>true</showWarnings>
+ <compilerArgs combine.children="append">
+ <arg>-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar -Xep:MissingOverride:ERROR -Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticAccessedFromInstance:ERROR -Xep:SynchronizeOnNonFinalField:ERROR -Xep:WaitNotInLoop:ERROR</arg>
+ <arg>-Xdiags:verbose</arg>
+ </compilerArgs>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.8</version>
- </dependency>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.0.9</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1433,8 +1448,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
-
- <version>2.9</version>
+ <version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1605,7 +1619,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.1.1</version>
<dependencies>
<dependency>
<groupId>com.github.sevntu-checkstyle</groupId>
@@ -1729,7 +1743,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
+ <version>4.2.1</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -1822,7 +1836,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10.4</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>1024m</maxmemory>
diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml
index 666ea83..2565ce6 100644
--- a/tests/artemis-test-support/pom.xml
+++ b/tests/artemis-test-support/pom.xml
@@ -81,6 +81,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 80e38f5..9ebab02 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -33,6 +33,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
<version>${project.version}</version>
@@ -166,6 +170,7 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -267,7 +272,6 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -276,12 +280,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling-river</artifactId>
- <version>2.0.2.Final</version>
+ <version>2.0.9.Final</version>
</dependency>
</dependencies>
@@ -324,7 +327,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:${project.version}</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -346,7 +349,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.6.3</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.6.3</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.6.3</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -370,7 +373,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.7.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.7.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.7.0</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -395,8 +398,8 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.10.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
- <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.2.Final</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+ <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -420,7 +423,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.4.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.4.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.4.0</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -444,7 +447,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.1.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.1.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.1.0</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -468,7 +471,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:2.0.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.0.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.0.0</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -492,7 +495,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:1.4.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:1.4.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:1.4.0</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -516,8 +519,8 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
- <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.2.Final</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+ <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -542,7 +545,7 @@
</extraRepositories>
<libListWithDeps>
<arg>org.hornetq:hornetq-jms-server:2.3.5.Final</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -567,7 +570,7 @@
</extraRepositories>
<libListWithDeps>
<arg>org.hornetq:hornetq-jms-server:2.4.7.Final</arg>
- <arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg>
+ <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -635,7 +638,7 @@
</property>
</systemProperties>
<skipTests>${skipCompatibilityTests}</skipTests>
- <argLine>-Djgroups.bind_addr=::1 ${activemq-surefire-argline}</argLine>
+ <argLine>${modular.jdk.surefire.arg} -Djgroups.bind_addr=::1 ${activemq-surefire-argline}</argLine>
</configuration>
</plugin>
<!-- during testing and debugging, it may be useful to add all the classpath variables to your IDE settings and run compatibility tests manually.
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
index 3faabff..6bdd500 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
@@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.compatibility.base;
import java.io.File;
import java.lang.reflect.Method;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.HashMap;
@@ -33,29 +32,45 @@ import org.junit.rules.TemporaryFolder;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
+
+
public class ClasspathBase {
@ClassRule
public static TemporaryFolder serverFolder;
+ private static int javaVersion;
static {
File parent = new File("./target/tmp");
parent.mkdirs();
serverFolder = new TemporaryFolder(parent);
+ String version = System.getProperty("java.version");
+ if (version.startsWith("1.")) {
+ version = version.substring(2, 3);
+ } else {
+ int dot = version.indexOf(".");
+ if (dot != -1) {
+ version = version.substring(0, dot);
+ }
+ }
+ javaVersion = Integer.parseInt(version);
}
protected static Map<String, ClassLoader> loaderMap = new HashMap<>();
private static HashSet<String> printed = new HashSet<>();
- protected ClassLoader defineClassLoader(String classPath) throws MalformedURLException {
+ protected ClassLoader defineClassLoader(String classPath) throws Exception {
String[] classPathArray = classPath.split(File.pathSeparator);
URL[] elements = new URL[classPathArray.length];
for (int i = 0; i < classPathArray.length; i++) {
elements[i] = new File(classPathArray[i]).toPath().toUri().toURL();
}
-
+ if (javaVersion > 8) {
+ ClassLoader parent = (ClassLoader) ClassLoader.class.getDeclaredMethod("getPlatformClassLoader").invoke(null);
+ return new URLClassLoader(elements, parent);
+ }
return new URLClassLoader(elements, null);
}
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index f6928a0..e72d392 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -34,6 +34,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
<version>${project.version}</version>
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
index b73b2cf..d8fc811 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
import org.apache.activemq.command.ActiveMQDestination;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -85,6 +86,8 @@ public class JMSConsumer9Test extends BasicOpenWireTest {
assertEquals(4, counter.get());
}
+ @Test
+ @Ignore
public void testMessageListenerWithConsumer() throws Exception {
final AtomicInteger counter = new AtomicInteger(0);
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 2f4dbe6..e96b72f 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -112,6 +112,10 @@
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
index fad600c..c3f2945 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
public class TransactedSessionTest extends JMSTestCase {
@@ -617,6 +618,8 @@ public class TransactedSessionTest extends JMSTestCase {
}
+ @Test
+ @Ignore
public void _testSendCommitQueueCommitsInOrder() throws Exception {
Connection conn = null;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
index b791ce2..8a72da1 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
@@ -23,7 +23,6 @@ import javax.jms.Message;
import javax.jms.MessageFormatException;
import java.io.File;
import java.io.Serializable;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -87,7 +86,7 @@ public class BodyIsAssignableFromTest extends MessageBodyTestCase {
Object receivedBody = msg.getBody(c);
Assert.assertTrue("correct type " + c, c.isInstance(receivedBody));
if (body.getClass().isAssignableFrom(byte[].class)) {
- Arrays.equals((byte[]) body, (byte[]) receivedBody);
+ Assert.assertArrayEquals(byte[].class.cast(body), (byte[]) receivedBody);
} else {
Assert.assertEquals("clazz=" + c + ", bodies must match.. " + body.equals(receivedBody), body, receivedBody);
}
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index 9a7edf0..9489a6e 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -103,6 +103,10 @@
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
diff --git a/tests/karaf-client-integration-tests/pom.xml b/tests/karaf-client-integration-tests/pom.xml
index 6e524fb..de8883a 100644
--- a/tests/karaf-client-integration-tests/pom.xml
+++ b/tests/karaf-client-integration-tests/pom.xml
@@ -37,6 +37,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<scope>test</scope>
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index 1f60f72..ab568db 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -33,6 +33,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 3b520dc..e0da55e 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -91,6 +91,10 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index b39e3cf..15ea7e8 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -34,6 +34,10 @@
<dependencies>
<dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index e7e1e66..3829f09 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -119,6 +119,10 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index e611d5e..61b71c0 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -102,6 +102,10 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 71d48f7..4511b97 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -170,6 +170,10 @@
<version>${netty-tcnative-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
</dependencies>
[activemq-artemis] 06/08: ARTEMIS-2109: use default 1.8 compiler
source/target config as with other examples,
newest JDKs no longer target 1.6. Fix SSL example. Allows building on JDK
14+.
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 12bc494f72753c57be0fdac86fd46734181f33a0
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Jun 11 17:49:39 2020 +0100
ARTEMIS-2109: use default 1.8 compiler source/target config as with other examples, newest JDKs no longer target 1.6. Fix SSL example. Allows building on JDK 14+.
---
examples/features/sub-modules/tomcat/pom.xml | 12 +-----------
.../stomp/stomp-dual-authentication/readme.md | 4 ++--
.../jms/example/StompDualAuthenticationExample.java | 4 ----
.../activemq/server0/client-side-keystore.jks | Bin 1303 -> 2597 bytes
.../activemq/server0/client-side-truststore.jks | Bin 963 -> 1170 bytes
.../activemq/server0/server-side-keystore.jks | Bin 2253 -> 2565 bytes
.../activemq/server0/server-side-truststore.jks | Bin 1732 -> 1202 bytes
7 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/examples/features/sub-modules/tomcat/pom.xml b/examples/features/sub-modules/tomcat/pom.xml
index cc642cf..4aaab0f 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -35,7 +35,6 @@ under the License.
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<projectBaseUri>${project.baseUri}</projectBaseUri>
- <java.version>1.6</java.version>
<servlet-api.version>3.0-alpha-1</servlet-api.version>
</properties>
@@ -77,15 +76,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.1</version>
@@ -122,4 +112,4 @@ under the License.
</plugin>
</plugins>
</build>
- </project>
\ No newline at end of file
+ </project>
diff --git a/examples/protocols/stomp/stomp-dual-authentication/readme.md b/examples/protocols/stomp/stomp-dual-authentication/readme.md
index 0da536a..d8b95b8 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/readme.md
+++ b/examples/protocols/stomp/stomp-dual-authentication/readme.md
@@ -6,9 +6,9 @@ This example shows you how to configure 2-way SSL along with 2 different authent
The various keystore files are generated using the following commands:
-* `keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Server, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
+* `keytool -genkey -keystore server-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=localhost, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
* `keytool -export -keystore server-side-keystore.jks -file server-side-cert.cer -storepass secureexample`
* `keytool -import -keystore client-side-truststore.jks -file server-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
* `keytool -genkey -keystore client-side-keystore.jks -storepass secureexample -keypass secureexample -dname "CN=ActiveMQ Artemis Client, OU=Artemis, O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA`
* `keytool -export -keystore client-side-keystore.jks -file client-side-cert.cer -storepass secureexample`
-* `keytool -import -keystore server-side-truststore.jks -file client-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
\ No newline at end of file
+* `keytool -import -keystore server-side-truststore.jks -file client-side-cert.cer -storepass secureexample -keypass secureexample -noprompt`
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
index dd5259d..688c03a 100644
--- a/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
+++ b/examples/protocols/stomp/stomp-dual-authentication/src/main/java/org/apache/activemq/artemis/jms/example/StompDualAuthenticationExample.java
@@ -29,9 +29,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
-import java.security.Security;
-
-import com.sun.net.ssl.internal.ssl.Provider;
/**
* An example where a client will send a Stomp message on a TCP socket
@@ -45,7 +42,6 @@ public class StompDualAuthenticationExample {
Connection connection = null;
InitialContext initialContext = null;
- Security.addProvider(new Provider());
try {
// set up SSL keystores for Stomp connection
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks
index cb65a44..88ed01f 100644
Binary files a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks and b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-keystore.jks differ
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks
index 7eb1d56..902f8f4 100644
Binary files a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks and b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/client-side-truststore.jks differ
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks
index 6089c6e..83f5e96 100644
Binary files a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks and b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-keystore.jks differ
diff --git a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks
index 0b7e224..edb5e59 100644
Binary files a/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks and b/examples/protocols/stomp/stomp-dual-authentication/src/main/resources/activemq/server0/server-side-truststore.jks differ
[activemq-artemis] 03/08: ARTEMIS-2109: Apply modified version of
Franz artemis-dto xsd workaround from #2720
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 36dbfd9ae65cc457c6ee4f6345c8d21f7071c5bb
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Jun 9 16:51:57 2020 +0100
ARTEMIS-2109: Apply modified version of Franz artemis-dto xsd workaround from #2720
updated to only cause a change if the generated schema element found isnt prefixed, i.e modifies xsd only when needed and not all the time.
---
artemis-dto/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index 7646375..1f2bf55 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -108,6 +108,13 @@
<exclude name="**/.git/**" />
<exclude name="**/.svn/**" />
</schemagen>
+ <condition property="schema-namespace-replace-token" value="xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema""
+ else="xmlns:xs="http://www.w3.org/2001/XMLSchema"">
+ <resourcecontains resource="${project.build.directory}/schema/org.apache.activemq/dto/activemq.xsd" substring="<schema elementFormDefault" />
+ </condition>
+ <replace file="${project.build.directory}/schema/org.apache.activemq/dto/activemq.xsd"
+ token="xmlns:xs="http://www.w3.org/2001/XMLSchema""
+ value="${schema-namespace-replace-token}"/>
<copy todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/schema" />
</copy>
[activemq-artemis] 08/08: This closes #3179
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 3810146dd2b670355ed74bd5860aff132a731b96
Merge: 181743f 95d8b89
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Jun 15 09:27:42 2020 -0400
This closes #3179
.travis.yml | 4 +-
artemis-boot/pom.xml | 4 +
artemis-cdi-client/pom.xml | 4 +
artemis-cli/pom.xml | 4 +
.../artemis/cli/commands/check/QueueCheck.java | 2 +-
artemis-commons/pom.xml | 4 +
.../org/apache/activemq/artemis/utils/Base64.java | 32 +--
.../activemq/artemis/utils/InetAddresses.java | 10 +-
.../activemq/artemis/utils/SpawnedVMSupport.java | 2 +-
.../ConcurrentAppendOnlyChunkedList.java | 2 +-
.../utils/collections/ConcurrentLongHashMap.java | 4 +-
.../utils/collections/ConcurrentLongHashSet.java | 2 +-
.../artemis/utils/collections/LongHashSet.java | 2 +-
.../utils/collections/SparseArrayLinkedList.java | 2 +-
.../utils/collections/UpdatableIterator.java | 2 -
.../artemis/utils/critical/CriticalComponent.java | 2 +-
.../artemis/utils/collections/LongHashSetTest.java | 1 +
artemis-core-client-all/pom.xml | 6 +-
artemis-core-client/pom.xml | 5 +-
.../apache/activemq/artemis/api/core/Message.java | 3 +-
.../artemis/api/core/RefCountMessageListener.java | 2 +-
.../artemis/api/core/client/ClientSession.java | 3 +-
.../api/core/management/ActiveMQServerControl.java | 2 +-
.../api/core/management/AddressControl.java | 2 +-
.../artemis/core/message/impl/CoreMessage.java | 1 -
.../server/ComponentConfigurationRoutingType.java | 2 +-
.../spi/core/protocol/RemotingConnection.java | 2 +-
artemis-dto/pom.xml | 18 +-
artemis-features/pom.xml | 226 ++++++++++-----------
artemis-hawtio/activemq-branding/pom.xml | 4 +
artemis-hawtio/artemis-plugin/pom.xml | 4 +
artemis-hawtio/pom.xml | 3 -
artemis-jdbc-store/pom.xml | 4 +
.../artemis/jdbc/store/drivers/JDBCUtils.java | 4 +-
artemis-jms-client-all/pom.xml | 2 +-
artemis-jms-client/pom.xml | 5 +-
.../jms/client/DefaultConnectionProperties.java | 3 +-
artemis-jms-server/pom.xml | 5 +-
.../artemis/jms/bridge/QualityOfServiceMode.java | 8 +-
artemis-journal/pom.xml | 6 +
.../artemis/core/io/buffer/TimedBuffer.java | 1 -
.../artemis/core/io/util/ByteBufferPool.java | 2 +-
.../artemis/core/journal/impl/JournalImpl.java | 6 +-
artemis-junit/pom.xml | 4 +
.../artemis/junit/ActiveMQConsumerResource.java | 4 +-
.../junit/ActiveMQDynamicProducerResource.java | 4 +-
.../artemis/junit/ActiveMQProducerResource.java | 4 +-
.../artemis/junit/EmbeddedActiveMQResource.java | 4 +-
.../artemis/junit/EmbeddedJMSResource.java | 4 +-
artemis-maven-plugin/pom.xml | 6 +-
artemis-protocols/artemis-amqp-protocol/pom.xml | 4 +
.../amqp/converter/AMQPMessageIdHelper.java | 2 +-
artemis-protocols/artemis-hornetq-protocol/pom.xml | 4 +
.../artemis-hqclient-protocol/pom.xml | 5 +-
artemis-protocols/artemis-mqtt-protocol/pom.xml | 11 +
.../artemis/core/protocol/mqtt/MQTTConnection.java | 1 -
.../artemis-openwire-protocol/pom.xml | 5 +-
artemis-protocols/artemis-stomp-protocol/pom.xml | 4 +
artemis-protocols/pom.xml | 1 -
artemis-ra/pom.xml | 4 +
artemis-rest/pom.xml | 4 +
artemis-selector/pom.xml | 38 +++-
.../activemq/artemis/selector/impl/LRUCache.java | 6 +-
artemis-server-osgi/pom.xml | 5 +-
artemis-server/pom.xml | 5 +-
.../core/config/impl/LegacyJMSConfiguration.java | 2 -
.../deployers/impl/FileConfigurationParser.java | 1 -
.../core/postoffice/impl/SimpleAddressManager.java | 4 +-
.../artemis/core/server/ServerSession.java | 2 +-
.../protocol/AbstractProtocolManagerFactory.java | 2 +-
artemis-service-extensions/pom.xml | 4 +
artemis-tools/pom.xml | 4 +
artemis-web/pom.xml | 6 +
artemis-website/pom.xml | 2 +-
etc/checkstyle-suppressions.xml | 3 +-
examples/features/sub-modules/tomcat/pom.xml | 12 +-
examples/pom.xml | 13 ++
.../stomp/stomp-dual-authentication/readme.md | 4 +-
.../example/StompDualAuthenticationExample.java | 4 -
.../activemq/server0/client-side-keystore.jks | Bin 1303 -> 2597 bytes
.../activemq/server0/client-side-truststore.jks | Bin 963 -> 1170 bytes
.../activemq/server0/server-side-keystore.jks | Bin 2253 -> 2565 bytes
.../activemq/server0/server-side-truststore.jks | Bin 1732 -> 1202 bytes
integration/activemq-spring-integration/pom.xml | 4 +
pom.xml | 111 +++++-----
tests/artemis-test-support/pom.xml | 4 +
.../transport/amqp/client/AmqpSession.java | 15 +-
.../transport/amqp/client/util/IdGenerator.java | 4 +-
tests/compatibility-tests/pom.xml | 37 ++--
.../tests/compatibility/base/ClasspathBase.java | 21 +-
tests/extra-tests/pom.xml | 14 +-
tests/integration-tests/pom.xml | 4 +
.../integration/openwire/amq/JMSConsumer9Test.java | 3 +
tests/jms-tests/pom.xml | 4 +
.../artemis/jms/tests/TransactedSessionTest.java | 3 +
.../tests/message/BodyIsAssignableFromTest.java | 3 +-
tests/joram-tests/pom.xml | 4 +
tests/karaf-client-integration-tests/pom.xml | 4 +
tests/performance-tests/pom.xml | 4 +
tests/smoke-tests/pom.xml | 4 +
tests/soak-tests/pom.xml | 4 +
tests/stress-tests/pom.xml | 4 +
tests/timing-tests/pom.xml | 4 +
tests/unit-tests/pom.xml | 4 +
104 files changed, 531 insertions(+), 332 deletions(-)
[activemq-artemis] 02/08: ARTEMIS-2109: fix javadoc errors,
remove doclint config for JDK8, remove superfluous plugin versions,
update to 3.0.1 javadoc plugin
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit d2c46762e819c97950aa480e52101dcd33dcafe9
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jun 5 15:21:38 2020 +0100
ARTEMIS-2109: fix javadoc errors, remove doclint config for JDK8, remove superfluous plugin versions, update to 3.0.1 javadoc plugin
Using 3.0.1 like the current apache parent pom [not being used], and also as newer ones break build.
---
.../org/apache/activemq/artemis/utils/Base64.java | 32 +++++++++++-----------
.../activemq/artemis/utils/InetAddresses.java | 10 +++----
.../activemq/artemis/utils/SpawnedVMSupport.java | 2 +-
.../ConcurrentAppendOnlyChunkedList.java | 2 +-
.../utils/collections/ConcurrentLongHashMap.java | 4 +--
.../utils/collections/ConcurrentLongHashSet.java | 2 +-
.../artemis/utils/collections/LongHashSet.java | 2 +-
.../utils/collections/SparseArrayLinkedList.java | 2 +-
.../utils/collections/UpdatableIterator.java | 2 --
.../artemis/utils/critical/CriticalComponent.java | 2 +-
artemis-core-client/pom.xml | 1 -
.../apache/activemq/artemis/api/core/Message.java | 2 +-
.../artemis/core/message/impl/CoreMessage.java | 1 -
.../server/ComponentConfigurationRoutingType.java | 2 +-
.../artemis/jdbc/store/drivers/JDBCUtils.java | 4 +--
artemis-jms-client/pom.xml | 1 -
artemis-jms-server/pom.xml | 1 -
.../artemis/core/io/buffer/TimedBuffer.java | 1 -
.../artemis/core/io/util/ByteBufferPool.java | 2 +-
.../artemis/core/journal/impl/JournalImpl.java | 6 ++--
.../artemis/junit/ActiveMQConsumerResource.java | 4 +--
.../junit/ActiveMQDynamicProducerResource.java | 4 +--
.../artemis/junit/ActiveMQProducerResource.java | 4 +--
.../artemis/junit/EmbeddedActiveMQResource.java | 4 +--
.../artemis/junit/EmbeddedJMSResource.java | 4 +--
.../amqp/converter/AMQPMessageIdHelper.java | 2 +-
.../artemis/core/protocol/mqtt/MQTTConnection.java | 1 -
artemis-server/pom.xml | 1 -
.../core/config/impl/LegacyJMSConfiguration.java | 2 --
.../deployers/impl/FileConfigurationParser.java | 1 -
.../core/postoffice/impl/SimpleAddressManager.java | 4 +--
.../artemis/core/server/ServerSession.java | 2 +-
pom.xml | 21 +-------------
.../transport/amqp/client/AmqpSession.java | 15 +++++-----
.../transport/amqp/client/util/IdGenerator.java | 4 +--
35 files changed, 62 insertions(+), 92 deletions(-)
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
index 75e9d98..4d0685d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java
@@ -19,7 +19,7 @@ import java.nio.charset.StandardCharsets;
/**
* <p>Encodes and decodes to and from Base64 notation.</p>
* <p>Homepage: <a href="http://iharder.net/base64">http://iharder.net/base64</a>.</p>
- * <p>The <tt>options</tt> parameter, which appears in a few places, is used to pass
+ * <p>The <code>options</code> parameter, which appears in a few places, is used to pass
* several pieces of information to the encoder. In the "higher level" methods such as
* encodeBytes( bytes, options ) the options parameter can be used to indicate such
* things as first gzipping the bytes before encoding them, not inserting linefeeds
@@ -66,9 +66,9 @@ import java.nio.charset.StandardCharsets;
* when data that's being decoded is gzip-compressed and will decompress it
* automatically. Generally things are cleaner. You'll probably have to
* change some method calls that you were making to support the new
- * options format (<tt>int</tt>s that you "OR" together).</li>
+ * options format (<code>int</code>s that you "OR" together).</li>
* <li>v1.5.1 - Fixed bug when decompressing and decoding to a
- * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+ * byte[] using <code>decode( String s, boolean gzipCompressed )</code>.
* Added the ability to "suspend" encoding in the Output Stream so
* you can turn on and off the encoding if you need to embed base64
* data in an otherwise "normal" stream (like an XML file).</li>
@@ -484,7 +484,7 @@ public class Base64 {
* Serializes an object and returns the Base64-encoded
* version of that serialized object. If the object
* cannot be serialized or there is another error,
- * the method will return <tt>null</tt>.
+ * the method will return <code>null</code>.
* The object is not GZip-compressed before being encoded.
*
* @param serializableObject The object to encode
@@ -499,7 +499,7 @@ public class Base64 {
* Serializes an object and returns the Base64-encoded
* version of that serialized object. If the object
* cannot be serialized or there is another error,
- * the method will return <tt>null</tt>.
+ * the method will return <code>null</code>.
* <p>
* Valid options:<pre>
* GZIP: gzip-compresses object before encoding it.
@@ -931,7 +931,7 @@ public class Base64 {
/**
* Attempts to decode Base64 data and deserialize a Java
- * Object within. Returns <tt>null</tt> if there was an error.
+ * Object within. Returns <code>null</code> if there was an error.
*
* @param encodedObject The Base64 data to decode
* @return The decoded and deserialized object
@@ -972,7 +972,7 @@ public class Base64 {
*
* @param dataToEncode byte array of data to encode in base64 form
* @param filename Filename for saving encoded data
- * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+ * @return <code>true</code> if successful, <code>false</code> otherwise
* @since 2.1
*/
public static boolean encodeToFile(final byte[] dataToEncode, final String filename) {
@@ -1000,7 +1000,7 @@ public class Base64 {
*
* @param dataToDecode Base64-encoded data as a string
* @param filename Filename for saving decoded data
- * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+ * @return <code>true</code> if successful, <code>false</code> otherwise
* @since 2.1
*/
public static boolean decodeToFile(final String dataToDecode, final String filename) {
@@ -1116,7 +1116,7 @@ public class Base64 {
} // end encodeFromFile
/**
- * Reads <tt>infile</tt> and encodes it to <tt>outfile</tt>.
+ * Reads <code>infile</code> and encodes it to <code>outfile</code>.
*
* @param infile Input file
* @param outfile Output file
@@ -1153,7 +1153,7 @@ public class Base64 {
} // end encodeFileToFile
/**
- * Reads <tt>infile</tt> and decodes it to <tt>outfile</tt>.
+ * Reads <code>infile</code> and decodes it to <code>outfile</code>.
*
* @param infile Input file
* @param outfile Output file
@@ -1193,7 +1193,7 @@ public class Base64 {
/**
* A {@link Base64.InputStream} will read data from another
- * <tt>java.io.InputStream</tt>, given in the constructor,
+ * <code>java.io.InputStream</code>, given in the constructor,
* and encode/decode to/from Base64 notation on the fly.
*
* @see Base64
@@ -1224,7 +1224,7 @@ public class Base64 {
/**
* Constructs a {@link Base64.InputStream} in DECODE mode.
*
- * @param in the <tt>java.io.InputStream</tt> from which to read data.
+ * @param in the <code>java.io.InputStream</code> from which to read data.
* @since 1.3
*/
public InputStream(final java.io.InputStream in) {
@@ -1244,7 +1244,7 @@ public class Base64 {
* <p>
* Example: <code>new Base64.InputStream( in, Base64.DECODE )</code>
*
- * @param in the <tt>java.io.InputStream</tt> from which to read data.
+ * @param in the <code>java.io.InputStream</code> from which to read data.
* @param options Specified options
* @see Base64#ENCODE
* @see Base64#DECODE
@@ -1404,7 +1404,7 @@ public class Base64 {
/**
* A {@link Base64.OutputStream} will write data to another
- * <tt>java.io.OutputStream</tt>, given in the constructor,
+ * <code>java.io.OutputStream</code>, given in the constructor,
* and encode/decode to/from Base64 notation on the fly.
*
* @see Base64
@@ -1437,7 +1437,7 @@ public class Base64 {
/**
* Constructs a {@link Base64.OutputStream} in ENCODE mode.
*
- * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+ * @param out the <code>java.io.OutputStream</code> to which data will be written.
* @since 1.3
*/
public OutputStream(final java.io.OutputStream out) {
@@ -1457,7 +1457,7 @@ public class Base64 {
* <p>
* Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
*
- * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+ * @param out the <code>java.io.OutputStream</code> to which data will be written.
* @param options Specified options.
* @see Base64#ENCODE
* @see Base64#DECODE
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java
index 3d4f089..021d805 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java
@@ -44,21 +44,21 @@ import static org.apache.activemq.artemis.utils.ByteUtil.intFromBytes;
*
* <p>Examples of IP addresses and their byte representations:
* <ul>
- * <li>The IPv4 loopback address, {@code "127.0.0.1"}.<br/>
+ * <li>The IPv4 loopback address, {@code "127.0.0.1"}.<br>
* {@code 7f 00 00 01}
*
- * <li>The IPv6 loopback address, {@code "::1"}.<br/>
+ * <li>The IPv6 loopback address, {@code "::1"}.<br>
* {@code 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01}
*
* <li>From the IPv6 reserved documentation prefix ({@code 2001:db8::/32}),
- * {@code "2001:db8::1"}.<br/>
+ * {@code "2001:db8::1"}.<br>
* {@code 20 01 0d b8 00 00 00 00 00 00 00 00 00 00 00 01}
*
* <li>An IPv6 "IPv4 compatible" (or "compat") address,
- * {@code "::192.168.0.1"}.<br/>
+ * {@code "::192.168.0.1"}.<br>
* {@code 00 00 00 00 00 00 00 00 00 00 00 00 c0 a8 00 01}
*
- * <li>An IPv6 "IPv4 mapped" address, {@code "::ffff:192.168.0.1"}.<br/>
+ * <li>An IPv6 "IPv4 mapped" address, {@code "::ffff:192.168.0.1"}.<br>
* {@code 00 00 00 00 00 00 00 00 00 00 ff ff c0 a8 00 01}
* </ul>
*
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index d998715..e71c57f 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -171,7 +171,7 @@ public class SpawnedVMSupport {
* @param logOutput
* @param logErrorOutput
* @param useLogging
- * @param debugPort if <=0 it means no debug
+ * @param debugPort if <=0 it means no debug
* @param args
* @return
* @throws IOException
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java
index f55d9e1..49981fd 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java
@@ -64,7 +64,7 @@ public final class ConcurrentAppendOnlyChunkedList<T> {
private volatile long cachedLastIndex = 0;
/**
- * @throws IllegalArgumentException if {@code chunkSize} is <0 or not a power of 2
+ * @throws IllegalArgumentException if {@code chunkSize} is <0 or not a power of 2
*/
public ConcurrentAppendOnlyChunkedList(final int chunkSize) {
if (chunkSize <= 0) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java
index 32dd819..e632f02 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java
@@ -33,9 +33,9 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
/**
* Map from long to an Object.
*
- * Provides similar methods as a ConcurrentMap<long,Object> with 2 differences:
+ * Provides similar methods as a {@literal ConcurrentMap<long,Object>} with 2 differences:
* <ol>
- * <li>No boxing/unboxing from long -> Long
+ * <li>No boxing/unboxing from {@literal long -> Long}
* <li>Open hash map with linear probing, no node allocations to store the values
* </ol>
*
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
index 90efca1..f46e602 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
@@ -34,7 +34,7 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
* Provides similar methods as a ConcurrentSet<Long> but since it's an open hash map with linear probing, no node
* allocations are required to store the values.
* <p>
- * Items <strong>MUST</strong> be >= 0.
+ * Items <strong>MUST</strong> be >= 0.
*/
public class ConcurrentLongHashSet {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java
index a86a7f2..201bb93 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java
@@ -28,7 +28,7 @@ import java.util.NoSuchElementException;
import java.util.Set;
/**
- * A hash set implementation of {@link Set<Long>} that uses open addressing values.
+ * A hash set implementation of {@literal Set<Long>} that uses open addressing values.
* To minimize the memory footprint, this class uses open addressing rather than chaining.
* Collisions are resolved using linear probing. Deletions implement compaction, so cost of
* remove can approach O(N) for full maps, which makes a small loadFactor recommended.
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java
index f6b2a51..e77fcbe 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java
@@ -28,7 +28,7 @@ import java.util.function.Predicate;
* it's a linked list of arrays/chunks of {@code T}.<br>
* Differently from an {@code UnrolledLinkedList} this list doesn't optimize addition and removal to achieve a balanced
* utilization among chunks ie a chunk is removed only if empty and chunks can't be merged.
- * This list has been optimized for small-sized chunks (ideally <= 32 elements): this allow search/removal to
+ * This list has been optimized for small-sized chunks (ideally <= 32 elements): this allow search/removal to
* be performed with a greedy approach despite a sparse chunk utilization (ie chunks contains few sparse elements).<br>
*
* From the memory footprint's point of view, this list won't remove the last remaining array although empty to optimize
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java
index d4e15fa..204f672 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java
@@ -52,8 +52,6 @@ public class UpdatableIterator<E> implements ResettableIterator<E>, RepeatableIt
* It is important that on nulling off the changedIterator, we atomically compare and set as the
* changedIterator could be further updated by another thread whilst we are resetting,
* the subsequent update simply would be picked up on the next reset.
- *
- * @return this (itself).
*/
@Override
public void reset() {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java
index 837b1ab..39d4614 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java
@@ -22,7 +22,7 @@ package org.apache.activemq.artemis.utils.critical;
* You update a long every time you enter a critical path
* you update a different long with a System.nanoTime every time you leave that path.
*
- * If the enterCritical > leaveCritical at any point, then you need to measure the timeout.
+ * If the enterCritical > leaveCritical at any point, then you need to measure the timeout.
* if the system stops responding, then you have something irresponsive at the system.
*/
public interface CriticalComponent {
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 3048279..058a90a 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -146,7 +146,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory>
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index f8053c9..4ade8bb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -179,7 +179,7 @@ public interface Message {
byte STREAM_TYPE = 6;
- /** The message will contain another message persisted through {@link org.apache.activemq.artemis.spi.core.protocol.EmbedMessageUtil}*/
+ /** The message will contain another message persisted through {@literal org.apache.activemq.artemis.spi.core.protocol.EmbedMessageUtil}*/
byte EMBEDDED_TYPE = 7;
/** This is to embedd Large Messages from other protocol */
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 7ad2c6b..781e59e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -211,7 +211,6 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
* This will return the proper buffer to represent the data of the Message. If compressed it will decompress.
* If large, it will read from the file or streaming.
* @return
- * @throws ActiveMQException
*/
@Override
public ActiveMQBuffer getDataBuffer() {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java
index 780572e..d9ad4dd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java
@@ -18,7 +18,7 @@ package org.apache.activemq.artemis.core.server;
/**
* This class essentially mirrors {@code RoutingType} except it has some additional members to support special
- * configuration semantics for diverts & bridges. These additional members weren't put in {@code RoutingType}
+ * configuration semantics for diverts and bridges. These additional members weren't put in {@code RoutingType}
* so as to not confuse users.
*/
public enum ComponentConfigurationRoutingType {
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
index bf57e9a..ce6dc6f 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
@@ -40,7 +40,7 @@ public class JDBCUtils {
}
/**
- * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.<br/>
+ * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.<br>
* The information appended are:
* <ul>
* <li>SQL STATEMENTS</li>
@@ -61,7 +61,7 @@ public class JDBCUtils {
}
/**
- * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.<br/>
+ * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.<br>
* The information appended are:
* <ul>
* <li>SQL EXCEPTIONS details ({@link SQLException#getSQLState},
diff --git a/artemis-jms-client/pom.xml b/artemis-jms-client/pom.xml
index c844950..01fdb46 100644
--- a/artemis-jms-client/pom.xml
+++ b/artemis-jms-client/pom.xml
@@ -89,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory>
diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml
index 82e54c4..905d249 100644
--- a/artemis-jms-server/pom.xml
+++ b/artemis-jms-server/pom.xml
@@ -104,7 +104,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory>
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
index 942f88c..91f9895 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java
@@ -527,7 +527,6 @@ public final class TimedBuffer extends CriticalComponentImpl {
* Sub classes (tests basically) can use this to override how the sleep is being done
*
* @param sleepNanos
- * @throws InterruptedException
*/
protected void sleep(long sleepNanos) {
LockSupport.parkNanos(sleepNanos);
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java
index bebb514..7aac750 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
public interface ByteBufferPool {
/**
- * It returns a {@link ByteBuffer} with {@link ByteBuffer#capacity()}>={@code size}.<br>
+ * It returns a {@link ByteBuffer} with {@link ByteBuffer#capacity()} >= {@code size}.<br>
* The {@code buffer} is zeroed until {@code size} if {@code zeroed=true}, with {@link ByteBuffer#position()}=0 and {@link ByteBuffer#limit()}={@code size}.
*/
ByteBuffer borrow(int size, boolean zeroed);
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index d5d4a81..af443c4 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -1846,7 +1846,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
/**
* <p>Load data accordingly to the record layouts</p>
* <p>Basic record layout:</p>
- * <table border=1 summary="">
+ * <table border=1>
+ * <caption></caption>
* <tr><td><b>Field Name</b></td><td><b>Size</b></td></tr>
* <tr><td>RecordType</td><td>Byte (1)</td></tr>
* <tr><td>FileID</td><td>Integer (4 bytes)</td></tr>
@@ -1860,7 +1861,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
* </table>
* <p> The check-size is used to validate if the record is valid and complete </p>
* <p>Commit/Prepare record layout:</p>
- * <table border=1 summary="">
+ * <table border=1>
+ * <caption></caption>
* <tr><td><b>Field Name</b></td><td><b>Size</b></td></tr>
* <tr><td>RecordType</td><td>Byte (1)</td></tr>
* <tr><td>FileID</td><td>Integer (4 bytes)</td></tr>
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
index 967d971..8e8428a 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
@@ -32,10 +32,10 @@ import org.apache.activemq.artemis.api.core.RoutingType;
*
* <pre><code>
* public class SimpleTest {
- * @Rule
+ * @Rule
* public ActiveMQConsumerResource client = new ActiveMQProducerResource( "vm://0", "test.queue" );
*
- * @Test
+ * @Test
* public void testSomething() throws Exception {
* // Use the embedded client here
* ClientMessage message = client.receiveMessage();
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
index 612ab45..027ada9 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
@@ -32,10 +32,10 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
*
* <pre><code>
* public class SimpleTest {
- * @Rule
+ * @Rule
* public ActiveMQDynamicProducerResource producer = new ActiveMQDynamicProducerResource( "vm://0");
*
- * @Test
+ * @Test
* public void testSomething() throws Exception {
* // Use the embedded ClientProducer here
* producer.sendMessage( "test.address", "String Body" );
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
index 33ae4d2..75d413e 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
@@ -33,10 +33,10 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
*
* <pre><code>
* public class SimpleTest {
- * @Rule
+ * @Rule
* public ActiveMQProducerResource producer = new ActiveMQProducerResource( "vm://0", "test.queue");
*
- * @Test
+ * @Test
* public void testSomething() throws Exception {
* // Use the embedded ClientProducer here
* producer.sendMessage( "String Body" );
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
index 6ae3c6a..6c038f2 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
@@ -55,10 +55,10 @@ import org.slf4j.LoggerFactory;
*
* <pre><code>
* public class SimpleTest {
- * @Rule
+ * @Rule
* public EmbeddedActiveMQResource server = new EmbeddedActiveMQResource();
*
- * @Test
+ * @Test
* public void testSomething() throws Exception {
* // Use the embedded server here
* }
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
index be21a6f..acd98b8 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
@@ -66,10 +66,10 @@ import org.slf4j.LoggerFactory;
*
* <pre><code>
* public class SimpleTest {
- * @Rule
+ * @Rule
* public EmbeddedJMSResource server = new EmbeddedJMSResource();
*
- * @Test
+ * @Test
* public void testSomething() throws Exception {
* // Use the embedded server here
* }
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java
index e53d2cc..baf08ae 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java
@@ -208,7 +208,7 @@ public class AMQPMessageIdHelper {
* the object to be converted
* @return the AMQP messageId style object
*
- * @throws IllegalArgument
+ * @throws ActiveMQAMQPIllegalStateException
* if the provided baseId String indicates an encoded type but can't
* be converted to that type.
*/
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
index 9f7d6f4..fbc6d8a 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
@@ -288,7 +288,6 @@ public class MQTTConnection implements RemotingConnection {
* Sets the client ID associated with this connection
*
* @param cID
- * @return
*/
@Override
public void setClientID(String cID) {
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index f5436f3..d472cd0 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -222,7 +222,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory>
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
index 7b495dd..884a5f9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
@@ -139,7 +139,6 @@ public class LegacyJMSConfiguration implements Deployable {
* Parse the topic node as a TopicConfiguration object
*
* @param node
- * @return topic configuration
* @throws Exception
*/
public void parseTopicConfiguration(final Node node) throws Exception {
@@ -153,7 +152,6 @@ public class LegacyJMSConfiguration implements Deployable {
* Parse the Queue Configuration node as a QueueConfiguration object
*
* @param node
- * @return jms queue configuration
* @throws Exception
*/
public void parseQueueConfiguration(final Node node) throws Exception {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index f42ae97..7fe293b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -2362,7 +2362,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
/**
* @param e
- * @return
*/
protected void parseWildcardConfiguration(final Element e, final Configuration mainConfig) {
WildcardConfiguration conf = mainConfig.getWildcardConfiguration();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
index 206891e..2510a91 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
@@ -55,12 +55,12 @@ public class SimpleAddressManager implements AddressManager {
private final StorageManager storageManager;
/**
- * HashMap<Address, Binding>
+ * {@code HashMap<Address, Binding>}
*/
protected final ConcurrentMap<SimpleString, Bindings> mappings = new ConcurrentHashMap<>();
/**
- * HashMap<QueueName, Binding>
+ * {@code HashMap<QueueName, Binding>}
*/
private final ConcurrentMap<SimpleString, Binding> nameMap = new ConcurrentHashMap<>();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
index 514f458..aff59ec 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
@@ -278,7 +278,7 @@ public interface ServerSession extends SecurityAuth {
* This method invokes {@link ActiveMQServer#createQueue(QueueConfiguration)} with a few client-specific additions:
* <p><ul>
* <li>set the routing type based on the prefixes configured on the acceptor used by the client
- * <li>strip any prefixes from the address & queue names (if applicable)
+ * <li>strip any prefixes from the address and queue names (if applicable)
* <li>check authorization based on the client's credentials
* <li>enforce queue creation resource limit
* <li>set up callbacks to clean up temporary queues once the client disconnects
diff --git a/pom.xml b/pom.xml
index 9a08153..92913d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -884,13 +884,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration combine.self="override" />
@@ -916,17 +909,6 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<id>java9on</id>
@@ -1448,7 +1430,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1836,7 +1818,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>1024m</maxmemory>
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
index ff23e67..86309eb 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
@@ -180,9 +180,9 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
*
* @param address
* the address to which the sender will produce its messages.
- * @param senderSettlementMode
+ * @param senderMode
* controls the settlement mode used by the created Sender
- * @param receiverSettlementMode
+ * @param receiverMode
* controls the desired settlement mode used by the remote Receiver
*
* @return a newly created sender that is ready for use.
@@ -200,9 +200,9 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
*
* @param address
* the address to which the sender will produce its messages.
- * @param senderSettlementMode
+ * @param senderMode
* controls the settlement mode used by the created Sender
- * @param receiverSettlementMode
+ * @param receiverMode
* controls the desired settlement mode used by the remote Receiver
* @param outcomes
* specifies the outcomes supported by the sender
@@ -387,9 +387,9 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
*
* @param address
* the address to which the receiver will subscribe for its messages.
- * @param senderSettlementMode
+ * @param senderMode
* controls the desired settlement mode used by the remote Sender
- * @param receiverSettlementMode
+ * @param receiverMode
* controls the settlement mode used by the created Receiver
*
* @return a newly created receiver that is ready for use.
@@ -491,9 +491,8 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
}
/**
- * Create a receiver instance using the given Source
+ * Create a receiver instance using the given receiverId
*
- * @param source the caller created and configured Source used to create the receiver link.
* @return a newly created receiver that is ready for use.
* @throws Exception if an error occurs while creating the receiver.
*/
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
index f93ca6e..7a2017f 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java
@@ -231,7 +231,7 @@ public class IdGenerator {
/**
* When using the {@link java.net.InetAddress#getHostName()} method in an
- * environment where neither a proper DNS lookup nor an <tt>/etc/hosts</tt>
+ * environment where neither a proper DNS lookup nor an <code>/etc/hosts</code>
* entry exists for a given host, the following exception will be thrown:
* <code>
* java.net.UnknownHostException: <hostname>: <hostname>
@@ -241,7 +241,7 @@ public class IdGenerator {
* Instead of just throwing an UnknownHostException and giving up, this
* method grabs a suitable hostname from the exception and prevents the
* exception from being thrown. If a suitable hostname cannot be acquired
- * from the exception, only then is the <tt>UnknownHostException</tt> thrown.
+ * from the exception, only then is the <code>UnknownHostException</code> thrown.
*
* @return The hostname
* @throws UnknownHostException if the given host cannot be looked up.
[activemq-artemis] 07/08: ARTEMIS-2109: enable JDK11 + JDK14 builds
in Travs CI, and fix before_cache config
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 95d8b89c52d788910f7153f309af20c682c32824
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Fri Jun 5 16:06:48 2020 +0100
ARTEMIS-2109: enable JDK11 + JDK14 builds in Travs CI, and fix before_cache config
---
.travis.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 773c75c..46b5e3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: java
install: true
jdk:
- openjdk8
+ - openjdk11
+ - openjdk14
# clean out Artemis artifacts from the cache
before_install:
@@ -19,5 +21,5 @@ script:
cache:
directories:
- $HOME/.m2
- before_cache:
+before_cache:
- rm -rf $HOME/.m2/repository/org/apache/activemq/artemis-*