NO-JIRA: make various poms indents consistent

This commit is contained in:
Robbie Gemmell 2023-09-12 16:53:00 +01:00
parent 1d88b293c3
commit 819e1a9802
12 changed files with 391 additions and 391 deletions

View File

@ -155,12 +155,12 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.winsw</groupId> <groupId>com.sun.winsw</groupId>
<artifactId>winsw</artifactId> <artifactId>winsw</artifactId>
<version>${winsw.version}</version> <version>${winsw.version}</version>
<classifier>bin</classifier> <classifier>bin</classifier>
<type>exe</type> <type>exe</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -197,50 +197,50 @@
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>${project.basedir}/src/main/resources</directory> <directory>${project.basedir}/src/main/resources</directory>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>${project.basedir}/src/main/filtered-resources</directory> <directory>${project.basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>unpack</id> <id>unpack</id>
<phase>process-resources</phase> <phase>process-resources</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy</goal>
</goals> </goals>
<configuration> <configuration>
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>com.sun.winsw</groupId> <groupId>com.sun.winsw</groupId>
<artifactId>winsw</artifactId> <artifactId>winsw</artifactId>
<version>${winsw.version}</version> <version>${winsw.version}</version>
<classifier>bin</classifier> <classifier>bin</classifier>
<type>exe</type> <type>exe</type>
<outputDirectory>${basedir}/target/classes/org/apache/activemq/artemis/cli/commands/bin/</outputDirectory> <outputDirectory>${basedir}/target/classes/org/apache/activemq/artemis/cli/commands/bin/</outputDirectory>
<destFileName>artemis-service.exe</destFileName> <destFileName>artemis-service.exe</destFileName>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>

View File

@ -72,10 +72,10 @@
<execution> <execution>
<id>default-jar</id> <id>default-jar</id>
<configuration> <configuration>
<!-- Ensures the shading is always working upon a fresh base jar, which has <!-- Ensures the shading is always working upon a fresh base jar, which has
nothing much in it, rather than potentially working on already-shaded nothing much in it, rather than potentially working on already-shaded
output still present from prior runs and renamed to have the base name --> output still present from prior runs and renamed to have the base name -->
<forceCreation>true</forceCreation> <forceCreation>true</forceCreation>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -135,8 +135,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>

View File

@ -36,7 +36,7 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- ActiveMQ Artemis artifacts --> <!-- ActiveMQ Artemis artifacts -->
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-boot</artifactId> <artifactId>artemis-boot</artifactId>
@ -52,21 +52,21 @@
<artifactId>artemis-cli</artifactId> <artifactId>artemis-cli</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-server</artifactId> <artifactId>artemis-jms-server</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-client</artifactId> <artifactId>artemis-jms-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-ra</artifactId> <artifactId>artemis-ra</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-web</artifactId> <artifactId>artemis-web</artifactId>
@ -77,26 +77,26 @@
<artifactId>artemis-core-client</artifactId> <artifactId>artemis-core-client</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-amqp-protocol</artifactId> <artifactId>artemis-amqp-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-stomp-protocol</artifactId> <artifactId>artemis-stomp-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-openwire-protocol</artifactId> <artifactId>artemis-openwire-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-hornetq-protocol</artifactId> <artifactId>artemis-hornetq-protocol</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-mqtt-protocol</artifactId> <artifactId>artemis-mqtt-protocol</artifactId>
@ -121,30 +121,30 @@
</dependency> </dependency>
<!-- dependencies --> <!-- dependencies -->
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId> <artifactId>activemq-openwire-legacy</artifactId>
</dependency> </dependency>
<!-- Management Console Dependencies --> <!-- Management Console Dependencies -->
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-console</artifactId> <artifactId>artemis-console</artifactId>
<version>${project.version} </version> <version>${project.version} </version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>activemq-branding</artifactId> <artifactId>activemq-branding</artifactId>
<version>${project.version} </version> <version>${project.version} </version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-plugin</artifactId> <artifactId>artemis-plugin</artifactId>
<version>${project.version} </version> <version>${project.version} </version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<!-- quorum --> <!-- quorum -->
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
@ -183,7 +183,7 @@
<id>bin</id> <id>bin</id>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor> <descriptor>src/main/assembly/bin.xml</descriptor>
</descriptors> </descriptors>
<tarLongFileMode>posix</tarLongFileMode> <tarLongFileMode>posix</tarLongFileMode>
</configuration> </configuration>
@ -197,7 +197,7 @@
<configuration> <configuration>
<attach>false</attach> <attach>false</attach>
<descriptors> <descriptors>
<descriptor>src/main/assembly/dir.xml</descriptor> <descriptor>src/main/assembly/dir.xml</descriptor>
</descriptors> </descriptors>
<tarLongFileMode>posix</tarLongFileMode> <tarLongFileMode>posix</tarLongFileMode>
</configuration> </configuration>

View File

@ -151,9 +151,9 @@
<version>${version.jaxb.runtime}</version> <version>${version.jaxb.runtime}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.activation</groupId> <groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId> <artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation-api.version}</version> <version>${jakarta.activation-api.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

View File

@ -73,10 +73,10 @@
<execution> <execution>
<id>default-jar</id> <id>default-jar</id>
<configuration> <configuration>
<!-- Ensures the shading is always working upon a fresh base jar, which has <!-- Ensures the shading is always working upon a fresh base jar, which has
nothing much in it, rather than potentially working on already-shaded nothing much in it, rather than potentially working on already-shaded
output still present from prior runs and renamed to have the base name --> output still present from prior runs and renamed to have the base name -->
<forceCreation>true</forceCreation> <forceCreation>true</forceCreation>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -15,24 +15,24 @@
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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-pom</artifactId> <artifactId>artemis-pom</artifactId>
<version>2.31.0-SNAPSHOT</version> <version>2.31.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>artemis-jakarta-server</artifactId> <artifactId>artemis-jakarta-server</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>ActiveMQ Artemis Jakarta Messaging Server</name> <name>ActiveMQ Artemis Jakarta Messaging Server</name>
<properties> <properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
<jakarta.jms-api.version>${jakarta.jms-api.version.alt}</jakarta.jms-api.version> <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.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> <jakarta.resource-api.version>${jakarta.resource-api.version.alt}</jakarta.resource-api.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- logging --> <!-- logging -->

View File

@ -72,10 +72,10 @@
<execution> <execution>
<id>default-jar</id> <id>default-jar</id>
<configuration> <configuration>
<!-- Ensures the shading is always working upon a fresh base jar, which has <!-- Ensures the shading is always working upon a fresh base jar, which has
nothing much in it, rather than potentially working on already-shaded nothing much in it, rather than potentially working on already-shaded
output still present from prior runs and renamed to have the base name --> output still present from prior runs and renamed to have the base name -->
<forceCreation>true</forceCreation> <forceCreation>true</forceCreation>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

486
pom.xml
View File

@ -221,7 +221,7 @@
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile> <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
<!-- <!--
note for idea users: note for idea users:
Idea picks up surefire argline by default: Idea picks up surefire argline by default:
@ -274,28 +274,28 @@
<url>https://issues.apache.org/jira/browse/ARTEMIS</url> <url>https://issues.apache.org/jira/browse/ARTEMIS</url>
</issueManagement> </issueManagement>
<developers> <developers>
<developer> <developer>
<name>The Apache ActiveMQ Team</name> <name>The Apache ActiveMQ Team</name>
<email>dev@activemq.apache.org</email> <email>dev@activemq.apache.org</email>
<url>http://activemq.apache.org</url> <url>http://activemq.apache.org</url>
<organization>Apache Software Foundation</organization> <organization>Apache Software Foundation</organization>
<organizationUrl>http://apache.org/</organizationUrl> <organizationUrl>http://apache.org/</organizationUrl>
</developer> </developer>
</developers> </developers>
<mailingLists> <mailingLists>
<mailingList> <mailingList>
<name>User List</name> <name>User List</name>
<subscribe>users-subscribe@activemq.apache.org</subscribe> <subscribe>users-subscribe@activemq.apache.org</subscribe>
<unsubscribe>users-unsubscribe@activemq.apache.org</unsubscribe> <unsubscribe>users-unsubscribe@activemq.apache.org</unsubscribe>
<post>users@activemq.apache.org</post> <post>users@activemq.apache.org</post>
</mailingList> </mailingList>
<mailingList> <mailingList>
<name>Development List</name> <name>Development List</name>
<subscribe>dev-subscribe@activemq.apache.org</subscribe> <subscribe>dev-subscribe@activemq.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@activemq.apache.org</unsubscribe> <unsubscribe>dev-unsubscribe@activemq.apache.org</unsubscribe>
<post>dev@activemq.apache.org</post> <post>dev@activemq.apache.org</post>
</mailingList> </mailingList>
</mailingLists> </mailingLists>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@ -423,10 +423,10 @@
<!-- ## End Test Dependencies ## --> <!-- ## End Test Dependencies ## -->
<dependency> <dependency>
<groupId>com.google.errorprone</groupId> <groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
<version>${errorprone.version}</version> <version>${errorprone.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -501,31 +501,31 @@
<artifactId>jakarta.jms-api</artifactId> <artifactId>jakarta.jms-api</artifactId>
<version>${jakarta.jms-api.version}</version> <version>${jakarta.jms-api.version}</version>
<!-- License: EPL 2.0 --> <!-- License: EPL 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.transaction</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction-api.version}</version> <version>${jakarta.transaction-api.version}</version>
<!-- License: EPL 2.0 --> <!-- License: EPL 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.ejb</groupId> <groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId> <artifactId>jakarta.ejb-api</artifactId>
<version>${jakarta.ejb-api.version}</version> <version>${jakarta.ejb-api.version}</version>
<!-- License: EPL 2.0 --> <!-- License: EPL 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.annotation</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation-api.version}</version> <version>${jakarta.annotation-api.version}</version>
<!-- License: EPL 2.0 --> <!-- License: EPL 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.resource</groupId> <groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId> <artifactId>jakarta.resource-api</artifactId>
<version>${jakarta.resource-api.version}</version> <version>${jakarta.resource-api.version}</version>
<!-- License: EPL 2.0 --> <!-- License: EPL 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
@ -533,34 +533,34 @@
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId> <artifactId>commons-configuration2</artifactId>
<version>${commons.config.version}</version> <version>${commons.config.version}</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>${commons.text.version}</version> <version>${commons.text.version}</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version> <version>${commons.lang.version}</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<!-- ## Examples Dependencies ## --> <!-- ## Examples Dependencies ## -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId> <artifactId>slf4j-nop</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<!-- ## End Examples Dependencies ## --> <!-- ## End Examples Dependencies ## -->
@ -739,9 +739,9 @@
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<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> <version>${qpid.jms.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
@ -766,10 +766,10 @@
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
<!-- License: MIT --> <!-- License: MIT -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
@ -916,16 +916,16 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>org.jacoco.ant</artifactId> <artifactId>org.jacoco.ant</artifactId>
<version>${version.org.jacoco}</version> <version>${version.org.jacoco}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId> <artifactId>org.jacoco.core</artifactId>
<version>${version.org.jacoco}</version> <version>${version.org.jacoco}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.enterprise</groupId> <groupId>jakarta.enterprise</groupId>
@ -1129,93 +1129,93 @@
</dependencyManagement> </dependencyManagement>
<profiles> <profiles>
<profile> <profile>
<id>M2E</id> <id>M2E</id>
<activation> <activation>
<property> <property>
<name>m2e.version</name> <name>m2e.version</name>
</property> </property>
</activation> </activation>
<properties> <properties>
<javac-compiler-id>javac</javac-compiler-id> <javac-compiler-id>javac</javac-compiler-id>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>jdk11to15-errorprone</id> <id>jdk11to15-errorprone</id>
<activation> <activation>
<jdk>[11,16)</jdk> <jdk>[11,16)</jdk>
<property> <property>
<name>errorprone</name> <name>errorprone</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.google.errorprone</groupId> <groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<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>
<arg>-Xdiags:verbose</arg> <arg>-Xdiags:verbose</arg>
<arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg> <arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg> <arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
<arg>-XDcompilePolicy=simple</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> <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> </compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<id>jdk16on-errorprone</id> <id>jdk16on-errorprone</id>
<!-- TODO: MissingOverride check only warns in this profile for now, as JDK15+ added a toString method to CharSequence --> <!-- TODO: MissingOverride check only warns in this profile for now, as JDK15+ added a toString method to CharSequence -->
<activation> <activation>
<jdk>[16,)</jdk> <jdk>[16,)</jdk>
<property> <property>
<name>errorprone</name> <name>errorprone</name>
</property> </property>
</activation> </activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.google.errorprone</groupId> <groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<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>
<fork>true</fork> <fork>true</fork>
<compilerArgs> <compilerArgs>
<arg>-Xdiags:verbose</arg> <arg>-Xdiags:verbose</arg>
<arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg> <arg>--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</arg>
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg> <arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
<arg>-XDcompilePolicy=simple</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>-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.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.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.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.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.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.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.tree=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=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.code=ALL-UNNAMED</arg>
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg> <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
</compilerArgs> </compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<id>owasp</id> <id>owasp</id>
@ -1569,54 +1569,54 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<configuration> <configuration>
<lifecycleMappingMetadata> <lifecycleMappingMetadata>
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
<versionRange>[0.12,)</versionRange> <versionRange>[0.12,)</versionRange>
<goals> <goals>
<goal>check</goal> <goal>check</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore /> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId> <groupId>
org.apache.servicemix.tooling org.apache.servicemix.tooling
</groupId> </groupId>
<artifactId> <artifactId>
depends-maven-plugin depends-maven-plugin
</artifactId> </artifactId>
<versionRange> <versionRange>
[1.2,) [1.2,)
</versionRange> </versionRange>
<goals> <goals>
<goal> <goal>
generate-depends-file generate-depends-file
</goal> </goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore /> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</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> <version>2.6</version>
<executions> <executions>
<execution> <execution>
@ -1653,9 +1653,9 @@
<version>${jetty.version}</version> <version>${jetty.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.wildfly.extras.batavia</groupId> <groupId>org.wildfly.extras.batavia</groupId>
<artifactId>transformer-tools-mvn</artifactId> <artifactId>transformer-tools-mvn</artifactId>
<version>${version.batavia}</version> <version>${version.batavia}</version>
</plugin> </plugin>
<plugin> <plugin>
<inherited>true</inherited> <inherited>true</inherited>
@ -1792,7 +1792,7 @@
<exclude>**/*.log</exclude> <exclude>**/*.log</exclude>
<exclude>**/*.redo</exclude> <exclude>**/*.redo</exclude>
<!-- NPM files --> <!-- NPM files -->
<exclude>**/node/**</exclude> <exclude>**/node/**</exclude>
<exclude>**/node_modules/**</exclude> <exclude>**/node_modules/**</exclude>
<exclude>**/package.json</exclude> <exclude>**/package.json</exclude>
@ -1841,38 +1841,38 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>enforce-java-version</id> <id>enforce-java-version</id>
<goals> <goals>
<goal>enforce</goal> <goal>enforce</goal>
</goals> </goals>
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[11,)</version> <version>[11,)</version>
<message>You must use JDK 11+ when building</message> <message>You must use JDK 11+ when building</message>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>enforce-maven-version</id> <id>enforce-maven-version</id>
<goals> <goals>
<goal>enforce</goal> <goal>enforce</goal>
</goals> </goals>
<configuration> <configuration>
<rules> <rules>
<requireMavenVersion> <requireMavenVersion>
<version>3.5.0</version> <version>3.5.0</version>
<message>You must use Maven 3.5.0+ to build</message> <message>You must use Maven 3.5.0+ to build</message>
</requireMavenVersion> </requireMavenVersion>
</rules> </rules>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1911,8 +1911,8 @@
<artifactId>dependency-check-maven</artifactId> <artifactId>dependency-check-maven</artifactId>
<version>${owasp.version}</version> <version>${owasp.version}</version>
<configuration> <configuration>
<skip>${skipOWASP}</skip> <skip>${skipOWASP}</skip>
<!-- <skipProvidedScope>true</skipProvidedScope> <!-- <skipProvidedScope>true</skipProvidedScope>
<skipRuntimeScope>true</skipRuntimeScope> --> <skipRuntimeScope>true</skipRuntimeScope> -->
</configuration> </configuration>
<executions> <executions>

View File

@ -696,7 +696,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>

View File

@ -522,8 +522,8 @@
</profile> </profile>
<profile> <profile>
<id>jdk16on</id> <id>jdk16on</id>
<activation> <activation>
<jdk>[16,)</jdk> <jdk>[16,)</jdk>
</activation> </activation>
<properties> <properties>
<its-surefire-extra-args>--add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED</its-surefire-extra-args> <its-surefire-extra-args>--add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED</its-surefire-extra-args>

View File

@ -1417,7 +1417,7 @@
<noWeb>true</noWeb> <noWeb>true</noWeb>
<instance>${basedir}/target/mirrored-subscriptions/broker1</instance> <instance>${basedir}/target/mirrored-subscriptions/broker1</instance>
<configuration>${basedir}/target/classes/servers/mirrored-subscriptions/broker1</configuration> <configuration>${basedir}/target/classes/servers/mirrored-subscriptions/broker1</configuration>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<phase>test-compile</phase> <phase>test-compile</phase>

View File

@ -180,9 +180,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>