This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5cd549f91 [MAINTENANCE] Update versioning plugin dependencies
5cd549f91 is described below
commit 5cd549f917157b58241f952c7aa3fd53fbd75d42
Author: Dominik Przybysz <[email protected]>
AuthorDate: Fri Feb 7 21:20:09 2025 +0100
[MAINTENANCE] Update versioning plugin dependencies
---
.github/workflows/blueprint.yml | 4 ++
.github/workflows/quiesce.yml | 4 ++
.github/workflows/util.yml | 7 +++
.github/workflows/web.yml | 4 ++
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 | 8 +--
...VersionClassVisitor.java => AsmApiVersion.java} | 67 ++++++++--------------
.../utils/SemanticVersioningClassVisitor.java | 5 +-
.../versioning/utils/SemanticVersioningUtils.java | 1 +
.../utils/SerialVersionClassVisitor.java | 4 +-
versioning/versioning-plugin/pom.xml | 24 ++++++++
.../aries/versioning/mojo/VersionCheckerMojo.java | 2 +
web/web-itests/pom.xml | 2 +
web/web-urlhandler/pom.xml | 1 +
17 files changed, 83 insertions(+), 60 deletions(-)
diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml
index d35ccec57..99b3cba18 100644
--- a/.github/workflows/blueprint.yml
+++ b/.github/workflows/blueprint.yml
@@ -18,6 +18,7 @@ on:
- parent/**
- testsupport/**
- proxy/**
+ - versioning/**
- util/**
- quiesce/**
- blueprint/**
@@ -57,6 +58,9 @@ jobs:
- name: Build proxy
shell: bash
run: mvn -U -e -B -ntp clean install -f proxy
+ - name: Build versioning
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f versioning
- name: Build util
shell: bash
run: mvn -U -e -B -ntp clean install -f util
diff --git a/.github/workflows/quiesce.yml b/.github/workflows/quiesce.yml
index a07e6fae8..94d13c3ec 100644
--- a/.github/workflows/quiesce.yml
+++ b/.github/workflows/quiesce.yml
@@ -17,6 +17,7 @@ on:
paths:
- parent/**
- testsupport/**
+ - versioning/**
- util/**
- quiesce/**
- .github/workflows/quiesce.yml
@@ -51,6 +52,9 @@ jobs:
- name: Build testsupport
shell: bash
run: mvn -U -e -B -ntp clean install -f testsupport
+ - name: Build versioning
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f versioning
- name: Build util
shell: bash
run: mvn -U -e -B -ntp clean install -f util
diff --git a/.github/workflows/util.yml b/.github/workflows/util.yml
index f8d1ad740..970da623d 100644
--- a/.github/workflows/util.yml
+++ b/.github/workflows/util.yml
@@ -16,6 +16,7 @@ on:
pull_request:
paths:
- parent/**
+ - versioning/**
- util/**
- .github/workflows/util.yml
push:
@@ -43,6 +44,12 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
+ - name: Build parent
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f parent
+ - name: Build versioning
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f versioning
- name: Build util
shell: bash
run: mvn -U -e -B -ntp clean install -f util
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 7e1a501bc..22ea58af4 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -17,6 +17,7 @@ on:
paths:
- parent/**
- testsupport/**
+ - versioning/**
- util/**
- web/**
- .github/workflows/web.yml
@@ -51,6 +52,9 @@ jobs:
- name: Build testsupport
shell: bash
run: mvn -U -e -B -ntp clean install -f testsupport
+ - name: Build versioning
+ shell: bash
+ run: mvn -U -e -B -ntp clean install -f versioning
- name: Build util
shell: bash
run: mvn -U -e -B -ntp clean install -f util
diff --git a/parent/pom.xml b/parent/pom.xml
index 30b7a4c71..b38e924b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -193,7 +193,7 @@
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-pmd-plugin.version>3.26.0</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>
<depgraph-maven-plugin.version>4.0.3</depgraph-maven-plugin.version>
@@ -446,9 +446,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 b9ecf61c0..af4ca5c71 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..d2e72f481 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -63,7 +63,8 @@
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>
+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
<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 +120,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-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/AsmApiVersion.java
similarity index 61%
copy from
versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
copy to
versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/AsmApiVersion.java
index 7c977d83c..b6852fc3d 100644
---
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
+++
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/AsmApiVersion.java
@@ -1,42 +1,25 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.aries.versioning.utils;
-
-import java.io.IOException;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.commons.SerialVersionUIDAdder;
-
-public class SerialVersionClassVisitor extends SerialVersionUIDAdder {
-
- public SerialVersionClassVisitor(ClassVisitor cv) {
- super(Opcodes.ASM5, cv);
-
- }
-
- public long getComputeSerialVersionUID() {
- try {
- return computeSVUID();
- } catch (IOException ioe) {
- // not a issue
- }
- return 0;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.versioning.utils;
+
+import org.objectweb.asm.Opcodes;
+
+class AsmApiVersion {
+ static final int apiVersion = Opcodes.ASM9;
+}
diff --git
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningClassVisitor.java
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningClassVisitor.java
index 19bdfca09..cdc44eea8 100644
---
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningClassVisitor.java
+++
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningClassVisitor.java
@@ -35,14 +35,13 @@ public class SemanticVersioningClassVisitor extends
ClassVisitor {
private SerialVersionClassVisitor cv = null;
public SemanticVersioningClassVisitor(URLClassLoader newJarLoader,
SerialVersionClassVisitor cv) {
- super(SemanticVersioningUtils.ASM4);
+ super(AsmApiVersion.apiVersion);
this.loader = newJarLoader;
this.cv = cv;
}
public SemanticVersioningClassVisitor(URLClassLoader newJarLoader) {
- super(SemanticVersioningUtils.ASM4);
- this.loader = newJarLoader;
+ this(newJarLoader, null);
}
public ClassDeclaration getClassDeclaration() {
diff --git
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java
index 668090bcf..4358f786d 100644
---
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java
+++
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java
@@ -45,6 +45,7 @@ public class SemanticVersioningUtils {
public static final String SERIALIZABLE_CLASS_IDENTIFIER =
"java/io/Serializable";
public static final String SERIAL_VERSION_UTD = "serialVersionUID";
public static final String ENUM_CLASS = "java/lang/Enum";
+ @Deprecated
public static final int ASM4 = Opcodes.ASM4;
public static boolean isLessAccessible(GenericDeclaration before,
GenericDeclaration after) {
diff --git
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
index 7c977d83c..1d1ead6b0 100644
---
a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
+++
b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java
@@ -21,14 +21,12 @@ package org.apache.aries.versioning.utils;
import java.io.IOException;
import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.SerialVersionUIDAdder;
public class SerialVersionClassVisitor extends SerialVersionUIDAdder {
public SerialVersionClassVisitor(ClassVisitor cv) {
- super(Opcodes.ASM5, cv);
-
+ super(AsmApiVersion.apiVersion, cv);
}
public long getComputeSerialVersionUID() {
diff --git a/versioning/versioning-plugin/pom.xml
b/versioning/versioning-plugin/pom.xml
index 8671ecb68..01314dada 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>
<javax.inject.version>1</javax.inject.version>
<maven-artifact-resolver.version>1.0</maven-artifact-resolver.version>
<maven-common-artifact-filters.version>3.4.0</maven-common-artifact-filters.version>
@@ -113,11 +114,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 0cdd3f1ef..d5349ea2f 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) {
diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml
index be4c59f84..09ce5debf 100644
--- a/web/web-itests/pom.xml
+++ b/web/web-itests/pom.xml
@@ -41,6 +41,8 @@
</scm>
<properties>
+ <aries.skip.version.check>true</aries.skip.version.check>
+
<asm.version>9.7.1</asm.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>
diff --git a/web/web-urlhandler/pom.xml b/web/web-urlhandler/pom.xml
index 2b9ea1e26..e4fe304ef 100644
--- a/web/web-urlhandler/pom.xml
+++ b/web/web-urlhandler/pom.xml
@@ -55,6 +55,7 @@
</aries.osgi.import>
<aries.osgi.activator>org.apache.aries.web.converter.impl.Activator</aries.osgi.activator>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
<asm.version>9.7.1</asm.version>
</properties>
