Skip to content

Commit a4e019b

Browse files
alien11689alien11689
committed
[MAINTENANCE] Update versioning plugin dependencies
1 parent 4bf8f83 commit a4e019b

File tree

17 files changed

+83
-18
lines changed

17 files changed

+83
-18
lines changed

‎.github/workflows/blueprint.yml

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
- parent/**
1919
- testsupport/**
2020
- proxy/**
21+
- versioning/**
2122
- util/**
2223
- quiesce/**
2324
- blueprint/**
@@ -57,6 +58,9 @@ jobs:
5758
- name: Build proxy
5859
shell: bash
5960
run: mvn -U -e -B -ntp clean install -f proxy
61+
- name: Build versioning
62+
shell: bash
63+
run: mvn -U -e -B -ntp clean install -f versioning
6064
- name: Build util
6165
shell: bash
6266
run: mvn -U -e -B -ntp clean install -f util

‎.github/workflows/quiesce.yml

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
paths:
1818
- parent/**
1919
- testsupport/**
20+
- versioning/**
2021
- util/**
2122
- quiesce/**
2223
- .github/workflows/quiesce.yml
@@ -51,6 +52,9 @@ jobs:
5152
- name: Build testsupport
5253
shell: bash
5354
run: mvn -U -e -B -ntp clean install -f testsupport
55+
- name: Build versioning
56+
shell: bash
57+
run: mvn -U -e -B -ntp clean install -f versioning
5458
- name: Build util
5559
shell: bash
5660
run: mvn -U -e -B -ntp clean install -f util

‎.github/workflows/util.yml

+7
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
pull_request:
1717
paths:
1818
- parent/**
19+
- versioning/**
1920
- util/**
2021
- .github/workflows/util.yml
2122
push:
@@ -43,6 +44,12 @@ jobs:
4344
with:
4445
distribution: 'temurin'
4546
java-version: ${{ matrix.java }}
47+
- name: Build parent
48+
shell: bash
49+
run: mvn -U -e -B -ntp clean install -f parent
50+
- name: Build versioning
51+
shell: bash
52+
run: mvn -U -e -B -ntp clean install -f versioning
4653
- name: Build util
4754
shell: bash
4855
run: mvn -U -e -B -ntp clean install -f util

‎.github/workflows/web.yml

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
paths:
1818
- parent/**
1919
- testsupport/**
20+
- versioning/**
2021
- util/**
2122
- web/**
2223
- .github/workflows/web.yml
@@ -51,6 +52,9 @@ jobs:
5152
- name: Build testsupport
5253
shell: bash
5354
run: mvn -U -e -B -ntp clean install -f testsupport
55+
- name: Build versioning
56+
shell: bash
57+
run: mvn -U -e -B -ntp clean install -f versioning
5458
- name: Build util
5559
shell: bash
5660
run: mvn -U -e -B -ntp clean install -f util

‎parent/pom.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
194194
<maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
195195
<maven-paxexam-plugin.version>1.2.4</maven-paxexam-plugin.version>
196-
<org.apache.aries.versioning.plugin.version>0.3.0</org.apache.aries.versioning.plugin.version>
196+
<org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
197197
<animal-sniffer-enforcer-rule.version>1.6</animal-sniffer-enforcer-rule.version>
198198
<depgraph-maven-plugin.version>4.0.3</depgraph-maven-plugin.version>
199199

@@ -446,9 +446,6 @@
446446
<goals>
447447
<goal>version-check</goal>
448448
</goals>
449-
<configuration>
450-
<skip>true</skip>
451-
</configuration>
452449
</execution>
453450
</executions>
454451
</plugin>

‎quiesce/quiesce-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
org.apache.aries.quiesce.manager;
5050
org.apache.aries.quiesce.participant;
5151
</aries.osgi.export.pkg>
52+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
5253
<lastReleaseVersion>1.0.0</lastReleaseVersion>
5354
</properties>
5455

@@ -65,7 +66,6 @@
6566
<plugin>
6667
<groupId>org.apache.aries.versioning</groupId>
6768
<artifactId>org.apache.aries.versioning.plugin</artifactId>
68-
<configuration><skip>true</skip></configuration>
6969
</plugin>
7070
</plugins>
7171
</build>

‎quiesce/quiesce-manager-itest/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
</scm>
4141

4242
<properties>
43+
<aries.skip.version.check>true</aries.skip.version.check>
4344
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
4445
<org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
4546
<org.apache.aries.quiesce.manager.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.manager.version>

‎quiesce/quiesce-manager/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<aries.osgi.export.service>
5555
org.apache.aries.quiesce.manager.QuiesceManager
5656
</aries.osgi.export.service>
57+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
5758
<lastReleaseVersion>1.0.0</lastReleaseVersion>
5859

5960
<org.apache.aries.quiesce.api.version>1.0.1-SNAPSHOT</org.apache.aries.quiesce.api.version>
@@ -98,7 +99,6 @@
9899
<plugin>
99100
<groupId>org.apache.aries.versioning</groupId>
100101
<artifactId>org.apache.aries.versioning.plugin</artifactId>
101-
<configuration><skip>true</skip></configuration>
102102
</plugin>
103103
</plugins>
104104
</build>

‎util/pom.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
org.apache.aries.util.filesystem.impl,
6464
org.apache.aries.util.tracker.hook
6565
</aries.osgi.private.pkg>
66-
<lastReleaseVersion>1.1.0</lastReleaseVersion>
66+
<lastReleaseVersion>1.1.3</lastReleaseVersion>
67+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
6768

6869
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
6970
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
@@ -119,11 +120,6 @@
119120
</execution>
120121
</executions>
121122
</plugin>
122-
<plugin>
123-
<groupId>org.apache.aries.versioning</groupId>
124-
<artifactId>org.apache.aries.versioning.plugin</artifactId>
125-
<configuration><skip>true</skip></configuration>
126-
</plugin>
127123
</plugins>
128124
</build>
129125
</project>

‎versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/AsmApiVersion.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.aries.versioning.utils;
20+
21+
import org.objectweb.asm.Opcodes;
22+
23+
class AsmApiVersion {
24+
static final int apiVersion = Opcodes.ASM9;
25+
}

‎versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningClassVisitor.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ public class SemanticVersioningClassVisitor extends ClassVisitor {
3535
private SerialVersionClassVisitor cv = null;
3636

3737
public SemanticVersioningClassVisitor(URLClassLoader newJarLoader, SerialVersionClassVisitor cv) {
38-
super(SemanticVersioningUtils.ASM4);
38+
super(AsmApiVersion.apiVersion);
3939
this.loader = newJarLoader;
4040
this.cv = cv;
4141
}
4242

4343
public SemanticVersioningClassVisitor(URLClassLoader newJarLoader) {
44-
super(SemanticVersioningUtils.ASM4);
45-
this.loader = newJarLoader;
44+
this(newJarLoader, null);
4645
}
4746

4847
public ClassDeclaration getClassDeclaration() {

‎versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SemanticVersioningUtils.java

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class SemanticVersioningUtils {
4545
public static final String SERIALIZABLE_CLASS_IDENTIFIER = "java/io/Serializable";
4646
public static final String SERIAL_VERSION_UTD = "serialVersionUID";
4747
public static final String ENUM_CLASS = "java/lang/Enum";
48+
@Deprecated
4849
public static final int ASM4 = Opcodes.ASM4;
4950

5051
public static boolean isLessAccessible(GenericDeclaration before, GenericDeclaration after) {

‎versioning/versioning-checker/src/main/java/org/apache/aries/versioning/utils/SerialVersionClassVisitor.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
import java.io.IOException;
2222

2323
import org.objectweb.asm.ClassVisitor;
24-
import org.objectweb.asm.Opcodes;
2524
import org.objectweb.asm.commons.SerialVersionUIDAdder;
2625

2726
public class SerialVersionClassVisitor extends SerialVersionUIDAdder {
2827

2928
public SerialVersionClassVisitor(ClassVisitor cv) {
30-
super(Opcodes.ASM5, cv);
31-
29+
super(AsmApiVersion.apiVersion, cv);
3230
}
3331

3432
public long getComputeSerialVersionUID() {

‎versioning/versioning-plugin/pom.xml

+24
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
</scm>
4242

4343
<properties>
44+
<asm.version>9.7.1</asm.version>
4445
<javax.inject.version>1</javax.inject.version>
4546
<maven-artifact-resolver.version>1.0</maven-artifact-resolver.version>
4647
<maven-common-artifact-filters.version>3.4.0</maven-common-artifact-filters.version>
@@ -113,11 +114,34 @@
113114
<groupId>org.apache.maven.shared</groupId>
114115
<artifactId>maven-artifact-resolver</artifactId>
115116
<version>${maven-artifact-resolver.version}</version>
117+
<scope>provided</scope>
116118
</dependency>
117119
<dependency>
118120
<groupId>org.apache.maven.shared</groupId>
119121
<artifactId>maven-common-artifact-filters</artifactId>
120122
<version>${maven-common-artifact-filters.version}</version>
123+
<scope>provided</scope>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>org.ow2.asm</groupId>
128+
<artifactId>asm</artifactId>
129+
<version>${asm.version}</version>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.ow2.asm</groupId>
133+
<artifactId>asm-commons</artifactId>
134+
<version>${asm.version}</version>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.ow2.asm</groupId>
138+
<artifactId>asm-tree</artifactId>
139+
<version>${asm.version}</version>
140+
</dependency>
141+
<dependency>
142+
<groupId>org.ow2.asm</groupId>
143+
<artifactId>asm-analysis</artifactId>
144+
<version>${asm.version}</version>
121145
</dependency>
122146
</dependencies>
123147

‎versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java

+2
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ public class VersionCheckerMojo extends AbstractMojo {
9292

9393
public void execute() throws MojoExecutionException {
9494
if (skip) {
95+
getLog().info("Version check is skipped");
9596
return;
9697
}
9798
if ("pom".equals(project.getPackaging())) {
99+
getLog().info("Skipping version check for pom");
98100
return;
99101
}
100102
if (newFile == null) {

‎web/web-itests/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
</scm>
4242

4343
<properties>
44+
<aries.skip.version.check>true</aries.skip.version.check>
45+
4446
<asm.version>9.7.1</asm.version>
4547
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
4648
<org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>

‎web/web-urlhandler/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
</aries.osgi.import>
5656
<aries.osgi.activator>org.apache.aries.web.converter.impl.Activator</aries.osgi.activator>
5757
<lastReleaseVersion>1.0.0</lastReleaseVersion>
58+
<org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version>
5859

5960
<asm.version>9.7.1</asm.version>
6061
</properties>

0 commit comments

Comments
 (0)