aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rotty3...@apache.org
Subject [aries] branch trunk updated: ARIES-1978 Do not embed ASM in SPIFly
Date Mon, 25 May 2020 15:06:38 GMT
This is an automated email from the ASF dual-hosted git repository.

rotty3000 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 6ae6c1a  ARIES-1978 Do not embed ASM in SPIFly
6ae6c1a is described below

commit 6ae6c1a4ceaded2ce346fc4003e2bbe8d7e6a0cf
Author: Raymond Augé <rotty3000@apache.org>
AuthorDate: Mon May 25 09:54:55 2020 -0400

    ARIES-1978 Do not embed ASM in SPIFly
    
    Signed-off-by: Raymond Augé <rotty3000@apache.org>
---
 spi-fly/spi-fly-core/pom.xml                  |  1 -
 spi-fly/spi-fly-dynamic-bundle/pom.xml        | 43 ++-------------------------
 spi-fly/spi-fly-dynamic-bundle/resolve.bndrun |  8 ++++-
 spi-fly/spi-fly-static-bundle/pom.xml         |  3 +-
 spi-fly/spi-fly-static-tool/pom.xml           | 11 -------
 spi-fly/spi-fly-weaver/pom.xml                |  7 +++--
 6 files changed, 15 insertions(+), 58 deletions(-)

diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 5cd8169..bcc957f 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -47,7 +47,6 @@
     </scm>
 
     <properties>
-        <asm.version>8.0.1</asm.version>
         <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
         <bnd.version>5.0.1</bnd.version>
     </properties>
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index dd63691..4f69bbc 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -57,19 +57,16 @@
             <groupId>org.ow2.asm</groupId>
             <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-util</artifactId>
             <version>${asm.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.spifly</groupId>
@@ -160,13 +157,7 @@
                             aQute.libg.glob,
                             aQute.libg.qtokens,
                             aQute.service.reporter,
-                            org.apache.aries.spifly.*,
-                            org.objectweb.asm,
-                            org.objectweb.asm.commons,
-                            org.objectweb.asm.signature,
-                            org.objectweb.asm.tree,
-                            org.objectweb.asm.tree.analysis,
-                            org.objectweb.asm.util
+                            org.apache.aries.spifly.*
                         </_conditionalpackage>
                         <_includeresource>
                             META-INF/LICENSE=LICENSE,
@@ -260,33 +251,6 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>org.ow2.asm</groupId>
-                                            <artifactId>asm</artifactId>
-                                            <version>${asm.version}</version>
-                                            <type>jar</type>
-                                            <classifier>sources</classifier>
-                                            <overWrite>false</overWrite>
-                                            <outputDirectory>${project.build.directory}/upacksources/asm</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.ow2.asm</groupId>
-                                            <artifactId>asm-commons</artifactId>
-                                            <version>${asm.version}</version>
-                                            <type>jar</type>
-                                            <classifier>sources</classifier>
-                                            <overWrite>false</overWrite>
-                                            <outputDirectory>${project.build.directory}/upacksources/asm-commons</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.ow2.asm</groupId>
-                                            <artifactId>asm-util</artifactId>
-                                            <version>${asm.version}</version>
-                                            <type>jar</type>
-                                            <classifier>sources</classifier>
-                                            <overWrite>false</overWrite>
-                                            <outputDirectory>${project.build.directory}/upacksources/asm-util</outputDirectory>
-                                        </artifactItem>
-                                        <artifactItem>
                                             <groupId>biz.aQute.bnd</groupId>
                                             <artifactId>biz.aQute.bndlib</artifactId>
                                             <version>${bnd.version}</version>
@@ -332,9 +296,6 @@
                                     <sources>
                                         <source>${project.basedir}/../spi-fly-core/src/main/java/</source>
                                         <source>${project.basedir}/../spi-fly-weaver/src/main/java/</source>
-                                        <source>${project.build.directory}/upacksources/asm</source>
-                                        <source>${project.build.directory}/upacksources/asm-commons</source>
-                                        <source>${project.build.directory}/upacksources/asm-util</source>
                                         <source>${project.build.directory}/upacksources/bndlib</source>
                                     </sources>
                                 </configuration>
@@ -347,7 +308,7 @@
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <excludePackageNames>aQute.*,org.objectweb.*</excludePackageNames>
+                            <excludePackageNames>aQute.*</excludePackageNames>
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
index 5682aa8..154e97f 100644
--- a/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
+++ b/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
@@ -15,4 +15,10 @@
 -runee: JavaSE-1.8
 -runfw: org.apache.felix.framework
 -runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
--runbundles: org.apache.aries.spifly.dynamic.bundle;version='[1.3.0,1.3.1)'
+-runbundles: \
+	org.apache.aries.spifly.dynamic.bundle;version='[1.3.0,1.3.1)',\
+	org.objectweb.asm;version='[8.0.1,8.0.2)',\
+	org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
+	org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
+	org.objectweb.asm.tree.analysis;version='[8.0.1,8.0.2)',\
+	org.objectweb.asm.util;version='[8.0.1,8.0.2)'
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index e61e171..2fa18d2 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -47,7 +47,6 @@
     </scm>
 
     <properties>
-        <asm.version>8.0.1</asm.version>
         <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
         <bnd.version>5.0.1</bnd.version>
     </properties>
@@ -267,7 +266,7 @@
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <excludePackageNames>aQute.*,org.objectweb.*</excludePackageNames>
+                            <excludePackageNames>aQute.*</excludePackageNames>
                         </configuration>
                     </plugin>
                 </plugins>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index 26b553e..c08da5b 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -45,23 +45,12 @@
     </scm>
 
     <properties>
-        <asm.version>8.0.1</asm.version>
         <maven.bundle.plugin.version>4.2.0</maven.bundle.plugin.version>
         <bnd.version>5.0.1</bnd.version>
     </properties>
 
     <dependencies>
         <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.apache.aries.spifly</groupId>
             <artifactId>org.apache.aries.spifly.core-internal</artifactId>
             <version>${project.version}</version>
diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml
index 14ce869..fbb9370 100644
--- a/spi-fly/spi-fly-weaver/pom.xml
+++ b/spi-fly/spi-fly-weaver/pom.xml
@@ -52,13 +52,16 @@
             <groupId>org.ow2.asm</groupId>
             <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-util</artifactId>
+            <version>${asm.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.spifly</groupId>


Mime
View raw message