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 2022/04/11 02:54:20 UTC
[aries-jax-rs-whiteboard] branch master updated: update bnd to 6.2.0
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 54ffc31 update bnd to 6.2.0
54ffc31 is described below
commit 54ffc31723e26e947a3ce3671d260753ad0a9a93
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sun Apr 10 22:47:32 2022 -0400
update bnd to 6.2.0
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../cxf-jettison/cxf-jettison-itest/pom.xml | 27 ++--------------------
integrations/jackson/jackson-itest/pom.xml | 27 ++--------------------
integrations/openapi/openapi-itest/pom.xml | 27 ++--------------------
.../rest-management/rest-management-itest/pom.xml | 27 ++--------------------
integrations/shiro/shiro-itest/pom.xml | 27 ++--------------------
jax-rs.example/pom.xml | 12 +++++-----
jax-rs.itests/pom.xml | 27 ++--------------------
jax-rs.itests/src/main/resources/ignoreme | 0
pom.xml | 27 +++++++++++-----------
9 files changed, 31 insertions(+), 170 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
index 5e9928b..804b7b1 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
@@ -37,9 +37,9 @@
<artifactId>bnd-maven-plugin</artifactId>
<executions>
<execution>
- <id>bnd-process-tests</id>
+ <id>test-jar</id>
<goals>
- <goal>bnd-process-tests</goal>
+ <goal>test-jar</goal>
</goals>
<configuration>
<bndfile>bnd.bnd</bndfile>
@@ -57,9 +57,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -77,9 +74,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -87,23 +81,6 @@
</scopes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/integrations/jackson/jackson-itest/pom.xml b/integrations/jackson/jackson-itest/pom.xml
index ee83e61..73e7b81 100644
--- a/integrations/jackson/jackson-itest/pom.xml
+++ b/integrations/jackson/jackson-itest/pom.xml
@@ -37,9 +37,9 @@
<artifactId>bnd-maven-plugin</artifactId>
<executions>
<execution>
- <id>bnd-process-tests</id>
+ <id>test-jar</id>
<goals>
- <goal>bnd-process-tests</goal>
+ <goal>test-jar</goal>
</goals>
<configuration>
<bndfile>bnd.bnd</bndfile>
@@ -57,9 +57,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -77,9 +74,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -87,23 +81,6 @@
</scopes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/integrations/openapi/openapi-itest/pom.xml b/integrations/openapi/openapi-itest/pom.xml
index 9da11ee..d415190 100644
--- a/integrations/openapi/openapi-itest/pom.xml
+++ b/integrations/openapi/openapi-itest/pom.xml
@@ -37,9 +37,9 @@
<artifactId>bnd-maven-plugin</artifactId>
<executions>
<execution>
- <id>bnd-process-tests</id>
+ <id>test-jar</id>
<goals>
- <goal>bnd-process-tests</goal>
+ <goal>test-jar</goal>
</goals>
<configuration>
<bndfile>bnd.bnd</bndfile>
@@ -57,9 +57,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -77,9 +74,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -87,23 +81,6 @@
</scopes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/integrations/rest-management/rest-management-itest/pom.xml b/integrations/rest-management/rest-management-itest/pom.xml
index 2732591..ee30674 100644
--- a/integrations/rest-management/rest-management-itest/pom.xml
+++ b/integrations/rest-management/rest-management-itest/pom.xml
@@ -35,9 +35,9 @@
<artifactId>bnd-maven-plugin</artifactId>
<executions>
<execution>
- <id>bnd-process-tests</id>
+ <id>test-jar</id>
<goals>
- <goal>bnd-process-tests</goal>
+ <goal>test-jar</goal>
</goals>
<configuration>
<bndfile>bnd.bnd</bndfile>
@@ -56,9 +56,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -94,9 +91,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -122,23 +116,6 @@
</scopes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/integrations/shiro/shiro-itest/pom.xml b/integrations/shiro/shiro-itest/pom.xml
index fd8b403..024475b 100644
--- a/integrations/shiro/shiro-itest/pom.xml
+++ b/integrations/shiro/shiro-itest/pom.xml
@@ -37,9 +37,9 @@
<artifactId>bnd-maven-plugin</artifactId>
<executions>
<execution>
- <id>bnd-process-tests</id>
+ <id>test-jar</id>
<goals>
- <goal>bnd-process-tests</goal>
+ <goal>test-jar</goal>
</goals>
<configuration>
<bndfile>bnd.bnd</bndfile>
@@ -57,9 +57,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -77,9 +74,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -87,23 +81,6 @@
</scopes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index faf4dbb..2e85ccb 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -101,7 +101,7 @@
</dependency>
- <!-- This runtime dependency is a Declarative Services implementation,
+ <!-- This runtime dependency is a Declarative Services implementation,
used to publish the example resource as an OSGi service-->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -116,12 +116,12 @@
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- These runtime dependencies are needed to run the JAX-RS whiteboard,
- * Felix Http Jetty provides an HTTP whiteboard implementation
- * Felix Configuration Admin provides configuration support,
- * Eclipse Equinox is the OSGi framework implementation
-
+ * Felix Http Jetty provides an HTTP whiteboard implementation
+ * Felix Configuration Admin provides configuration support,
+ * Eclipse Equinox is the OSGi framework implementation
+
You can choose different implementations if you prefer.
-->
<dependency>
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index 3f2a907..af4c14b 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -42,9 +42,9 @@
<artifactId>bnd-maven-plugin</artifactId>
<executions>
<execution>
- <id>bnd-process-tests</id>
+ <id>test-jar</id>
<goals>
- <goal>bnd-process-tests</goal>
+ <goal>test-jar</goal>
</goals>
<configuration>
<bndfile>bnd.bnd</bndfile>
@@ -62,9 +62,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -82,9 +79,6 @@
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
- <bundles>
- <bundle>${project.build.directory}/${project.build.finalName}-tests.jar</bundle>
- </bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -92,23 +86,6 @@
</scopes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
diff --git a/jax-rs.itests/src/main/resources/ignoreme b/jax-rs.itests/src/main/resources/ignoreme
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index e907fbf..6c477eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<project.build.outputTimestamp>10</project.build.outputTimestamp>
<assertj.core.version>3.22.0</assertj.core.version>
- <bnd.version>6.1.0</bnd.version>
+ <bnd.version>6.2.0</bnd.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<cxf.version>3.5.1</cxf.version>
<dsl.version>1.2.2</dsl.version>
@@ -559,11 +559,21 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>${bnd.version}</version>
+ <extensions>true</extensions>
<executions>
<execution>
- <id>bnd-process</id>
+ <id>jar</id>
<goals>
- <goal>bnd-process</goal>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <skipIfEmpty>true</skipIfEmpty>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
</goals>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
@@ -616,17 +626,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <skipIfEmpty>true</skipIfEmpty>
- </configuration>
- </plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>