You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2020/10/15 21:38:25 UTC
[aries] branch trunk updated: ARIES-2013 The Provide-Capability
header is broken in 1.3.1 due to FELIX-6337
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 d73a389 ARIES-2013 The Provide-Capability header is broken in 1.3.1 due to FELIX-6337
d73a389 is described below
commit d73a389ef2ff6620aa01c4972cf53dc246f31988
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Oct 15 17:35:10 2020 -0400
ARIES-2013 The Provide-Capability header is broken in 1.3.1 due to FELIX-6337
Signed-off-by: Raymond Augé <ro...@apache.org>
---
spi-fly/spi-fly-core/pom.xml | 1 -
spi-fly/spi-fly-dynamic-bundle/pom.xml | 102 +++++++++---------
.../spi-fly-dynamic-framework-extension/pom.xml | 117 ++++++++++-----------
spi-fly/spi-fly-static-bundle/pom.xml | 98 +++++++++--------
spi-fly/spi-fly-static-tool/pom.xml | 10 --
spi-fly/spi-fly-weaver/pom.xml | 2 -
6 files changed, 154 insertions(+), 176 deletions(-)
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index ab19ba0..de50187 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -47,7 +47,6 @@
</scm>
<properties>
- <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
<bnd.version>5.1.2</bnd.version>
</properties>
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 98f6aeb..e16e313 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -31,7 +31,6 @@
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Aries SPI Fly Dynamic Weaving Bundle</name>
<description>
This bundle contains an extender that facilitates the use
@@ -48,7 +47,6 @@
<properties>
<asm.version>9.0</asm.version>
- <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
<bnd.version>5.1.2</bnd.version>
</properties>
@@ -126,59 +124,48 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.plugin.version}</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
- <instructions>
- <Bundle-Activator>org.apache.aries.spifly.dynamic.DynamicWeavingActivator</Bundle-Activator>
- <Import-Package>
- !org.slf4j,
- *
- </Import-Package>
- <Export-Package>
- org.apache.aries.spifly*;version=${project.version}
- </Export-Package>
- <Private-Package>
- org.apache.aries.spifly.dynamic
- </Private-Package>
- <_conditionalpackage>
- aQute.bnd.header,
- aQute.bnd.stream,
- aQute.bnd.version,
- aQute.bnd.version.maven,
- aQute.lib.collections,
- aQute.lib.date,
- aQute.lib.exceptions,
- aQute.lib.io,
- aQute.lib.stringrover,
- aQute.lib.strings,
- aQute.libg.generics,
- aQute.libg.glob,
- aQute.libg.qtokens,
- aQute.service.reporter,
- org.apache.aries.spifly.*
- </_conditionalpackage>
- <_includeresource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- </_includeresource>
- <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"
- </Provide-Capability>
- <_fixupmessages>
- Export org.apache.aries.spifly, has 1, private references
- </_fixupmessages>
- </instructions>
+ <bnd><![CDATA[
+ Bundle-Activator: org.apache.aries.spifly.dynamic.DynamicWeavingActivator
+ Export-Package: org.apache.aries.spifly.*;version=${project.version}
+ -conditionalpackage: \
+ aQute.bnd.header,\
+ aQute.bnd.stream,\
+ aQute.bnd.version,\
+ aQute.bnd.version.maven,\
+ aQute.lib.collections,\
+ aQute.lib.date,\
+ aQute.lib.exceptions,\
+ aQute.lib.hex,\
+ aQute.lib.io,\
+ aQute.lib.stringrover,\
+ aQute.lib.strings,\
+ aQute.libg.generics,\
+ aQute.libg.glob,\
+ aQute.libg.qtokens,\
+ aQute.service.reporter,\
+ org.apache.aries.spifly.dynamic,\
+ org.apache.aries.spifly.weaver
+ -includeresource: \
+ META-INF/LICENSE=LICENSE,\
+ META-INF/NOTICE=NOTICE
+ 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"
+ -fixupmessages: \
+ "Export org.apache.aries.spifly, has 1, private references"
+ ]]></bnd>
</configuration>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>${bnd.version}</version>
- </dependency>
- </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -233,6 +220,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index 4fd05b7..98001e4 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -31,7 +31,6 @@
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
<version>1.3.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Aries SPI Fly Dynamic Weaving Framework Extension</name>
<description>
This framework extension fragment contains an extender that facilitates
@@ -48,7 +47,6 @@
<properties>
<asm.version>9.0</asm.version>
- <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
<bnd.version>5.1.2</bnd.version>
</properties>
@@ -118,66 +116,56 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.plugin.version}</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
- <instructions>
- <Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
- <ExtensionBundle-Activator>org.apache.aries.spifly.dynamic.DynamicWeavingActivator</ExtensionBundle-Activator>
- <Import-Package>
- !org.slf4j,
- *
- </Import-Package>
- <Export-Package>
- org.apache.aries.spifly;version=${project.version}
- </Export-Package>
- <Private-Package>
- org.apache.aries.spifly.*;-split-package:=first
- </Private-Package>
- <_conditionalpackage>
- aQute.bnd.header,
- aQute.bnd.stream,
- aQute.bnd.version,
- aQute.bnd.version.maven,
- aQute.lib.collections,
- aQute.lib.date,
- aQute.lib.exceptions,
- aQute.lib.io,
- aQute.lib.stringrover,
- aQute.lib.strings,
- aQute.libg.generics,
- aQute.libg.glob,
- aQute.libg.qtokens,
- aQute.service.reporter,
- 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>
- <_includeresource>
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- </_includeresource>
- <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"
- </Provide-Capability>
- <_fixupmessages>
- Host system.bundle=extension:=framework,
- Export org.apache.aries.spifly, has 1, private references
- </_fixupmessages>
- </instructions>
+ <bnd><![CDATA[
+ Fragment-Host: system.bundle;extension:=framework
+ ExtensionBundle-Activator: org.apache.aries.spifly.dynamic.DynamicWeavingActivator
+ Export-Package: org.apache.aries.spifly;version=${project.version}
+ Private-Package: \
+ org.apache.aries.spifly.dynamic,\
+ org.apache.aries.spifly.weaver
+ -conditionalpackage: \
+ aQute.bnd.header,\
+ aQute.bnd.stream,\
+ aQute.bnd.version,\
+ aQute.bnd.version.maven,\
+ aQute.lib.collections,\
+ aQute.lib.date,\
+ aQute.lib.exceptions,\
+ aQute.lib.io,\
+ aQute.lib.stringrover,\
+ aQute.lib.strings,\
+ aQute.libg.generics,\
+ aQute.libg.glob,\
+ aQute.libg.qtokens,\
+ aQute.service.reporter,\
+ org.objectweb.asm,\
+ org.objectweb.asm.commons,\
+ org.objectweb.asm.signature,\
+ org.objectweb.asm.tree,\
+ org.objectweb.asm.tree.analysis,\
+ org.objectweb.asm.util
+ -includeresource: \
+ META-INF/LICENSE=LICENSE,\
+ META-INF/NOTICE=NOTICE
+ 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"
+ -fixupmessages: \
+ "Host system.bundle=extension:=framework",\
+ "Export org.apache.aries.spifly, has 1, private references"
+ ]]></bnd>
</configuration>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>${bnd.version}</version>
- </dependency>
- </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -232,6 +220,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index d1858fe..bb5a656 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -31,7 +31,6 @@
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.static.bundle</artifactId>
<version>1.3.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Aries SPI Fly Static Weaving Bundle</name>
<description>
This bundle contains support classes used at runtime by bundles
@@ -47,7 +46,6 @@
</scm>
<properties>
- <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
<bnd.version>5.1.2</bnd.version>
</properties>
@@ -88,56 +86,47 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.plugin.version}</version>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
- <instructions>
- <Import-Package>
- !org.slf4j,
- *
- </Import-Package>
- <Export-Package>
- org.apache.aries.spifly.*;version=${project.version}
- </Export-Package>
- <Private-Package>
- org.apache.aries.spifly.staticbundle
- </Private-Package>
- <_conditionalpackage>
- aQute.bnd.header,
- aQute.bnd.stream,
- aQute.bnd.version,
- aQute.bnd.version.maven,
- aQute.lib.collections,
- aQute.lib.date,
- aQute.lib.exceptions,
- aQute.lib.io,
- aQute.lib.stringrover,
- aQute.lib.strings,
- aQute.libg.generics,
- aQute.libg.glob,
- aQute.libg.qtokens,
- aQute.service.reporter
- </_conditionalpackage>
- <_includeresource>
- @biz.aQute.bndlib-[0-9.]*.jar!/aQute/bnd/osgi/Instruction*.class,
- META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE,
- </_includeresource>
- <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>
- <_fixupmessages>Export org.apache.aries.spifly, has 1, private references</_fixupmessages>
- </instructions>
+ <bnd><![CDATA[
+ Bundle-Activator: org.apache.aries.spifly.staticbundle.StaticWeavingActivator
+ Export-Package: \
+ org.apache.aries.spifly.*;version=${project.version}
+ -conditionalpackage: \
+ aQute.bnd.header,\
+ aQute.bnd.stream,\
+ aQute.bnd.version,\
+ aQute.bnd.version.maven,\
+ aQute.lib.collections,\
+ aQute.lib.date,\
+ aQute.lib.exceptions,\
+ aQute.lib.hex,\
+ aQute.lib.io,\
+ aQute.lib.stringrover,\
+ aQute.lib.strings,\
+ aQute.libg.generics,\
+ aQute.libg.glob,\
+ aQute.libg.qtokens,\
+ aQute.service.reporter,\
+ org.apache.aries.spifly.staticbundle
+ -includeresource: \
+ @biz.aQute.bndlib-[0-9.]*.jar!/aQute/bnd/osgi/Instruction*.class,\
+ META-INF/LICENSE=LICENSE,\
+ META-INF/NOTICE=NOTICE
+ Provide-Capability: \
+ osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0
+ -fixupmessages: Export org.apache.aries.spifly, has 1, private references
+ ]]></bnd>
</configuration>
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>${bnd.version}</version>
- </dependency>
- </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -192,6 +181,15 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index d9e1eb7..582ea7d 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -44,11 +44,6 @@
<tag>HEAD</tag>
</scm>
- <properties>
- <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
- <bnd.version>5.1.2</bnd.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
@@ -70,11 +65,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml
index 6602850..668f540 100644
--- a/spi-fly/spi-fly-weaver/pom.xml
+++ b/spi-fly/spi-fly-weaver/pom.xml
@@ -43,8 +43,6 @@
<properties>
<asm.version>9.0</asm.version>
- <maven.bundle.plugin.version>5.1.1</maven.bundle.plugin.version>
- <bnd.version>5.1.2</bnd.version>
</properties>
<dependencies>