Author: rotty3000
Date: Tue Oct 30 21:27:58 2018
New Revision: 1845283
URL: http://svn.apache.org/viewvc?rev=1845283&view=rev
Log:
ARIES-1844 Support for ASM 7 (Java 11)
Signed-off-by: Raymond Auge <rotty3...@apache.org>
Added:
aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun
Modified:
aries/trunk/spi-fly/spi-fly-core/pom.xml
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
aries/trunk/spi-fly/spi-fly-weaver/pom.xml
Modified: aries/trunk/spi-fly/spi-fly-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/pom.xml?rev=1845283&r1=1845282&r2=1845283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-core/pom.xml Tue Oct 30 21:27:58 2018
@@ -48,21 +48,20 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0</version>
+ <version>1.1.3</version>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1845283&r1=1845282&r2=1845283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Tue Oct 30 21:27:58 2018
@@ -44,47 +44,57 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-dynamic-bundle</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle</url>
</scm>
+
<properties>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <bnd.version>4.1.0</bnd.version>
</properties>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.0.3</version>
+ <artifactId>asm</artifactId>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>7.0</version>
</dependency>
-
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
<version>1.1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
<version>1.1-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>6.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -98,11 +108,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
<instructions>
<Bundle-Activator>org.apache.aries.spifly.dynamic.DynamicWeavingActivator</Bundle-Activator>
<Import-Package>
- org.objectweb.asm*;version="[5,7)",
+ !org.apache.aries.util.filesystem,
+ !org.apache.aries.util.io,
*
</Import-Package>
<Export-Package>
@@ -111,7 +123,18 @@
<Private-Package>
org.apache.aries.spifly.dynamic
</Private-Package>
-
<Embed-Dependency>org.apache.aries.spifly.*;scope=compile;inline=true</Embed-Dependency>
+ <_conditionalpackage>
+ org.apache.aries.spifly.*,
+ org.apache.aries.util,
+ org.apache.aries.util.internal,
+ org.apache.aries.util.manifest,
+ org.objectweb.asm,
+ org.objectweb.asm.commons,
+ org.objectweb.asm.signature,
+ org.objectweb.asm.tree,
+ org.objectweb.asm.tree.analysis,
+ org.objectweb.asm.util
+ </_conditionalpackage>
<Provide-Capability>
osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0,
osgi.extender;osgi.extender=osgi.serviceloader.processor;version:Version=1.0;uses:="org.apache.aries.spifly"
@@ -120,15 +143,39 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+
<includeDistributionManagement>false</includeDistributionManagement>
+ <fullReport>true</fullReport>
+ </configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>resolve.bndrun</bndrun>
+ </bndruns>
+ </configuration>
<executions>
<execution>
- <id>default-verify</id>
- <phase>verify</phase>
+ <id>resolve</id>
<goals>
- <goal>version-check</goal>
+ <goal>resolve</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
Added: aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun?rev=1845283&view=auto
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun (added)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/resolve.bndrun Tue Oct 30
21:27:58 2018
@@ -0,0 +1,18 @@
+# Licensed 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.
+
+-standalone: true
+-resolve.effective: resolve, active
+-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.1.0,1.1.1)'
Modified: aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/pom.xml?rev=1845283&r1=1845282&r2=1845283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/pom.xml Tue Oct 30
21:27:58 2018
@@ -44,38 +44,48 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-dynamic-framework-extension</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-framework-extension</url>
</scm>
+
<properties>
- <aries.skip.version.check>true</aries.skip.version.check>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <bnd.version>4.1.0</bnd.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>7.0</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.0.3</version>
+ <artifactId>asm-commons</artifactId>
+ <version>7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>7.0</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>6.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -89,7 +99,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.0</version>
+ <version>${bnd.version}</version>
<configuration>
<instructions>
<Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
@@ -100,8 +110,6 @@
<Import-Package>
!org.apache.aries.util.filesystem,
!org.apache.aries.util.io,
- !org.objectweb.asm.signature,
- !org.objectweb.asm.tree,
*
</Import-Package>
<_conditionalpackage>
@@ -109,7 +117,11 @@
org.apache.aries.util.internal,
org.apache.aries.util.manifest,
org.objectweb.asm,
- org.objectweb.asm.commons
+ org.objectweb.asm.commons,
+ org.objectweb.asm.signature,
+ org.objectweb.asm.tree,
+ org.objectweb.asm.tree.analysis,
+ org.objectweb.asm.util
</_conditionalpackage>
<Private-Package>
org.apache.aries.spifly.*;-split-package:=first
@@ -122,19 +134,43 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+
<includeDistributionManagement>false</includeDistributionManagement>
+ <fullReport>true</fullReport>
+ </configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>resolve.bndrun</bndrun>
+ </bndruns>
+ </configuration>
<executions>
<execution>
- <id>default-verify</id>
- <phase>verify</phase>
+ <id>resolve</id>
<goals>
- <goal>version-check</goal>
+ <goal>resolve</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Added: aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun?rev=1845283&view=auto
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun
(added)
+++ aries/trunk/spi-fly/spi-fly-dynamic-framework-extension/resolve.bndrun Tue
Oct 30 21:27:58 2018
@@ -0,0 +1,18 @@
+# Licensed 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.
+
+-standalone: true
+-resolve.effective: resolve, active
+-runee: JavaSE-1.8
+-runfw: org.apache.felix.framework
+-runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
+-runbundles:
org.apache.aries.spifly.dynamic.framework.extension;version='[1.1.0,1.1.1)'
Modified: aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml?rev=1845283&r1=1845282&r2=1845283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml Tue Oct 30 21:27:58 2018
@@ -44,8 +44,9 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-static-bundle</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle</url>
</scm>
+
<properties>
- <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ <bnd.version>4.1.0</bnd.version>
</properties>
<dependencies>
@@ -53,13 +54,21 @@
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
<version>1.1-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <version>5.0.0</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>6.0.1</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
@@ -67,9 +76,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
<instructions>
<Import-Package>
+ !org.apache.aries.util.filesystem,
+ !org.apache.aries.util.io,
*
</Import-Package>
<Export-Package>
@@ -78,26 +90,56 @@
<Private-Package>
org.apache.aries.spifly.staticbundle
</Private-Package>
+ <_conditionalpackage>
+ org.apache.aries.util,
+ org.apache.aries.util.internal,
+ org.apache.aries.util.manifest
+ </_conditionalpackage>
<Bundle-Activator>org.apache.aries.spifly.staticbundle.StaticWeavingActivator</Bundle-Activator>
-
<Provide-Capability>osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0
+ <Provide-Capability>
+
osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0
</Provide-Capability>
</instructions>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.aries.versioning</groupId>
- <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+
<includeDistributionManagement>false</includeDistributionManagement>
+ <fullReport>true</fullReport>
+ </configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>resolve.bndrun</bndrun>
+ </bndruns>
+ </configuration>
<executions>
<execution>
- <id>default-verify</id>
- <phase>verify</phase>
+ <id>resolve</id>
<goals>
- <goal>version-check</goal>
+ <goal>resolve</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Added: aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun?rev=1845283&view=auto
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun (added)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/resolve.bndrun Tue Oct 30
21:27:58 2018
@@ -0,0 +1,18 @@
+# Licensed 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.
+
+-standalone: true
+-resolve.effective: resolve, active
+-runee: JavaSE-1.8
+-runfw: org.apache.felix.framework
+-runrequires: osgi.identity;filter:='(osgi.identity=${project.artifactId})'
+-runbundles: org.apache.aries.spifly.static.bundle;version='[1.1.0,1.1.1)'
Modified: aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/pom.xml?rev=1845283&r1=1845282&r2=1845283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/pom.xml Tue Oct 30 21:27:58 2018
@@ -46,27 +46,29 @@
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.0.3</version>
+ <artifactId>asm</artifactId>
+ <version>7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>7.0</version>
</dependency>
-
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <version>5.0.0</version>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: aries/trunk/spi-fly/spi-fly-weaver/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-weaver/pom.xml?rev=1845283&r1=1845282&r2=1845283&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-weaver/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-weaver/pom.xml Tue Oct 30 21:27:58 2018
@@ -43,23 +43,26 @@
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
- <version>5.0.3</version>
+ <artifactId>asm</artifactId>
+ <version>7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>7.0</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
