Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2109: Updating the build to be able to execute it on Java 11 and Java 8.

This commit is contained in:
Emmanuel Hugonnet 2020-04-29 18:14:47 +02:00 committed by Robbie Gemmell
parent 181743f302
commit efe0f468de
64 changed files with 435 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-boot/pom.xml
View File

@ -35,6 +35,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

4
artemis-cdi-client/pom.xml
View File

@ -48,6 +48,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

4
artemis-cli/pom.xml
View File

@ -108,6 +108,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

2
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/check/QueueCheck.java
View File

@ -101,7 +101,7 @@ public class QueueCheck extends CheckAbstract {
if (browse != null) { if (browse != null) {
if (browse == -1) { 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)); getName()), this::checkQueueBrowse));
} else if (browse > 0) { } else if (browse > 0) {
checkTasks.add(new CheckTask(String.format("a consumer can browse %d messages from the queue %s", checkTasks.add(new CheckTask(String.format("a consumer can browse %d messages from the queue %s",

4
artemis-commons/pom.xml
View File

@ -50,6 +50,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.common</groupId> <groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId> <artifactId>wildfly-common</artifactId>

1
artemis-commons/src/test/java/org/apache/activemq/artemis/utils/collections/LongHashSetTest.java
View File

@ -247,6 +247,7 @@ public class LongHashSetTest {
Assert.assertEquals(1, testSet.size()); Assert.assertEquals(1, testSet.size());
} }
@SuppressWarnings("CollectionToArraySafeParameter")
@Test(expected = ArrayStoreException.class) @Test(expected = ArrayStoreException.class)
public void toArrayThrowsArrayStoreExceptionForWrongType() { public void toArrayThrowsArrayStoreExceptionForWrongType() {
testSet.toArray(new String[1]); testSet.toArray(new String[1]);

6
artemis-core-client-all/pom.xml
View File

@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.0</version> <version>3.2.3</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -97,8 +97,8 @@
</transformers> </transformers>
<relocations> <relocations>
<relocation> <relocation>
<pattern>org.apache.activemq</pattern> <pattern>org.apache.activemq</pattern>
<shadedPattern>org.apache.activemq</shadedPattern> <shadedPattern>org.apache.activemq</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.apache.geronimo</pattern> <pattern>org.apache.geronimo</pattern>

4
artemis-core-client/pom.xml
View File

@ -56,6 +56,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.wildfly.common</groupId> <groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId> <artifactId>wildfly-common</artifactId>

1
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
View File

@ -676,7 +676,6 @@ public interface Message {
/** /**
* @see #usageUp() * @see #usageUp()
* @return * @return
* @throws Exception
*/ */
int usageDown(); int usageDown();

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/RefCountMessageListener.java
View File

@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core; 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 */ * These methods will be called during refCount operations */
public interface RefCountMessageListener { public interface RefCountMessageListener {

3
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
View File

@ -310,8 +310,7 @@ public interface ClientSession extends XAResource, AutoCloseable {
* </ul><p> * </ul><p>
* *
* @param queueConfiguration the configuration to use when creating the queue * @param queueConfiguration the configuration to use when creating the queue
* @return the {@code Queue} instance that was created * @throws ActiveMQException
* @throws Exception
*/ */
void createQueue(QueueConfiguration queueConfiguration) throws ActiveMQException; void createQueue(QueueConfiguration queueConfiguration) throws ActiveMQException;

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
View File

@ -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). * List the information about a user or all users if no username is supplied (only applicable when using the JAAS PropertiesLoginModule).
* *
* @param username * @param username
* @return JSON array of user & role information * @return JSON array of user and role information
* @throws Exception * @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) @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)

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressControl.java
View File

@ -84,7 +84,7 @@ public interface AddressControl {
String[] getQueueNames() throws Exception; 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") @Attribute(desc = "names of both the local & remote queue(s) bound to this address")
String[] getAllQueueNames() throws Exception; String[] getAllQueueNames() throws Exception;

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/RemotingConnection.java
View File

@ -240,7 +240,7 @@ public interface RemotingConnection extends BufferHandler {
/** /**
* Sets the client ID associated with this connection * Sets the client ID associated with this connection
* @return * @param cID
*/ */
void setClientID(String cID); void setClientID(String cID);

11
artemis-dto/pom.xml
View File

@ -35,6 +35,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId> <artifactId>artemis-commons</artifactId>
@ -87,7 +91,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version> <version>1.8</version>
<executions> <executions>
<execution> <execution>
<phase>generate-resources</phase> <phase>generate-resources</phase>
@ -130,6 +134,11 @@
<artifactId>jaxb-jxc</artifactId> <artifactId>jaxb-jxc</artifactId>
<version>${version.jaxb}</version> <version>${version.jaxb}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${version.activation}</version>
</dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>

226
artemis-features/pom.xml
View File

@ -1,19 +1,19 @@
<!-- <!--
~ Licensed to the Apache Software Foundation (ASF) under one or more ~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with ~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership. ~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0 ~ 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 not use this file except in compliance with
~ the License. You may obtain a copy of the License at ~ the License. You may obtain a copy of the License at
~ ~
~ http://www.apache.org/licenses/LICENSE-2.0 ~ http://www.apache.org/licenses/LICENSE-2.0
~ ~
~ Unless required by applicable law or agreed to in writing, software ~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS, ~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -25,104 +25,104 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ActiveMQ Artemis Features</name> <name>ActiveMQ Artemis Features</name>
<properties> <properties>
<karaf.version>4.1.1</karaf.version> <karaf.version>4.2.8</karaf.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.karaf.features</groupId> <groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>${karaf.version}</version> <version>${karaf.version}</version>
<type>kar</type> <type>kar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>filter</id> <id>filter</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>resources</goal> <goal>resources</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.karaf.tooling</groupId> <groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId> <artifactId>karaf-maven-plugin</artifactId>
<version>${karaf.version}</version> <version>${karaf.version}</version>
<executions> <executions>
<execution> <execution>
<id>verify</id> <id>verify</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>verify</goal> <goal>verify</goal>
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor> <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>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor> <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>
</descriptors> </descriptors>
<distribution>org.apache.karaf.features:framework</distribution> <distribution>org.apache.karaf.features:framework</distribution>
<javase>1.8</javase> <javase>11</javase>
<framework> <framework>
<feature>framework</feature> <feature>framework</feature>
</framework> </framework>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>attach-artifacts</id> <id>attach-artifacts</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>attach-artifact</goal> <goal>attach-artifact</goal>
</goals> </goals>
<configuration> <configuration>
<artifacts> <artifacts>
<artifact> <artifact>
<file>target/classes/features.xml</file> <file>target/classes/features.xml</file>
<type>xml</type> <type>xml</type>
<classifier>features</classifier> <classifier>features</classifier>
</artifact> </artifact>
<artifact> <artifact>
<file>target/classes/artemis.xml</file> <file>target/classes/artemis.xml</file>
<classifier>artemis</classifier> <classifier>artemis</classifier>
<type>xml</type> <type>xml</type>
</artifact> </artifact>
<artifact> <artifact>
<file>target/classes/org.apache.activemq.artemis.cfg</file> <file>target/classes/org.apache.activemq.artemis.cfg</file>
<type>cfg</type> <type>cfg</type>
</artifact> </artifact>
</artifacts> </artifacts>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

4
artemis-hawtio/activemq-branding/pom.xml
View File

@ -92,6 +92,10 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>

4
artemis-hawtio/artemis-plugin/pom.xml
View File

@ -97,6 +97,10 @@
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>

3
artemis-hawtio/pom.xml
View File

@ -35,9 +35,6 @@
<activemq.basedir>${project.basedir}/..</activemq.basedir> <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> <hawtio.version>1.5.12</hawtio.version>
<jline.version>3.2.0</jline.version> <jline.version>3.2.0</jline.version>
<junit-version>4.11</junit-version> <junit-version>4.11</junit-version>

4
artemis-jdbc-store/pom.xml
View File

@ -40,6 +40,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

2
artemis-jms-client-all/pom.xml
View File

@ -44,7 +44,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.0</version> <version>3.2.3</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

4
artemis-jms-client/pom.xml
View File

@ -38,6 +38,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId> <artifactId>artemis-core-client</artifactId>

3
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
View File

@ -23,7 +23,8 @@ import java.security.PrivilegedAction;
/** /**
* <p>This class will provide default properties for constructors</p> * <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>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_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> * <tr><td>AMQ_PORT or org.apache.activemq.AMQ_PORT</td> <td>61616</td></tr>

4
artemis-jms-server/pom.xml
View File

@ -44,6 +44,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

6
artemis-journal/pom.xml
View File

@ -44,6 +44,12 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<!-- <!--
JBoss Logging JBoss Logging

4
artemis-junit/pom.xml
View File

@ -38,6 +38,10 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<!-- <!--
--> -->
<dependency> <dependency>

6
artemis-maven-plugin/pom.xml
View File

@ -82,6 +82,10 @@
<version>3.4</version> <version>3.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -90,7 +94,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>3.5.2</version> <version>3.6.0</version>
<executions> <executions>
<execution> <execution>
<id>default-descriptor</id> <id>default-descriptor</id>

4
artemis-protocols/artemis-amqp-protocol/pom.xml
View File

@ -60,6 +60,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<!-- <!--
JBoss Logging JBoss Logging

4
artemis-protocols/artemis-hornetq-protocol/pom.xml
View File

@ -79,6 +79,10 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

5
artemis-protocols/artemis-hqclient-protocol/pom.xml
View File

@ -46,6 +46,10 @@
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId> <artifactId>osgi.cmpn</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -53,7 +57,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

11
artemis-protocols/artemis-mqtt-protocol/pom.xml
View File

@ -40,6 +40,10 @@
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId> <artifactId>jboss-logging-annotations</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>
@ -124,6 +128,13 @@
<version>4.0.1</version> <version>4.0.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>1.3.5</version>
<scope>test</scope>
<type>jar</type>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>

5
artemis-protocols/artemis-openwire-protocol/pom.xml
View File

@ -38,6 +38,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>
@ -123,7 +127,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

4
artemis-protocols/artemis-stomp-protocol/pom.xml
View File

@ -44,6 +44,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

1
artemis-protocols/pom.xml
View File

@ -46,7 +46,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

4
artemis-ra/pom.xml
View File

@ -44,6 +44,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

4
artemis-rest/pom.xml
View File

@ -48,6 +48,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

38
artemis-selector/pom.xml
View File

@ -32,6 +32,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId> <artifactId>artemis-commons</artifactId>
@ -81,14 +85,32 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <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" /> <configuration combine.self="override" />
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </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> </profiles>
<build> <build>
@ -99,20 +121,20 @@
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<compilerArgs> <compilerArgs>
<!-- TODO: do this only for generated-sources --> <arg>-XDcompilePolicy=simple</arg>
<arg>-Xep:MissingOverride:WARN</arg> TODO: do this only for generated-sources
<arg>-Xplugin:ErrorProne -Xep:MissingOverride:WARN</arg>
</compilerArgs> </compilerArgs>
</configuration> </configuration>
</plugin> </plugin>-->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId> <artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<phase>generate-sources</phase> <phase>generate-sources</phase>

6
artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
View File

@ -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. * initial capacity, maximumCacheSize,load factor and ordering mode.
* *
* @param initialCapacity the initial capacity. * @param initialCapacity the initial capacity.
* @param maximumCacheSize * @param maximumCacheSize
* @param loadFactor the load factor. * @param loadFactor the load factor.
* @param accessOrder the ordering mode - <tt>true</tt> for access-order, * @param accessOrder the ordering mode - <code>true</code> for access-order,
* <tt>false</tt> for insertion-order. * <code>false</code> for insertion-order.
* @throws IllegalArgumentException if the initial capacity is negative or * @throws IllegalArgumentException if the initial capacity is negative or
* the load factor is non-positive. * the load factor is non-positive.
*/ */

5
artemis-server-osgi/pom.xml
View File

@ -100,6 +100,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>
@ -137,7 +141,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

4
artemis-server/pom.xml
View File

@ -44,6 +44,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

2
artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractProtocolManagerFactory.java
View File

@ -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 * 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 * @param parameters
*/ */

4
artemis-service-extensions/pom.xml
View File

@ -63,6 +63,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logmanager</groupId> <groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId> <artifactId>jboss-logmanager</artifactId>

4
artemis-tools/pom.xml
View File

@ -32,6 +32,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

6
artemis-web/pom.xml
View File

@ -44,6 +44,12 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.logging</groupId> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId> <artifactId>jboss-logging</artifactId>

2
artemis-website/pom.xml
View File

@ -92,7 +92,6 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<executions> <executions>
<execution> <execution>
<id>javadoc-jar</id> <id>javadoc-jar</id>
@ -101,6 +100,7 @@
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
<configuration> <configuration>
<source>8</source>
<useStandardDocletOptions>true</useStandardDocletOptions> <useStandardDocletOptions>true</useStandardDocletOptions>
<minmemory>128m</minmemory> <minmemory>128m</minmemory>
<maxmemory>512m</maxmemory> <maxmemory>512m</maxmemory>

3
etc/checkstyle-suppressions.xml
View File

@ -27,6 +27,7 @@ under the License.
<suppressions> <suppressions>
<!-- Suppress unfixable violations in JavaCC generated sources --> <!-- 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> </suppressions>

4
integration/activemq-spring-integration/pom.xml
View File

@ -48,6 +48,10 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId> <artifactId>spring-beans</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

92
pom.xml
View File

@ -71,6 +71,8 @@
</prerequisites> </prerequisites>
<properties> <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 --> <!-- 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> <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
@ -127,7 +129,7 @@
<hamcrest.version>2.1</hamcrest.version> <hamcrest.version>2.1</hamcrest.version>
<!-- used on tests --> <!-- used on tests -->
<groovy.version>2.4.3</groovy.version> <groovy.version>2.5.10</groovy.version>
<owasp.version>1.4.3</owasp.version> <owasp.version>1.4.3</owasp.version>
<spring.version>5.1.7.RELEASE</spring.version> <spring.version>5.1.7.RELEASE</spring.version>
@ -158,9 +160,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <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: note for idea users:
@ -186,8 +185,6 @@
<skipStyleCheck>true</skipStyleCheck> <skipStyleCheck>true</skipStyleCheck>
<skipOWASP>true</skipOWASP> <skipOWASP>true</skipOWASP>
<javac-compiler-id>javac-with-errorprone</javac-compiler-id>
<directory-version>2.0.0-M15</directory-version> <directory-version>2.0.0-M15</directory-version>
<directory-jdbm2-version>2.0.0-M1</directory-jdbm2-version> <directory-jdbm2-version>2.0.0-M1</directory-jdbm2-version>
@ -335,6 +332,13 @@
<optional>true</optional> <optional>true</optional>
<!-- License: Apache 2.0--> <!-- License: Apache 2.0-->
</dependency> </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--> <!--needed to compile the logging jar-->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
@ -888,9 +892,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- version 3.2 is having problems with the APT processor resulting in <version>3.8.1</version>
java.lang.IllegalStateException: endPosTable already set -->
<version>3.1</version>
<configuration combine.self="override" /> <configuration combine.self="override" />
</plugin> </plugin>
<plugin> <plugin>
@ -910,6 +912,10 @@
<activation> <activation>
<jdk>1.8</jdk> <jdk>1.8</jdk>
</activation> </activation>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -922,6 +928,34 @@
</plugins> </plugins>
</build> </build>
</profile> </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> <profile>
<id>owasp</id> <id>owasp</id>
<properties> <properties>
@ -1396,34 +1430,15 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- version 3.2 is having problems with the APT processor resulting in <!-- version 3.2 is having problems with the APT processor resulting in
java.lang.IllegalStateException: endPosTable already set --> 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 --> <!-- Enable Google's Error-Prone https://github.com/google/error-prone -->
<configuration> <configuration>
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<forceJavacCompilerUse>true</forceJavacCompilerUse> <compilerArgs combine.children="append">
<compilerId>${javac-compiler-id}</compilerId> <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>
<compilerArgs> <arg>-Xdiags:verbose</arg>
<arg>-Xep:MissingOverride:ERROR</arg> </compilerArgs>
<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>
</configuration> </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>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1433,8 +1448,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>2.9</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1605,7 +1619,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version> <version>3.1.1</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.sevntu-checkstyle</groupId> <groupId>com.github.sevntu-checkstyle</groupId>
@ -1729,7 +1743,7 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version> <version>4.2.1</version>
<extensions>true</extensions> <extensions>true</extensions>
</plugin> </plugin>
<plugin> <plugin>
@ -1822,7 +1836,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version> <version>2.10.4</version>
<configuration> <configuration>
<minmemory>128m</minmemory> <minmemory>128m</minmemory>
<maxmemory>1024m</maxmemory> <maxmemory>1024m</maxmemory>

4
tests/artemis-test-support/pom.xml
View File

@ -81,6 +81,10 @@
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId> <artifactId>geronimo-jms_2.0_spec</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

37
tests/compatibility-tests/pom.xml
View File

@ -32,6 +32,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId> <artifactId>artemis-server</artifactId>
@ -166,6 +170,7 @@
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>${groovy.version}</version> <version>${groovy.version}</version>
<type>pom</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
@ -267,7 +272,6 @@
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId> <artifactId>qpid-jms-client</artifactId>
<version>${qpid.jms.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
@ -276,12 +280,11 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.marshalling</groupId> <groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling-river</artifactId> <artifactId>jboss-marshalling-river</artifactId>
<version>2.0.2.Final</version> <version>2.0.9.Final</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -324,7 +327,7 @@
<arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg> <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-amqp-protocol:${project.version}</arg>
<arg>org.apache.activemq:artemis-hornetq-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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:2.6.3</arg>
<arg>org.apache.activemq:artemis-amqp-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.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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:2.7.0</arg>
<arg>org.apache.activemq:artemis-amqp-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.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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:2.10.0</arg>
<arg>org.apache.activemq:artemis-amqp-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.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
<arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg> <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.jboss.marshalling:jboss-marshalling-river:2.0.2.Final</arg> <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:2.4.0</arg>
<arg>org.apache.activemq:artemis-amqp-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.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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:2.1.0</arg>
<arg>org.apache.activemq:artemis-amqp-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.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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:2.0.0</arg>
<arg>org.apache.activemq:artemis-amqp-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.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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:1.4.0</arg>
<arg>org.apache.activemq:artemis-amqp-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.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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <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-hornetq-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-amqp-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.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
<arg>org.codehaus.groovy:groovy-all:${groovy.version}</arg> <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.jboss.marshalling:jboss-marshalling-river:2.0.2.Final</arg> <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@ -542,7 +545,7 @@
</extraRepositories> </extraRepositories>
<libListWithDeps> <libListWithDeps>
<arg>org.hornetq:hornetq-jms-server:2.3.5.Final</arg> <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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@ -567,7 +570,7 @@
</extraRepositories> </extraRepositories>
<libListWithDeps> <libListWithDeps>
<arg>org.hornetq:hornetq-jms-server:2.4.7.Final</arg> <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> </libListWithDeps>
<libList> <libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg> <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@ -635,7 +638,7 @@
</property> </property>
</systemProperties> </systemProperties>
<skipTests>${skipCompatibilityTests}</skipTests> <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> </configuration>
</plugin> </plugin>
<!-- during testing and debugging, it may be useful to add all the classpath variables to your IDE settings and run compatibility tests manually. <!-- during testing and debugging, it may be useful to add all the classpath variables to your IDE settings and run compatibility tests manually.

21
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
View File

@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.compatibility.base;
import java.io.File; import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.HashMap; import java.util.HashMap;
@ -33,29 +32,45 @@ import org.junit.rules.TemporaryFolder;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
public class ClasspathBase { public class ClasspathBase {
@ClassRule @ClassRule
public static TemporaryFolder serverFolder; public static TemporaryFolder serverFolder;
private static int javaVersion;
static { static {
File parent = new File("./target/tmp"); File parent = new File("./target/tmp");
parent.mkdirs(); parent.mkdirs();
serverFolder = new TemporaryFolder(parent); 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<>(); protected static Map<String, ClassLoader> loaderMap = new HashMap<>();
private static HashSet<String> printed = new HashSet<>(); 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); String[] classPathArray = classPath.split(File.pathSeparator);
URL[] elements = new URL[classPathArray.length]; URL[] elements = new URL[classPathArray.length];
for (int i = 0; i < classPathArray.length; i++) { for (int i = 0; i < classPathArray.length; i++) {
elements[i] = new File(classPathArray[i]).toPath().toUri().toURL(); 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); return new URLClassLoader(elements, null);
} }

4
tests/integration-tests/pom.xml
View File

@ -33,6 +33,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId> <artifactId>artemis-server</artifactId>

3
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/amq/JMSConsumer9Test.java
View File

@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest; import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQDestination;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
@ -85,6 +86,8 @@ public class JMSConsumer9Test extends BasicOpenWireTest {
assertEquals(4, counter.get()); assertEquals(4, counter.get());
} }
@Test
@Ignore
public void testMessageListenerWithConsumer() throws Exception { public void testMessageListenerWithConsumer() throws Exception {
final AtomicInteger counter = new AtomicInteger(0); final AtomicInteger counter = new AtomicInteger(0);

4
tests/jms-tests/pom.xml
View File

@ -112,6 +112,10 @@
<groupId>org.wildfly.common</groupId> <groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId> <artifactId>wildfly-common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

3
tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
View File

@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport; import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
public class TransactedSessionTest extends JMSTestCase { public class TransactedSessionTest extends JMSTestCase {
@ -617,6 +618,8 @@ public class TransactedSessionTest extends JMSTestCase {
} }
@Test
@Ignore
public void _testSendCommitQueueCommitsInOrder() throws Exception { public void _testSendCommitQueueCommitsInOrder() throws Exception {
Connection conn = null; Connection conn = null;

3
tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BodyIsAssignableFromTest.java
View File

@ -23,7 +23,6 @@ import javax.jms.Message;
import javax.jms.MessageFormatException; import javax.jms.MessageFormatException;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -87,7 +86,7 @@ public class BodyIsAssignableFromTest extends MessageBodyTestCase {
Object receivedBody = msg.getBody(c); Object receivedBody = msg.getBody(c);
Assert.assertTrue("correct type " + c, c.isInstance(receivedBody)); Assert.assertTrue("correct type " + c, c.isInstance(receivedBody));
if (body.getClass().isAssignableFrom(byte[].class)) { if (body.getClass().isAssignableFrom(byte[].class)) {
Arrays.equals((byte[]) body, (byte[]) receivedBody); Assert.assertArrayEquals(byte[].class.cast(body), (byte[]) receivedBody);
} else { } else {
Assert.assertEquals("clazz=" + c + ", bodies must match.. " + body.equals(receivedBody), body, receivedBody); Assert.assertEquals("clazz=" + c + ", bodies must match.. " + body.equals(receivedBody), body, receivedBody);
} }

4
tests/joram-tests/pom.xml
View File

@ -103,6 +103,10 @@
<groupId>org.wildfly.common</groupId> <groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId> <artifactId>wildfly-common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>

4
tests/karaf-client-integration-tests/pom.xml
View File

@ -36,6 +36,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId> <artifactId>activemq-client</artifactId>

4
tests/performance-tests/pom.xml
View File

@ -32,6 +32,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId> <artifactId>artemis-core-client</artifactId>

4
tests/smoke-tests/pom.xml
View File

@ -90,6 +90,10 @@
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId> <artifactId>qpid-jms-client</artifactId>

4
tests/soak-tests/pom.xml
View File

@ -33,6 +33,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId> <artifactId>artemis-core-client</artifactId>

4
tests/stress-tests/pom.xml
View File

@ -119,6 +119,10 @@
<scope>test</scope> <scope>test</scope>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

4
tests/timing-tests/pom.xml
View File

@ -102,6 +102,10 @@
<scope>test</scope> <scope>test</scope>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

4
tests/unit-tests/pom.xml
View File

@ -170,6 +170,10 @@
<version>${netty-tcnative-version}</version> <version>${netty-tcnative-version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
</dependency>
</dependencies> </dependencies>