This is an automated email from the ASF dual-hosted git repository. jbertram 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 38c36599c9 ARTEMIS-4592 detect possible dependency updates 38c36599c9 is described below commit 38c36599c9815adf9b9a40f014d2650a2a87b329 Author: Justin Bertram <jbert...@apache.org> AuthorDate: Tue Jan 30 15:02:16 2024 -0600 ARTEMIS-4592 detect possible dependency updates --- artemis-features/pom.xml | 300 ++++++++++++++++++++++++----------------------- pom.xml | 79 +++++++++++++ 2 files changed, 231 insertions(+), 148 deletions(-) diff --git a/artemis-features/pom.xml b/artemis-features/pom.xml index c4b813abd8..0ab01e6583 100644 --- a/artemis-features/pom.xml +++ b/artemis-features/pom.xml @@ -15,155 +15,159 @@ ~ limitations under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-pom</artifactId> - <version>2.33.0-SNAPSHOT</version> - </parent> - <artifactId>artemis-features</artifactId> - <packaging>pom</packaging> - <name>ActiveMQ Artemis Features</name> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-pom</artifactId> + <version>2.33.0-SNAPSHOT</version> + </parent> + <artifactId>artemis-features</artifactId> + <packaging>pom</packaging> + <name>ActiveMQ Artemis Features</name> - <dependencies> - <dependency> - <groupId>org.apache.karaf.features</groupId> - <artifactId>framework</artifactId> - <version>${karaf.version}</version> - <type>xml</type> - <classifier>features</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.karaf.features</groupId> - <artifactId>enterprise</artifactId> - <version>${karaf.version}</version> - <type>xml</type> - <classifier>features</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.karaf.features</groupId> - <artifactId>framework</artifactId> - <version>${karaf.version}</version> - <type>kar</type> - <scope>provided</scope> - </dependency> + <properties> + <activemq.basedir>${project.basedir}/..</activemq.basedir> + </properties> - <!-- these dependencies are here to ensure order on a multi-thread maven build --> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>apache-artemis</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-core-client-osgi</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-client-osgi</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-server-osgi</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>framework</artifactId> + <version>${karaf.version}</version> + <type>xml</type> + <classifier>features</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>enterprise</artifactId> + <version>${karaf.version}</version> + <type>xml</type> + <classifier>features</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>framework</artifactId> + <version>${karaf.version}</version> + <type>kar</type> + <scope>provided</scope> + </dependency> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>filter</id> - <phase>generate-resources</phase> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <version>${karaf.version}</version> - <executions> - <execution> - <id>verify</id> - <phase>install</phase> - <goals> - <goal>verify</goal> - </goals> - <configuration> - <skip>${skipFeaturesVerification}</skip> - <descriptors> - <descriptor>mvn:org.apache.karaf.features/specs/${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>file:${project.build.directory}/classes/features.xml</descriptor> - </descriptors> - <distribution>org.apache.karaf.features:framework</distribution> - <javase>11</javase> - <framework> - <feature>framework</feature> - </framework> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/classes/features.xml</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - <artifact> - <file>target/classes/artemis.xml</file> - <classifier>artemis</classifier> - <type>xml</type> - </artifact> - <artifact> - <file>target/classes/org.apache.activemq.artemis.cfg</file> - <type>cfg</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- these dependencies are here to ensure order on a multi-thread maven build --> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>apache-artemis</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-core-client-osgi</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-client-osgi</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-server-osgi</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>filter</id> + <phase>generate-resources</phase> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-maven-plugin</artifactId> + <version>${karaf.version}</version> + <executions> + <execution> + <id>verify</id> + <phase>install</phase> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <skip>${skipFeaturesVerification}</skip> + <descriptors> + <descriptor>mvn:org.apache.karaf.features/specs/${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>file:${project.build.directory}/classes/features.xml</descriptor> + </descriptors> + <distribution>org.apache.karaf.features:framework</distribution> + <javase>11</javase> + <framework> + <feature>framework</feature> + </framework> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/classes/features.xml</file> + <type>xml</type> + <classifier>features</classifier> + </artifact> + <artifact> + <file>target/classes/artemis.xml</file> + <classifier>artemis</classifier> + <type>xml</type> + </artifact> + <artifact> + <file>target/classes/org.apache.activemq.artemis.cfg</file> + <type>cfg</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 32dcc256c6..d3d2cc0ec5 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,7 @@ <errorprone.version>2.20.0</errorprone.version> <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version> <jib.maven.plugin.version>3.3.2</jib.maven.plugin.version> + <versions.maven.plugin.version>2.16.1</versions.maven.plugin.version> <sevntu.checks.version>1.44.1</sevntu.checks.version> <checkstyle.version>10.12.7</checkstyle.version> <mockito.version>5.4.0</mockito.version> @@ -1958,6 +1959,84 @@ <artifactId>jib-maven-plugin</artifactId> <version>${jib.maven.plugin.version}</version> </plugin> + <plugin> + <!-- run using "mvn versions:display-dependency-updates" --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>${versions.maven.plugin.version}</version> + <configuration> + <ruleSet> + <ignoreVersions> + <!-- ignore release candidates, alphas, betas, milestones, etc. --> + <ignoreVersion> + <type>regex</type> + <version>.*-[Rr][Cc]\d$</version> + </ignoreVersion> + <ignoreVersion> + <type>regex</type> + <version>.*.[Aa]lpha\d*$</version> + </ignoreVersion> + <ignoreVersion> + <type>regex</type> + <version>.*-beta\d*$</version> + </ignoreVersion> + <ignoreVersion> + <type>regex</type> + <version>.*[-\.]M\d$</version> + </ignoreVersion> + <ignoreVersion> + <type>regex</type> + <version>.*[-\.]MR$</version> + </ignoreVersion> + + <!-- there's some really old Apache deps with weird versions numbers that we should ignore --> + <ignoreVersion> + <type>regex</type> + <version>20040.*</version> + </ignoreVersion> + <ignoreVersion> + <type>regex</type> + <version>2003[01].*</version> + </ignoreVersion> + </ignoreVersions> + <rules> + <!-- ignore Jetty 11 & 12 until we move to Jakarta --> + <rule> + <groupId>org.eclipse.jetty</groupId> + <comparisonMethod>maven</comparisonMethod> + <ignoreVersions> + <ignoreVersion> + <type>regex</type> + <version>1[12]\..*</version> + </ignoreVersion> + </ignoreVersions> + </rule> + <!-- ignore Spring 6 until we move to Jakarta --> + <rule> + <groupId>org.springframework</groupId> + <comparisonMethod>maven</comparisonMethod> + <ignoreVersions> + <ignoreVersion> + <type>regex</type> + <version>6\..*</version> + </ignoreVersion> + </ignoreVersions> + </rule> + <!-- ignore Derby >= 10.16 until we move to JDK 17 --> + <rule> + <groupId>org.apache.derby</groupId> + <comparisonMethod>maven</comparisonMethod> + <ignoreVersions> + <ignoreVersion> + <type>regex</type> + <version>10.1[67]\..*</version> + </ignoreVersion> + </ignoreVersions> + </rule> + </rules> + </ruleSet> + </configuration> + </plugin> </plugins> </build>