This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch update-versioning-plugin-dependencies in repository https://gitbox.apache.org/repos/asf/aries.git
commit ce87147b56fba0f8555009cf8a3f2d43137fe6d2 Author: Dominik Przybysz <[email protected]> AuthorDate: Fri Feb 7 21:20:09 2025 +0100 [MAINTENANCE] Update versioning plugin dependencies --- .github/workflows/quiesce.yml | 1 + parent/pom.xml | 5 +--- quiesce/quiesce-api/pom.xml | 2 +- quiesce/quiesce-manager-itest/pom.xml | 1 + quiesce/quiesce-manager/pom.xml | 2 +- util/pom.xml | 7 +----- versioning/versioning-plugin/pom.xml | 28 ++++++++++++++++++++++ .../aries/versioning/mojo/VersionCheckerMojo.java | 2 ++ 8 files changed, 36 insertions(+), 12 deletions(-) diff --git a/.github/workflows/quiesce.yml b/.github/workflows/quiesce.yml index 2f434e964..ae5e6a6a1 100644 --- a/.github/workflows/quiesce.yml +++ b/.github/workflows/quiesce.yml @@ -18,6 +18,7 @@ on: - parent/** - testsupport/** - util/** + - versioning/** - quiesce/** - .github/workflows/quiesce.yml push: diff --git a/parent/pom.xml b/parent/pom.xml index 0ecabbec0..d2c9e7f3e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -209,7 +209,7 @@ <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version> <maven-pmd-plugin.version>2.4</maven-pmd-plugin.version> <maven-paxexam-plugin.version>1.2.4</maven-paxexam-plugin.version> - <org.apache.aries.versioning.plugin.version>0.3.0</org.apache.aries.versioning.plugin.version> + <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> <animal-sniffer-enforcer-rule.version>1.6</animal-sniffer-enforcer-rule.version> <!--Other--> @@ -445,9 +445,6 @@ <goals> <goal>version-check</goal> </goals> - <configuration> - <skip>true</skip> - </configuration> </execution> </executions> </plugin> diff --git a/quiesce/quiesce-api/pom.xml b/quiesce/quiesce-api/pom.xml index 93d615e0a..76d5147f3 100644 --- a/quiesce/quiesce-api/pom.xml +++ b/quiesce/quiesce-api/pom.xml @@ -49,6 +49,7 @@ org.apache.aries.quiesce.manager; org.apache.aries.quiesce.participant; </aries.osgi.export.pkg> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <lastReleaseVersion>1.0.0</lastReleaseVersion> </properties> @@ -65,7 +66,6 @@ <plugin> <groupId>org.apache.aries.versioning</groupId> <artifactId>org.apache.aries.versioning.plugin</artifactId> - <configuration><skip>true</skip></configuration> </plugin> </plugins> </build> diff --git a/quiesce/quiesce-manager-itest/pom.xml b/quiesce/quiesce-manager-itest/pom.xml index 0b7a8d04d..fa7e24e66 100644 --- a/quiesce/quiesce-manager-itest/pom.xml +++ b/quiesce/quiesce-manager-itest/pom.xml @@ -40,6 +40,7 @@ </scm> <properties> + <aries.skip.version.check>true</aries.skip.version.check> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> <org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version> <org.apache.aries.quiesce.manager.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.manager.version> diff --git a/quiesce/quiesce-manager/pom.xml b/quiesce/quiesce-manager/pom.xml index 235773491..b1ecb5cf5 100644 --- a/quiesce/quiesce-manager/pom.xml +++ b/quiesce/quiesce-manager/pom.xml @@ -54,6 +54,7 @@ <aries.osgi.export.service> org.apache.aries.quiesce.manager.QuiesceManager </aries.osgi.export.service> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <lastReleaseVersion>1.0.0</lastReleaseVersion> <org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version> @@ -98,7 +99,6 @@ <plugin> <groupId>org.apache.aries.versioning</groupId> <artifactId>org.apache.aries.versioning.plugin</artifactId> - <configuration><skip>true</skip></configuration> </plugin> </plugins> </build> diff --git a/util/pom.xml b/util/pom.xml index cfac611bf..ccc380698 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -63,7 +63,7 @@ org.apache.aries.util.filesystem.impl, org.apache.aries.util.tracker.hook </aries.osgi.private.pkg> - <lastReleaseVersion>1.1.0</lastReleaseVersion> + <lastReleaseVersion>1.1.3</lastReleaseVersion> <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> @@ -119,11 +119,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.aries.versioning</groupId> - <artifactId>org.apache.aries.versioning.plugin</artifactId> - <configuration><skip>true</skip></configuration> - </plugin> </plugins> </build> </project> diff --git a/versioning/versioning-plugin/pom.xml b/versioning/versioning-plugin/pom.xml index 9a4ba0893..0c52a67f9 100644 --- a/versioning/versioning-plugin/pom.xml +++ b/versioning/versioning-plugin/pom.xml @@ -41,6 +41,7 @@ </scm> <properties> + <asm.version>9.7.1</asm.version> <maven-artifact-resolver.version>1.0</maven-artifact-resolver.version> <maven-artifact.version>3.0.3</maven-artifact.version> <maven-common-artifact-filters.version>1.4</maven-common-artifact-filters.version> @@ -75,21 +76,25 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven-plugin-api.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>${maven-artifact.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${maven-core.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-compat</artifactId> <version>${maven-compat.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> @@ -108,11 +113,34 @@ <groupId>org.apache.maven.shared</groupId> <artifactId>maven-artifact-resolver</artifactId> <version>${maven-artifact-resolver.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-common-artifact-filters</artifactId> <version>${maven-common-artifact-filters.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>${asm.version}</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <version>${asm.version}</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <version>${asm.version}</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> + <version>${asm.version}</version> </dependency> </dependencies> diff --git a/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java b/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java index af00c2cca..37edabcc3 100644 --- a/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java +++ b/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java @@ -92,9 +92,11 @@ public class VersionCheckerMojo extends AbstractMojo { public void execute() throws MojoExecutionException { if (skip) { + getLog().info("Version check is skipped"); return; } if ("pom".equals(project.getPackaging())) { + getLog().info("Skipping version check for pom"); return; } if (newFile == null) {
