mirror of
https://github.com/apache/activemq.git
synced 2025-03-06 08:09:07 +00:00
AMQ-9492: Upgrade to Apache POM 33 and use plugin versions from Apache POM
This commit is contained in:
parent
572414dbbc
commit
72a9bc2049
@ -72,7 +72,6 @@
|
|||||||
<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>${maven-shade-plugin-version}</version>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
|
@ -91,7 +91,6 @@ public class TaskRunnerTest {
|
|||||||
for (int i = 0; i < enqueueCount / workerCount; i++) {
|
for (int i = 0; i < enqueueCount / workerCount; i++) {
|
||||||
queue.incrementAndGet();
|
queue.incrementAndGet();
|
||||||
runner.wakeup();
|
runner.wakeup();
|
||||||
yield();
|
|
||||||
}
|
}
|
||||||
} catch (BrokenBarrierException e) {
|
} catch (BrokenBarrierException e) {
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
|
@ -52,7 +52,6 @@
|
|||||||
<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>${maven-shade-plugin-version}</version>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
|
108
pom.xml
108
pom.xml
@ -19,7 +19,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.apache</groupId>
|
<groupId>org.apache</groupId>
|
||||||
<artifactId>apache</artifactId>
|
<artifactId>apache</artifactId>
|
||||||
<version>30</version>
|
<version>33</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@ -31,9 +31,7 @@
|
|||||||
<inceptionYear>2005</inceptionYear>
|
<inceptionYear>2005</inceptionYear>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- for reproducible builds -->
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<project.build.outputTimestamp>2024-04-29T15:51:45Z</project.build.outputTimestamp>
|
|
||||||
|
|
||||||
<siteId>activemq-${project.version}</siteId>
|
<siteId>activemq-${project.version}</siteId>
|
||||||
<projectName>Apache ActiveMQ</projectName>
|
<projectName>Apache ActiveMQ</projectName>
|
||||||
<!-- 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 -->
|
||||||
@ -119,23 +117,9 @@
|
|||||||
|
|
||||||
<!-- Maven Plugin Version for this Project -->
|
<!-- Maven Plugin Version for this Project -->
|
||||||
<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
|
<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
|
||||||
<maven-surefire-plugin-version>3.5.2</maven-surefire-plugin-version>
|
|
||||||
<maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
|
|
||||||
<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
|
|
||||||
<maven-clean-plugin-version>3.4.0</maven-clean-plugin-version>
|
|
||||||
<maven-release-plugin-version>3.1.1</maven-release-plugin-version>
|
|
||||||
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
|
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
|
||||||
<maven-enforcer-plugin-version>3.5.0</maven-enforcer-plugin-version>
|
|
||||||
<maven-war-plugin-version>3.4.0</maven-war-plugin-version>
|
|
||||||
<maven-compiler-plugin-version>3.13.0</maven-compiler-plugin-version>
|
|
||||||
<maven-rar-plugin-version>3.0.0</maven-rar-plugin-version>
|
<maven-rar-plugin-version>3.0.0</maven-rar-plugin-version>
|
||||||
<maven-jar-plugin-version>3.4.2</maven-jar-plugin-version>
|
|
||||||
<maven-source-plugin-version>3.3.1</maven-source-plugin-version>
|
|
||||||
<maven-javadoc-plugin-version>3.11.1</maven-javadoc-plugin-version>
|
|
||||||
<maven-install-plugin-version>2.5.2</maven-install-plugin-version>
|
|
||||||
<maven-shade-plugin-version>3.6.0</maven-shade-plugin-version>
|
|
||||||
<exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
|
<exec-maven-plugin-version>3.1.0</exec-maven-plugin-version>
|
||||||
<findbugs-maven-plugin-version>3.0.5</findbugs-maven-plugin-version>
|
|
||||||
<flatten-maven-plugin-version>1.6.0</flatten-maven-plugin-version>
|
<flatten-maven-plugin-version>1.6.0</flatten-maven-plugin-version>
|
||||||
<javacc-maven-plugin-version>3.1.0</javacc-maven-plugin-version>
|
<javacc-maven-plugin-version>3.1.0</javacc-maven-plugin-version>
|
||||||
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
|
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
|
||||||
@ -143,13 +127,10 @@
|
|||||||
<build-helper-maven-plugin-version>3.6.0</build-helper-maven-plugin-version>
|
<build-helper-maven-plugin-version>3.6.0</build-helper-maven-plugin-version>
|
||||||
<replacer-maven-plugin-version>1.5.3</replacer-maven-plugin-version>
|
<replacer-maven-plugin-version>1.5.3</replacer-maven-plugin-version>
|
||||||
<sonar-maven-plugin-version>4.0.0.4121</sonar-maven-plugin-version>
|
<sonar-maven-plugin-version>4.0.0.4121</sonar-maven-plugin-version>
|
||||||
<apache-rat-plugin-version>0.16.1</apache-rat-plugin-version>
|
|
||||||
<tools-maven-plugin-version>1.4</tools-maven-plugin-version>
|
<tools-maven-plugin-version>1.4</tools-maven-plugin-version>
|
||||||
<depends-maven-plugin-version>1.5.0</depends-maven-plugin-version>
|
<depends-maven-plugin-version>1.5.0</depends-maven-plugin-version>
|
||||||
<maven-dependency-plugin-version>3.6.1</maven-dependency-plugin-version>
|
|
||||||
<maven-project-info-reports-plugin-version>3.8.0</maven-project-info-reports-plugin-version>
|
<maven-project-info-reports-plugin-version>3.8.0</maven-project-info-reports-plugin-version>
|
||||||
<maven-graph-plugin-version>1.45</maven-graph-plugin-version>
|
<maven-graph-plugin-version>1.45</maven-graph-plugin-version>
|
||||||
<maven-plugin-plugin-version>3.15.1</maven-plugin-plugin-version>
|
|
||||||
<maven-core-version>3.8.6</maven-core-version>
|
<maven-core-version>3.8.6</maven-core-version>
|
||||||
<!-- OSGi bundles properties -->
|
<!-- OSGi bundles properties -->
|
||||||
<activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
|
<activemq.osgi.import.pkg>*</activemq.osgi.import.pkg>
|
||||||
@ -1004,43 +985,9 @@
|
|||||||
<artifactId>activemq-protobuf</artifactId>
|
<artifactId>activemq-protobuf</artifactId>
|
||||||
<version>${activemq-protobuf-version}</version>
|
<version>${activemq-protobuf-version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<version>${maven-antrun-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
|
||||||
<version>${maven-assembly-plugin-version}</version>
|
|
||||||
<configuration>
|
|
||||||
<tarLongFileMode>posix</tarLongFileMode>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
|
||||||
<version>${maven-clean-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<version>${maven-enforcer-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>${maven-jar-plugin-version}</version>
|
|
||||||
<configuration>
|
|
||||||
<archive>
|
|
||||||
<compress>true</compress>
|
|
||||||
</archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-release-plugin</artifactId>
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
<version>${maven-release-plugin-version}</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<autoVersionSubmodules>true</autoVersionSubmodules>
|
<autoVersionSubmodules>true</autoVersionSubmodules>
|
||||||
<allowTimestampedSnapshots>false</allowTimestampedSnapshots>
|
<allowTimestampedSnapshots>false</allowTimestampedSnapshots>
|
||||||
@ -1051,15 +998,9 @@
|
|||||||
<tagNameFormat>activemq-@{project.version}</tagNameFormat>
|
<tagNameFormat>activemq-@{project.version}</tagNameFormat>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
|
||||||
<version>${maven-source-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>${maven-surefire-plugin-version}</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||||
<forkCount>1</forkCount>
|
<forkCount>1</forkCount>
|
||||||
@ -1093,11 +1034,6 @@
|
|||||||
<artifactId>javacc-maven-plugin</artifactId>
|
<artifactId>javacc-maven-plugin</artifactId>
|
||||||
<version>${javacc-maven-plugin-version}</version>
|
<version>${javacc-maven-plugin-version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.rat</groupId>
|
|
||||||
<artifactId>apache-rat-plugin</artifactId>
|
|
||||||
<version>${apache-rat-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-maven-plugin</artifactId>
|
<artifactId>jetty-maven-plugin</artifactId>
|
||||||
@ -1124,26 +1060,11 @@
|
|||||||
<downloadJavadocs>false</downloadJavadocs>
|
<downloadJavadocs>false</downloadJavadocs>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
|
||||||
<version>${maven-war-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-rar-plugin</artifactId>
|
<artifactId>maven-rar-plugin</artifactId>
|
||||||
<version>${maven-rar-plugin-version}</version>
|
<version>${maven-rar-plugin-version}</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>${maven-compiler-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-plugin-plugin</artifactId>
|
|
||||||
<version>${maven-plugin-plugin-version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
<groupId>com.google.code.maven-replacer-plugin</groupId>
|
||||||
<artifactId>replacer</artifactId>
|
<artifactId>replacer</artifactId>
|
||||||
@ -1240,17 +1161,6 @@
|
|||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<source>${source-version}</source>
|
|
||||||
<target>${target-version}</target>
|
|
||||||
<debug>true</debug>
|
|
||||||
<showDeprecation>true</showDeprecation>
|
|
||||||
<showWarnings>true</showWarnings>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
<artifactId>maven-enforcer-plugin</artifactId>
|
||||||
@ -1284,17 +1194,6 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<archive>
|
|
||||||
<manifest>
|
|
||||||
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
|
||||||
</manifest>
|
|
||||||
</archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.geronimo.genesis.plugins</groupId>
|
<groupId>org.apache.geronimo.genesis.plugins</groupId>
|
||||||
<artifactId>tools-maven-plugin</artifactId>
|
<artifactId>tools-maven-plugin</artifactId>
|
||||||
@ -1368,7 +1267,6 @@
|
|||||||
<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>${maven-javadoc-plugin-version}</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<links>
|
<links>
|
||||||
<link>${javase-javadoc-url}</link>
|
<link>${javase-javadoc-url}</link>
|
||||||
@ -1402,7 +1300,6 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
<version>${maven-source-plugin-version}</version>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-sources</id>
|
<id>attach-sources</id>
|
||||||
@ -1485,7 +1382,6 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>${maven-surefire-plugin-version}</version>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<skipTests>true</skipTests>
|
<skipTests>true</skipTests>
|
||||||
<failIfNoTests>false</failIfNoTests>
|
<failIfNoTests>false</failIfNoTests>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user