You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/03/30 20:08:39 UTC
(aries) 02/04: [MAINTENANCE] Replace asm-all with asm* in application
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch replace-asm-all-dependencies-with-asm
in repository https://gitbox.apache.org/repos/asf/aries.git
commit c7b27019a3026f7115d159ad7b8aec5ee7f06827
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Sun Mar 30 21:54:20 2025 +0200
[MAINTENANCE] Replace asm-all with asm* in application
---
application/application-converters/pom.xml | 24 +++++++++++++++++++---
application/application-itests/pom.xml | 24 +++++++++++++++++++---
.../runtime/itests/BasicAppManagerTest.java | 5 ++++-
.../runtime/itests/BasicNoOpResolverTest.java | 5 ++++-
.../itests/IsolatedCfgAdminRuntimeTest.java | 5 ++++-
.../runtime/itests/IsolatedRuntimeTest.java | 5 ++++-
.../runtime/itests/MinimumImportsTest.java | 5 ++++-
.../runtime/itests/OBRAppManagerTest.java | 5 ++++-
.../runtime/itests/OBRResolverAdvancedTest.java | 5 ++++-
.../runtime/itests/OBRResolverTest.java | 5 ++++-
.../application/runtime/itests/UpdateAppTest.java | 5 ++++-
.../pom.xml | 24 +++++++++++++++++++---
.../cm/itest/ConfigurationPostResolverTest.java | 5 ++++-
.../pom.xml | 24 +++++++++++++++++++---
14 files changed, 124 insertions(+), 22 deletions(-)
diff --git a/application/application-converters/pom.xml b/application/application-converters/pom.xml
index e00c63e2a..bf26960b9 100644
--- a/application/application-converters/pom.xml
+++ b/application/application-converters/pom.xml
@@ -53,7 +53,7 @@
</aries.osgi.private.pkg>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
- <asm-all.version>5.2</asm-all.version>
+ <asm.version>9.7.1</asm.version>
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
<org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version>
@@ -101,9 +101,27 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>provided</scope>
- <version>${asm-all.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml
index ddcd570db..559cb2857 100644
--- a/application/application-itests/pom.xml
+++ b/application/application-itests/pom.xml
@@ -44,7 +44,7 @@
</scm>
<properties>
- <asm-all.version>5.2</asm-all.version>
+ <asm.version>9.7.1</asm.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
<javax.inject.version>1</javax.inject.version>
@@ -182,8 +182,26 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>${asm-all.version}</version>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
index 609ff6b23..c49e826e7 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
@@ -169,7 +169,10 @@ public class BasicAppManagerTest extends AbstractIntegrationTest {
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject()
);
}
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
index 8f88754a1..bf526b5f3 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
@@ -144,7 +144,10 @@ public class BasicNoOpResolverTest extends AbstractIntegrationTest {
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject());
}
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
index 421ebb30a..1302ee2b6 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
@@ -379,7 +379,10 @@ public class IsolatedCfgAdminRuntimeTest extends AbstractIntegrationTest {
// Bundles
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
index e629a90a6..2c8ea8a73 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
@@ -327,7 +327,10 @@ public class IsolatedRuntimeTest extends AbstractIntegrationTest {
// Bundles
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
index 3f47283c6..19d856d1a 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
@@ -198,7 +198,10 @@ public class MinimumImportsTest extends AbstractIntegrationTest {
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
// mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.cm").versionAsInProject().start(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject());
}
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
index 6d1f8ad14..6cfdd1c3c 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
@@ -168,7 +168,10 @@ public class OBRAppManagerTest extends AbstractIntegrationTest {
// Bundles
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
index e7d076bdf..263861a5f 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
@@ -555,7 +555,10 @@ public class OBRResolverAdvancedTest extends AbstractIntegrationTest {
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject());
}
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
index edb276804..b5d9eabc6 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
@@ -330,7 +330,10 @@ public class OBRResolverTest extends AbstractIntegrationTest {
// Bundles
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
index 5b09626d5..20e7e0df1 100644
--- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
+++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
@@ -269,7 +269,10 @@ public class UpdateAppTest extends AbstractIntegrationTest {
junitBundles(),
// mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml
index 0bffe6ae9..462e8919b 100644
--- a/application/application-resolve-transform-cm-itests/pom.xml
+++ b/application/application-resolve-transform-cm-itests/pom.xml
@@ -48,7 +48,7 @@
org.apache.aries.application.resolve.transform.cm.itests;
</aries.osgi.private.pkg>
- <asm-all.version>5.2</asm-all.version>
+ <asm.version>9.7.1</asm.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<javax.inject.version>1</javax.inject.version>
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
@@ -123,8 +123,26 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>${asm-all.version}</version>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<scope>test</scope>
</dependency>
diff --git a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
index e9bd51f5f..2de44e1a0 100644
--- a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
+++ b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
@@ -146,7 +146,10 @@ public class ConfigurationPostResolverTest extends AbstractIntegrationTest {
mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(),
// mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(),
diff --git a/application/application-tooling-repository-generator/pom.xml b/application/application-tooling-repository-generator/pom.xml
index d6386a9da..32baf2d2a 100644
--- a/application/application-tooling-repository-generator/pom.xml
+++ b/application/application-tooling-repository-generator/pom.xml
@@ -49,7 +49,7 @@
</aries.osgi.private.pkg>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
- <asm-all.version>5.2</asm-all.version>
+ <asm.version>9.7.1</asm.version>
<cm.version>3.2.0-v20070116</cm.version>
<geronimo-jpa_2.0_spec.version>1.1</geronimo-jpa_2.0_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
@@ -156,8 +156,26 @@
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <version>${asm-all.version}</version>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>${asm.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>${asm.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>${asm.version}</version>
<optional>true</optional>
</dependency>
<dependency>