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/05/05 12:54:39 UTC
[aries-jax-rs-whiteboard] 01/02: jpms.exec
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
commit c453fc47cbe781f076b0ade1030cb71b8315e8fe
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Sat Apr 30 23:32:36 2022 -0400
jpms.exec
---
.../aries-jaxrs-whiteboard-example-connect.bndrun | 30 ++++++++++++++++
.../aries-jaxrs-whiteboard-example.bndrun | 5 +++
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 11 +++++-
jax-rs.example/pom.xml | 10 ++++++
.../whiteboard-resolve-test/pom.xml | 16 +++++++++
pom.xml | 41 ++++++++++++++++++++--
6 files changed, 109 insertions(+), 4 deletions(-)
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example-connect.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example-connect.bndrun
new file mode 100644
index 0000000..afb0354
--- /dev/null
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example-connect.bndrun
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+-include: ~aries-jaxrs-whiteboard-example.bndrun
+
+#
+# Setup OSGi Connect in BND Launcher
+#
+-runsystempackages:
+
+-runpath.connect: \
+ org.apache.felix.atomos,\
+ osgi.core
+
+-runproperties.connect: \
+ atomos.content.start=false
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index f03a3f9..b30bb92 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -15,6 +15,11 @@
# specific language governing permissions and limitations
# under the License.
+-jpms-module-info: \
+ ${project.artifactId};\
+ version=${project.version};\
+ ee=JavaSE-${java.specification.version}
+
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index cfb2cf6..906c278 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -15,6 +15,11 @@
# specific language governing permissions and limitations
# under the License.
+-jpms-module-info: \
+ ${project.artifactId};\
+ version=${project.version};\
+ ee=JavaSE-${java.specification.version}
+
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -36,7 +41,8 @@
-resolve.effective: resolve, active
java.8.reqs: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)'
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
java.9.plus.reqs: \
${java.8.reqs},\
@@ -66,6 +72,9 @@ java.9.plus.reqs: \
org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
+ org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
org.apache.felix.http.jetty;version='[4.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 907cf1c..d901693 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -62,6 +62,7 @@
<bndruns>
<bndrun>aries-jaxrs-whiteboard-only.bndrun</bndrun>
<bndrun>aries-jaxrs-whiteboard-example.bndrun</bndrun>
+ <bndrun>aries-jaxrs-whiteboard-example-connect.bndrun</bndrun>
</bndruns>
</configuration>
</plugin>
@@ -127,6 +128,15 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.atomos</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.atomos</groupId>
+ <artifactId>osgi.core</artifactId>
+ <classifier>AtomosEquinox</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
diff --git a/jax-rs.itests/src/test/resources/integration-test/whiteboard-resolve-test/pom.xml b/jax-rs.itests/src/test/resources/integration-test/whiteboard-resolve-test/pom.xml
index 18b29af..b58c62f 100644
--- a/jax-rs.itests/src/test/resources/integration-test/whiteboard-resolve-test/pom.xml
+++ b/jax-rs.itests/src/test/resources/integration-test/whiteboard-resolve-test/pom.xml
@@ -80,4 +80,20 @@
</plugin>
</plugins>
</build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>bnd-snapshots</id>
+ <url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>bnd-release</id>
+ <url>https://bndtools.jfrog.io/bndtools/libs-release/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 892bbae..b659b79 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.2.0</bnd.version>
+ <bnd.version>6.3.0-RC1</bnd.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<cxf.version>3.5.2</cxf.version>
<dsl.version>1.2.2</dsl.version>
@@ -339,12 +339,27 @@
<artifactId>jettison</artifactId>
<version>${jettison.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix.atomos</groupId>
+ <artifactId>osgi.core</artifactId>
+ <classifier>AtomosEquinox</classifier>
+ <version>8.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.atomos</artifactId>
+ <version>1.0.0</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${eclipse.osgi.version}</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
@@ -755,11 +770,31 @@
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
- <id>bndtools-snapshots</id>
- <url>https://bndtools.jfrog.io/artifactory/libs-snapshot-local</url>
+ <id>bnd-snapshots</id>
+ <url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
+ <repository>
+ <id>bnd-release</id>
+ <url>https://bndtools.jfrog.io/bndtools/libs-release/</url>
+ <layout>default</layout>
+ </repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>bnd-snapshots</id>
+ <url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>bnd-release</id>
+ <url>https://bndtools.jfrog.io/bndtools/libs-release/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
</project>