This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 819e1a9802 NO-JIRA: make various poms indents consistent
819e1a9802 is described below
commit 819e1a980293d7f6bce75b638de00eadc7cd85e7
Author: Robbie Gemmell <[email protected]>
AuthorDate: Tue Sep 12 16:53:00 2023 +0100
NO-JIRA: make various poms indents consistent
---
artemis-cli/pom.xml | 98 ++++----
artemis-core-client-all/pom.xml | 12 +-
artemis-distribution/pom.xml | 120 ++++-----
artemis-dto/pom.xml | 6 +-
artemis-jakarta-client-all/pom.xml | 8 +-
artemis-jakarta-server/pom.xml | 30 +--
artemis-jms-client-all/pom.xml | 8 +-
pom.xml | 486 ++++++++++++++++++-------------------
tests/compatibility-tests/pom.xml | 2 +-
tests/integration-tests/pom.xml | 4 +-
tests/smoke-tests/pom.xml | 2 +-
tests/unit-tests/pom.xml | 6 +-
12 files changed, 391 insertions(+), 391 deletions(-)
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index a213bc36a0..b6d57d223a 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -155,12 +155,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.winsw</groupId>
- <artifactId>winsw</artifactId>
- <version>${winsw.version}</version>
- <classifier>bin</classifier>
- <type>exe</type>
- <scope>test</scope>
+ <groupId>com.sun.winsw</groupId>
+ <artifactId>winsw</artifactId>
+ <version>${winsw.version}</version>
+ <classifier>bin</classifier>
+ <type>exe</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -197,50 +197,50 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+
<directory>${project.basedir}/src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.sun.winsw</groupId>
- <artifactId>winsw</artifactId>
- <version>${winsw.version}</version>
- <classifier>bin</classifier>
- <type>exe</type>
-
<outputDirectory>${basedir}/target/classes/org/apache/activemq/artemis/cli/commands/bin/</outputDirectory>
- <destFileName>artemis-service.exe</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.sun.winsw</groupId>
+ <artifactId>winsw</artifactId>
+ <version>${winsw.version}</version>
+ <classifier>bin</classifier>
+ <type>exe</type>
+
<outputDirectory>${basedir}/target/classes/org/apache/activemq/artemis/cli/commands/bin/</outputDirectory>
+ <destFileName>artemis-service.exe</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<repositories>
diff --git a/artemis-core-client-all/pom.xml b/artemis-core-client-all/pom.xml
index 2977ee7669..7b69452c78 100644
--- a/artemis-core-client-all/pom.xml
+++ b/artemis-core-client-all/pom.xml
@@ -72,10 +72,10 @@
<execution>
<id>default-jar</id>
<configuration>
- <!-- Ensures the shading is always working upon a fresh
base jar, which has
- nothing much in it, rather than potentially working
on already-shaded
- output still present from prior runs and renamed to
have the base name -->
- <forceCreation>true</forceCreation>
+ <!-- Ensures the shading is always working upon a fresh
base jar, which has
+ nothing much in it, rather than potentially working
on already-shaded
+ output still present from prior runs and renamed to
have the base name -->
+ <forceCreation>true</forceCreation>
</configuration>
</execution>
</executions>
@@ -135,8 +135,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-distribution/pom.xml b/artemis-distribution/pom.xml
index cb4883a030..e0779a0fa5 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -36,7 +36,7 @@
</properties>
<dependencies>
- <!-- ActiveMQ Artemis artifacts -->
+ <!-- ActiveMQ Artemis artifacts -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-boot</artifactId>
@@ -52,21 +52,21 @@
<artifactId>artemis-cli</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-ra</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-ra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-web</artifactId>
@@ -77,26 +77,26 @@
<artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-amqp-protocol</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-stomp-protocol</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-openwire-protocol</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-hornetq-protocol</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-amqp-protocol</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-stomp-protocol</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-openwire-protocol</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-hornetq-protocol</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-mqtt-protocol</artifactId>
@@ -121,30 +121,30 @@
</dependency>
<!-- dependencies -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire-legacy</artifactId>
+ </dependency>
<!-- Management Console Dependencies -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-console</artifactId>
- <version>${project.version} </version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-branding</artifactId>
- <version>${project.version} </version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-plugin</artifactId>
- <version>${project.version} </version>
- <type>war</type>
- </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-console</artifactId>
+ <version>${project.version} </version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-branding</artifactId>
+ <version>${project.version} </version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-plugin</artifactId>
+ <version>${project.version} </version>
+ <type>war</type>
+ </dependency>
<!-- quorum -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -183,7 +183,7 @@
<id>bin</id>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors>
<tarLongFileMode>posix</tarLongFileMode>
</configuration>
@@ -197,7 +197,7 @@
<configuration>
<attach>false</attach>
<descriptors>
- <descriptor>src/main/assembly/dir.xml</descriptor>
+ <descriptor>src/main/assembly/dir.xml</descriptor>
</descriptors>
<tarLongFileMode>posix</tarLongFileMode>
</configuration>
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index f807669ffa..70c81fc9f0 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -151,9 +151,9 @@
<version>${version.jaxb.runtime}</version>
</dependency>
<dependency>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation-api.version}</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>${jakarta.activation-api.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/artemis-jakarta-client-all/pom.xml
b/artemis-jakarta-client-all/pom.xml
index ee651a8586..b3352b4508 100644
--- a/artemis-jakarta-client-all/pom.xml
+++ b/artemis-jakarta-client-all/pom.xml
@@ -73,10 +73,10 @@
<execution>
<id>default-jar</id>
<configuration>
- <!-- Ensures the shading is always working upon a fresh
base jar, which has
- nothing much in it, rather than potentially working
on already-shaded
- output still present from prior runs and renamed to
have the base name -->
- <forceCreation>true</forceCreation>
+ <!-- Ensures the shading is always working upon a fresh
base jar, which has
+ nothing much in it, rather than potentially working
on already-shaded
+ output still present from prior runs and renamed to
have the base name -->
+ <forceCreation>true</forceCreation>
</configuration>
</execution>
</executions>
diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
index 8d65afbc91..e5881522bf 100644
--- a/artemis-jakarta-server/pom.xml
+++ b/artemis-jakarta-server/pom.xml
@@ -15,24 +15,24 @@
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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-pom</artifactId>
- <version>2.31.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-pom</artifactId>
+ <version>2.31.0-SNAPSHOT</version>
+ </parent>
- <artifactId>artemis-jakarta-server</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ Artemis Jakarta Messaging Server</name>
+ <artifactId>artemis-jakarta-server</artifactId>
+ <packaging>jar</packaging>
+ <name>ActiveMQ Artemis Jakarta Messaging Server</name>
- <properties>
- <activemq.basedir>${project.basedir}/..</activemq.basedir>
-
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
-
<jakarta.transaction-api.version>${jakarta.transaction-api.version.alt}</jakarta.transaction-api.version>
-
<jakarta.resource-api.version>${jakarta.resource-api.version.alt}</jakarta.resource-api.version>
- </properties>
+ <properties>
+ <activemq.basedir>${project.basedir}/..</activemq.basedir>
+
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version>
+
<jakarta.transaction-api.version>${jakarta.transaction-api.version.alt}</jakarta.transaction-api.version>
+
<jakarta.resource-api.version>${jakarta.resource-api.version.alt}</jakarta.resource-api.version>
+ </properties>
<dependencies>
<!-- logging -->
diff --git a/artemis-jms-client-all/pom.xml b/artemis-jms-client-all/pom.xml
index e3fa76353b..5d06778a24 100644
--- a/artemis-jms-client-all/pom.xml
+++ b/artemis-jms-client-all/pom.xml
@@ -72,10 +72,10 @@
<execution>
<id>default-jar</id>
<configuration>
- <!-- Ensures the shading is always working upon a fresh
base jar, which has
- nothing much in it, rather than potentially working
on already-shaded
- output still present from prior runs and renamed to
have the base name -->
- <forceCreation>true</forceCreation>
+ <!-- Ensures the shading is always working upon a fresh
base jar, which has
+ nothing much in it, rather than potentially working
on already-shaded
+ output still present from prior runs and renamed to
have the base name -->
+ <forceCreation>true</forceCreation>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index e55a91468d..b25b2494d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,7 +221,7 @@
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
- <!--
+ <!--
note for idea users:
Idea picks up surefire argline by default:
@@ -274,28 +274,28 @@
<url>https://issues.apache.org/jira/browse/ARTEMIS</url>
</issueManagement>
<developers>
- <developer>
- <name>The Apache ActiveMQ Team</name>
- <email>[email protected]</email>
- <url>http://activemq.apache.org</url>
- <organization>Apache Software Foundation</organization>
- <organizationUrl>http://apache.org/</organizationUrl>
- </developer>
+ <developer>
+ <name>The Apache ActiveMQ Team</name>
+ <email>[email protected]</email>
+ <url>http://activemq.apache.org</url>
+ <organization>Apache Software Foundation</organization>
+ <organizationUrl>http://apache.org/</organizationUrl>
+ </developer>
</developers>
- <mailingLists>
- <mailingList>
- <name>User List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
- </mailingList>
- <mailingList>
- <name>Development List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
- </mailingList>
- </mailingLists>
+ <mailingLists>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+ </mailingList>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+ </mailingList>
+ </mailingLists>
<dependencyManagement>
<dependencies>
@@ -423,10 +423,10 @@
<!-- ## End Test Dependencies ## -->
<dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>${errorprone.version}</version>
- <scope>provided</scope>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>${errorprone.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -501,31 +501,31 @@
<artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version>
<!-- License: EPL 2.0 -->
- </dependency>
- <dependency>
- <groupId>jakarta.transaction</groupId>
- <artifactId>jakarta.transaction-api</artifactId>
- <version>${jakarta.transaction-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta.transaction-api.version}</version>
<!-- License: EPL 2.0 -->
- </dependency>
- <dependency>
- <groupId>jakarta.ejb</groupId>
- <artifactId>jakarta.ejb-api</artifactId>
- <version>${jakarta.ejb-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ <version>${jakarta.ejb-api.version}</version>
<!-- License: EPL 2.0 -->
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotation-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation-api.version}</version>
<!-- License: EPL 2.0 -->
- </dependency>
- <dependency>
- <groupId>jakarta.resource</groupId>
- <artifactId>jakarta.resource-api</artifactId>
- <version>${jakarta.resource-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ <version>${jakarta.resource-api.version}</version>
<!-- License: EPL 2.0 -->
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -533,34 +533,34 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>${commons.config.version}</version>
- <!-- License: Apache 2.0 -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
+ <version>${commons.config.version}</version>
+ <!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>${commons.text.version}</version>
- <!-- License: Apache 2.0 -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons.text.version}</version>
+ <!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons.lang.version}</version>
- <!-- License: Apache 2.0 -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang.version}</version>
+ <!-- License: Apache 2.0 -->
</dependency>
<!-- ## Examples Dependencies ## -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<!-- ## End Examples Dependencies ## -->
@@ -739,9 +739,9 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-client</artifactId>
- <version>${qpid.jms.version}</version>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>${qpid.jms.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -766,10 +766,10 @@
<!-- License: Apache 2.0 -->
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <!-- License: MIT -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- License: MIT -->
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -916,16 +916,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.ant</artifactId>
- <version>${version.org.jacoco}</version>
- <scope>test</scope>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${version.org.jacoco}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.core</artifactId>
- <version>${version.org.jacoco}</version>
- <scope>test</scope>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.core</artifactId>
+ <version>${version.org.jacoco}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
@@ -1129,93 +1129,93 @@
</dependencyManagement>
<profiles>
- <profile>
- <id>M2E</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <properties>
- <javac-compiler-id>javac</javac-compiler-id>
- </properties>
- </profile>
+ <profile>
+ <id>M2E</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <properties>
+ <javac-compiler-id>javac</javac-compiler-id>
+ </properties>
+ </profile>
<profile>
- <id>jdk11to15-errorprone</id>
- <activation>
- <jdk>[11,16)</jdk>
- <property>
- <name>errorprone</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgs>
- <arg>-Xdiags:verbose</arg>
-
<arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
-
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
- <arg>-XDcompilePolicy=simple</arg>
- <arg>-Xplugin:ErrorProne
-Xep:ThreadLocalUsage:ERROR -Xep:MissingOverride:ERROR
-Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR
-Xep:StaticQualifiedUsingExpression:ERROR -Xep:WaitNotInLoop:ERROR
-Xep:BanJNDI:OFF -XepExcludedPaths:.*/generated-sources/.*</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <id>jdk11to15-errorprone</id>
+ <activation>
+ <jdk>[11,16)</jdk>
+ <property>
+ <name>errorprone</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgs>
+ <arg>-Xdiags:verbose</arg>
+
<arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
+
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
+ <arg>-XDcompilePolicy=simple</arg>
+ <arg>-Xplugin:ErrorProne -Xep:ThreadLocalUsage:ERROR
-Xep:MissingOverride:ERROR -Xep:NonAtomicVolatileUpdate:ERROR
-Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticQualifiedUsingExpression:ERROR
-Xep:WaitNotInLoop:ERROR -Xep:BanJNDI:OFF
-XepExcludedPaths:.*/generated-sources/.*</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
- <id>jdk16on-errorprone</id>
- <!-- TODO: MissingOverride check only warns in this profile for now,
as JDK15+ added a toString method to CharSequence -->
- <activation>
- <jdk>[16,)</jdk>
- <property>
- <name>errorprone</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- <compilerArgs>
- <arg>-Xdiags:verbose</arg>
-
<arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
-
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
- <arg>-XDcompilePolicy=simple</arg>
- <arg>-Xplugin:ErrorProne
-Xep:ThreadLocalUsage:ERROR -Xep:MissingOverride:WARN
-Xep:NonAtomicVolatileUpdate:ERROR -Xep:SynchronizeOnNonFinalField:ERROR
-Xep:StaticQualifiedUsingExpression:ERROR -Xep:WaitNotInLoop:ERROR
-Xep:BanJNDI:OFF -XepExcludedPaths:.*/generated-sources/.*</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
-
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
-
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <id>jdk16on-errorprone</id>
+ <!-- TODO: MissingOverride check only warns in this profile for now,
as JDK15+ added a toString method to CharSequence -->
+ <activation>
+ <jdk>[16,)</jdk>
+ <property>
+ <name>errorprone</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <compilerArgs>
+ <arg>-Xdiags:verbose</arg>
+
<arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
+
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
+ <arg>-XDcompilePolicy=simple</arg>
+ <arg>-Xplugin:ErrorProne -Xep:ThreadLocalUsage:ERROR
-Xep:MissingOverride:WARN -Xep:NonAtomicVolatileUpdate:ERROR
-Xep:SynchronizeOnNonFinalField:ERROR -Xep:StaticQualifiedUsingExpression:ERROR
-Xep:WaitNotInLoop:ERROR -Xep:BanJNDI:OFF
-XepExcludedPaths:.*/generated-sources/.*</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED</arg>
+
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>owasp</id>
@@ -1569,54 +1569,54 @@
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <versionRange>[0.12,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.servicemix.tooling
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <versionRange>[0.12,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.servicemix.tooling
</groupId>
- <artifactId>
- depends-maven-plugin
+ <artifactId>
+ depends-maven-plugin
</artifactId>
- <versionRange>
- [1.2,)
+ <versionRange>
+ [1.2,)
</versionRange>
- <goals>
- <goal>
- generate-depends-file
+ <goals>
+ <goal>
+ generate-depends-file
</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
+ <artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
@@ -1653,9 +1653,9 @@
<version>${jetty.version}</version>
</plugin>
<plugin>
- <groupId>org.wildfly.extras.batavia</groupId>
- <artifactId>transformer-tools-mvn</artifactId>
- <version>${version.batavia}</version>
+ <groupId>org.wildfly.extras.batavia</groupId>
+ <artifactId>transformer-tools-mvn</artifactId>
+ <version>${version.batavia}</version>
</plugin>
<plugin>
<inherited>true</inherited>
@@ -1792,7 +1792,7 @@
<exclude>**/*.log</exclude>
<exclude>**/*.redo</exclude>
- <!-- NPM files -->
+ <!-- NPM files -->
<exclude>**/node/**</exclude>
<exclude>**/node_modules/**</exclude>
<exclude>**/package.json</exclude>
@@ -1841,38 +1841,38 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[11,)</version>
- <message>You must use JDK 11+ when building</message>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-maven-version</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>3.5.0</version>
- <message>You must use Maven 3.5.0+ to build</message>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[11,)</version>
+ <message>You must use JDK 11+ when
building</message>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.5.0</version>
+ <message>You must use Maven 3.5.0+ to
build</message>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1911,8 +1911,8 @@
<artifactId>dependency-check-maven</artifactId>
<version>${owasp.version}</version>
<configuration>
- <skip>${skipOWASP}</skip>
- <!-- <skipProvidedScope>true</skipProvidedScope>
+ <skip>${skipOWASP}</skip>
+ <!-- <skipProvidedScope>true</skipProvidedScope>
<skipRuntimeScope>true</skipRuntimeScope> -->
</configuration>
<executions>
diff --git a/tests/compatibility-tests/pom.xml
b/tests/compatibility-tests/pom.xml
index b78f3ac7a5..bb484db84d 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -696,7 +696,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</profile>
</profiles>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 5327844f89..414c3efb80 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -522,8 +522,8 @@
</profile>
<profile>
<id>jdk16on</id>
- <activation>
- <jdk>[16,)</jdk>
+ <activation>
+ <jdk>[16,)</jdk>
</activation>
<properties>
<its-surefire-extra-args>--add-exports
java.security.jgss/sun.security.krb5=ALL-UNNAMED</its-surefire-extra-args>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 271de9e7d1..73c3d74a37 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -1417,7 +1417,7 @@
<noWeb>true</noWeb>
<instance>${basedir}/target/mirrored-subscriptions/broker1</instance>
<configuration>${basedir}/target/classes/servers/mirrored-subscriptions/broker1</configuration>
- </configuration>
+ </configuration>
</execution>
<execution>
<phase>test-compile</phase>
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 450f850060..8163f8cb1a 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -180,9 +180,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
