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 2da2ae5a449f5f4d0e2ba3d00a1ef341a92f21af Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Mar 30 21:46:43 2025 +0200 [MAINTENANCE] Replace asm-all with asm* in samples --- .../assemblies/equinox-test-harness/pom.xml | 16 ++++++++++++++-- .../main/filtered-resources/configuration/config.ini | 5 ++++- samples/blog/blog-assembly/pom.xml | 16 ++++++++++++++-- .../main/filtered-resources/configuration/config.ini | 5 ++++- samples/blog/blog-itests/pom.xml | 19 ++++++++++++++++--- .../blog/itests/AbstractBlogIntegrationTest.java | 5 ++++- .../blueprint/helloworld/helloworld-assembly/pom.xml | 17 ++++++++++++++--- .../main/filtered-resources/configuration/config.ini | 5 ++++- .../blueprint/helloworld/helloworld-itests/pom.xml | 19 ++++++++++++++++--- .../helloworld/itests/HelloworldSampleTest.java | 6 +++++- samples/pom.xml | 7 ------- samples/twitter/twitter-itests/pom.xml | 19 ++++++++++++++++--- .../aries/sample/twitter/itest/TwitterTest.java | 5 ++++- 13 files changed, 115 insertions(+), 29 deletions(-) diff --git a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml index c126f97a1..804d046ae 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml +++ b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml @@ -119,8 +119,20 @@ <artifactId>org.apache.servicemix.bundles.serp</artifactId> </dependency> <dependency> - <groupId>asm</groupId> - <artifactId>asm-all</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> </dependency> <dependency> <groupId>org.apache.felix</groupId> diff --git a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini index 394bdb244..244dcb0c7 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini +++ b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini @@ -18,7 +18,10 @@ osgi.bundles=\ cm-${cm.version}.jar@start,\ services-${services.version}.jar@start,\ -asm-all-${asm-all.version}.jar@start,\ +asm-${asm.version}.jar@start,\ +asm-commons-${asm.version}.jar@start,\ +asm-tree-${asm.version}.jar@start,\ +asm-analysis-${asm.version}.jar@start,\ pax-logging-api-${pax-logging.version}.jar@start,\ pax-logging-service-${pax-logging.version}.jar@start,\ derby-${derby.version}.jar@start,\ diff --git a/samples/blog/blog-assembly/pom.xml b/samples/blog/blog-assembly/pom.xml index 32e657a92..4c5022907 100644 --- a/samples/blog/blog-assembly/pom.xml +++ b/samples/blog/blog-assembly/pom.xml @@ -223,8 +223,20 @@ </dependency> <dependency> - <groupId>asm</groupId> - <artifactId>asm-all</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> </dependency> <dependency> diff --git a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini index a96fac2b8..6b0ffecdd 100644 --- a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini +++ b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini @@ -18,7 +18,10 @@ osgi.bundles=\ cm-${cm.version}@start,\ services-${services.version}.jar@start,\ -asm-all-${asm-all.version}.jar@start,\ +asm-${asm.version}.jar@start,\ +asm-commons-${asm.version}.jar@start,\ +asm-tree-${asm.version}.jar@start,\ +asm-analysis-${asm.version}.jar@start,\ pax-logging-api-${pax-logging.version}.jar@start,\ pax-logging-service-${pax-logging.version}.jar@start,\ derby-${derby.version}.jar@start,\ diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index 49d3af183..3a5affdba 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -31,7 +31,6 @@ </description> <properties> - <asm.version>5.2</asm.version> <cm.version>3.2.0-v20070116</cm.version> <commons-dbcp.version>1.4</commons-dbcp.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> @@ -154,8 +153,22 @@ <dependency> <groupId>org.ow2.asm</groupId> - <artifactId>asm-all</artifactId> - <version>${asm.version}</version> + <artifactId>asm</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> <scope>test</scope> </dependency> diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index 4447728db..4178252e0 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -228,7 +228,10 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ).versionAsInProject(), mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ).versionAsInProject(), mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ).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.samples.blog", "org.apache.aries.samples.blog.datasource" ).versionAsInProject() ///vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"), ); diff --git a/samples/blueprint/helloworld/helloworld-assembly/pom.xml b/samples/blueprint/helloworld/helloworld-assembly/pom.xml index 42e5b5e0e..55440dca1 100644 --- a/samples/blueprint/helloworld/helloworld-assembly/pom.xml +++ b/samples/blueprint/helloworld/helloworld-assembly/pom.xml @@ -78,10 +78,21 @@ <artifactId>org.apache.aries.proxy</artifactId> </dependency> <dependency> - <groupId>asm</groupId> - <artifactId>asm-all</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> </dependency> - <dependency> <groupId>org.apache.aries.samples.blueprint.helloworld</groupId> diff --git a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini index 326c1171e..1e5c97535 100644 --- a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini +++ b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini @@ -20,7 +20,10 @@ cm-${cm.version}@start,\ services-${services.version}@start,\ pax-logging-api-${pax-logging.version}.jar@start,\ pax-logging-service-${pax-logging.version}.jar@start,\ -asm-all-${asm-all.version}.jar@start,\ +asm-${asm.version}.jar@start,\ +asm-commons-${asm.version}.jar@start,\ +asm-tree-${asm.version}.jar@start,\ +asm-analysis-${asm.version}.jar@start,\ org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar@start,\ org.apache.aries.util-${org.apache.aries.util.version}.jar@start,\ org.apache.aries.blueprint-${org.apache.aries.blueprint.version}.jar@start,\ diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml index d5a08dcb4..53696f4e5 100644 --- a/samples/blueprint/helloworld/helloworld-itests/pom.xml +++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml @@ -32,7 +32,6 @@ </description> <properties> - <asm.version>5.2</asm.version> <cm.version>3.2.0-v20070116</cm.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> <org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version> @@ -163,8 +162,22 @@ <dependency> <groupId>org.ow2.asm</groupId> - <artifactId>asm-all</artifactId> - <version>${asm.version}</version> + <artifactId>asm</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> <scope>test</scope> </dependency> diff --git a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java index 5e64f1566..d8f6d6360 100644 --- a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java +++ b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages; import static org.ops4j.pax.exam.CoreOptions.*; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.systemProperty; @@ -179,7 +180,10 @@ public class HelloworldSampleTest extends AbstractIntegrationTest { mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"), mavenBundle("org.apache.aries", "org.apache.aries.util" ), - mavenBundle("org.ow2.asm", "asm-all" ), + 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.samples.blueprint.helloworld", "org.apache.aries.samples.blueprint.helloworld.api"), mavenBundle("org.apache.aries.samples.blueprint.helloworld", "org.apache.aries.samples.blueprint.helloworld.server"), mavenBundle("org.apache.aries.samples.blueprint.helloworld", "org.apache.aries.samples.blueprint.helloworld.client") diff --git a/samples/pom.xml b/samples/pom.xml index 91cf46ab3..a38af1788 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -94,7 +94,6 @@ <!-- External Dependencies --> <cm.version>3.2.0-v20070116</cm.version> <services.version>3.1.200-v20070605</services.version> - <asm-all.version>3.3.1</asm-all.version> <derby.version>10.14.2.0</derby.version> <commons-collections.version>3.2.2</commons-collections.version> <commons-lang.version>2.6</commons-lang.version> @@ -228,12 +227,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-all</artifactId> - <version>${asm-all.version}</version> - </dependency> - <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml index 1da29d304..81aece0da 100644 --- a/samples/twitter/twitter-itests/pom.xml +++ b/samples/twitter/twitter-itests/pom.xml @@ -33,7 +33,6 @@ </description> <properties> - <asm.version>5.2</asm.version> <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version> <javax.inject.version>1</javax.inject.version> <logback.version>1.5.18</logback.version> @@ -69,8 +68,22 @@ </dependency> <dependency> <groupId>org.ow2.asm</groupId> - <artifactId>asm-all</artifactId> - <version>${asm.version}</version> + <artifactId>asm</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-tree</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-analysis</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java index 5753cc073..717688950 100644 --- a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java +++ b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java @@ -191,7 +191,10 @@ public class TwitterTest { 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(), mavenBundle("org.apache.aries.samples.twitter", "org.apache.aries.samples.twitter.twitter4j").versionAsInProject() );
