diff --git a/org.eclipse.osgitech.rest.jetty/pom.xml b/org.eclipse.osgitech.rest.jetty/pom.xml
index cc97db8..beab334 100644
--- a/org.eclipse.osgitech.rest.jetty/pom.xml
+++ b/org.eclipse.osgitech.rest.jetty/pom.xml
@@ -77,4 +77,85 @@
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.6.0
+
+
+ copy-framework-scr-serviceloader-slf4j-impl
+
+ copy
+
+ pre-integration-test
+
+ ${project.build.directory}/bundles
+
+
+ org.apache.felix
+ org.apache.felix.framework
+ org.apache.felix.framework.jar
+
+
+ org.apache.felix
+ org.apache.felix.scr
+ org.apache.felix.scr.jar
+
+
+ org.apache.aries.spifly
+ org.apache.aries.spifly.dynamic.framework.extension
+ org.apache.aries.spifly.dynamic.framework.extension.jar
+
+
+ org.slf4j
+ slf4j-simple
+ slf4j-simple.jar
+
+
+
+
+
+
+
+ biz.aQute.bnd
+ bnd-resolver-maven-plugin
+
+
+ resolve-test
+
+ true
+
+
+
+ resolve
+ integration-test
+
+ resolve
+
+
+
+ src/test/resources/resolve.bndrun
+
+ false
+ false
+ false
+ true
+
+ compile
+ runtime
+
+
+ ${project.build.directory}/bundles/org.apache.felix.framework.jar
+ ${project.build.directory}/bundles/org.apache.felix.scr.jar
+ ${project.build.directory}/bundles/org.apache.aries.spifly.dynamic.framework.extension.jar
+ ${project.build.directory}/bundles/slf4j-simple.jar
+
+
+
+
+
+
+
diff --git a/org.eclipse.osgitech.rest.jetty/src/test/resources/resolve.bndrun b/org.eclipse.osgitech.rest.jetty/src/test/resources/resolve.bndrun
new file mode 100644
index 0000000..859432b
--- /dev/null
+++ b/org.eclipse.osgitech.rest.jetty/src/test/resources/resolve.bndrun
@@ -0,0 +1,5 @@
+-runrequires: \
+ bnd.identity;id='org.eclipse.osgitech.rest.jetty'
+
+-runfw: org.apache.felix.framework
+-runee: JavaSE-11
diff --git a/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml b/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml
index bdfdea1..f1ea66a 100644
--- a/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml
+++ b/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml
@@ -15,6 +15,10 @@
JakartaREST / Jersey with Servlet Whiteboard Application Tests
Application tests for use of the Servlet Whiteboard implementation together with the JakartaREST Whiteboard
+
+ true
+
+
org.eclipse.osgi-technology.rest
@@ -221,6 +225,14 @@
biz.aQute.bnd
bnd-testing-maven-plugin
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ true
+
+ true
+
+
diff --git a/org.eclipse.osgitech.rest.servlet.whiteboard/pom.xml b/org.eclipse.osgitech.rest.servlet.whiteboard/pom.xml
index 046ac8d..1b6de1f 100644
--- a/org.eclipse.osgitech.rest.servlet.whiteboard/pom.xml
+++ b/org.eclipse.osgitech.rest.servlet.whiteboard/pom.xml
@@ -52,5 +52,92 @@
org.osgi.util.tracker
-
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.6.0
+
+
+ copy-framework-scr-servletwhiteboard-serviceloader-slf4j-impl
+
+ copy
+
+ pre-integration-test
+
+ ${project.build.directory}/bundles
+
+
+ org.apache.felix
+ org.apache.felix.framework
+ org.apache.felix.framework.jar
+
+
+ org.apache.felix
+ org.apache.felix.scr
+ org.apache.felix.scr.jar
+
+
+ org.apache.felix
+ org.apache.felix.http.jetty
+ org.apache.felix.http.jetty.jar
+
+
+ org.apache.aries.spifly
+ org.apache.aries.spifly.dynamic.framework.extension
+ org.apache.aries.spifly.dynamic.framework.extension.jar
+
+
+ org.slf4j
+ slf4j-simple
+ slf4j-simple.jar
+
+
+
+
+
+
+
+ biz.aQute.bnd
+ bnd-resolver-maven-plugin
+
+
+ resolve-test
+
+ true
+
+
+
+ resolve
+ integration-test
+
+ resolve
+
+
+
+ src/test/resources/resolve.bndrun
+
+ false
+ false
+ false
+ true
+
+ compile
+ runtime
+
+
+ ${project.build.directory}/bundles/org.apache.felix.framework.jar
+ ${project.build.directory}/bundles/org.apache.felix.scr.jar
+ ${project.build.directory}/bundles/org.apache.felix.http.jetty.jar
+ ${project.build.directory}/bundles/org.apache.aries.spifly.dynamic.framework.extension.jar
+ ${project.build.directory}/bundles/slf4j-simple.jar
+
+
+
+
+
+
+
diff --git a/org.eclipse.osgitech.rest.servlet.whiteboard/src/test/resources/resolve.bndrun b/org.eclipse.osgitech.rest.servlet.whiteboard/src/test/resources/resolve.bndrun
new file mode 100644
index 0000000..c1e91ad
--- /dev/null
+++ b/org.eclipse.osgitech.rest.servlet.whiteboard/src/test/resources/resolve.bndrun
@@ -0,0 +1,5 @@
+-runrequires: \
+ bnd.identity;id='org.eclipse.osgitech.rest.servlet.whiteboard'
+
+-runfw: org.apache.felix.framework
+-runee: JavaSE-11
diff --git a/org.eclipse.osgitech.rest.sse/pom.xml b/org.eclipse.osgitech.rest.sse/pom.xml
index e027c57..330eca9 100644
--- a/org.eclipse.osgitech.rest.sse/pom.xml
+++ b/org.eclipse.osgitech.rest.sse/pom.xml
@@ -14,6 +14,10 @@
SSE extension for the Jersey based Jakarta RESTful Web Services Whiteboard implementation
+
+ org.osgi
+ org.osgi.service.jakartars
+
org.glassfish.jersey.core
jersey-client
@@ -42,6 +46,10 @@
jakarta.inject
jakarta.inject-api
+
+ biz.aQute.bnd
+ biz.aQute.bnd.annotation
+
@@ -57,10 +65,7 @@
diff --git a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/SseEventSourceFactoryImpl.java b/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/SseEventSourceFactoryImpl.java
similarity index 96%
rename from org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/SseEventSourceFactoryImpl.java
rename to org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/SseEventSourceFactoryImpl.java
index e536e43..df241c3 100644
--- a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/SseEventSourceFactoryImpl.java
+++ b/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/SseEventSourceFactoryImpl.java
@@ -11,7 +11,7 @@
* Stefan Bishof - API and implementation
* Tim Ward - implementation
*/
-package org.eclipse.osgitech.rest.runtime.common;
+package org.eclipse.osgitech.rest.sse;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.sse.SseEventSource;
diff --git a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/SseSourceBuilderService.java b/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/SseSourceBuilderService.java
similarity index 95%
rename from org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/SseSourceBuilderService.java
rename to org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/SseSourceBuilderService.java
index 0c7aa70..e1215f2 100644
--- a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/SseSourceBuilderService.java
+++ b/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/SseSourceBuilderService.java
@@ -11,7 +11,7 @@
* Stefan Bishof - API and implementation
* Tim Ward - implementation
*/
-package org.eclipse.osgitech.rest.runtime.common;
+package org.eclipse.osgitech.rest.sse;
import jakarta.ws.rs.client.WebTarget;
diff --git a/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/package-info.java b/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/package-info.java
new file mode 100644
index 0000000..9860681
--- /dev/null
+++ b/org.eclipse.osgitech.rest.sse/src/main/java/org/eclipse/osgitech/rest/sse/package-info.java
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2012 - 2022 Data In Motion and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ * Tim Ward - initial API and implementation
+ */
+@org.osgi.annotation.bundle.Export
+package org.eclipse.osgitech.rest.sse;
\ No newline at end of file
diff --git a/org.eclipse.osgitech.rest.tck/pom.xml b/org.eclipse.osgitech.rest.tck/pom.xml
index 39a1531..298c13b 100644
--- a/org.eclipse.osgitech.rest.tck/pom.xml
+++ b/org.eclipse.osgitech.rest.tck/pom.xml
@@ -15,26 +15,37 @@
JakartaREST / Jersey Whiteboard Specification Compliance Tests
TCK tests for using the Jakarta RESTful Web Services Whiteboard implementation
+
+ true
+ true
+
+
- org.eclipse.osgi-technology.rest
- org.eclipse.osgitech.rest
- 1.0.0-SNAPSHOT
-
+ org.eclipse.osgi-technology.rest
+ org.eclipse.osgitech.rest
+ 1.0.0-SNAPSHOT
+
- org.eclipse.osgi-technology.rest
- org.eclipse.osgitech.rest.jetty
- 1.0.0-SNAPSHOT
-
+ org.eclipse.osgi-technology.rest
+ org.eclipse.osgitech.rest.jetty
+ 1.0.0-SNAPSHOT
+
- org.eclipse.osgi-technology.rest
- org.eclipse.osgitech.rest.servlet.whiteboard
- 1.0.0-SNAPSHOT
-
-
- org.eclipse.osgi-technology.rest
- org.eclipse.osgitech.rest.sse
- 1.0.0-SNAPSHOT
+ org.eclipse.osgi-technology.rest
+ org.eclipse.osgitech.rest.servlet.whiteboard
+ 1.0.0-SNAPSHOT
+
+
+ org.eclipse.osgi-technology.rest
+ org.eclipse.osgitech.rest.sse
+ 1.0.0-SNAPSHOT
+
+
+ org.osgi
+ org.osgi.test.cases.jakartars
+ 8.1.0-SNAPSHOT
+ test
org.junit.jupiter
@@ -188,10 +199,6 @@
net.bytebuddy
byte-buddy
-
- org.osgi
- org.osgi.test.cases.jakartars
-
@@ -252,6 +259,14 @@
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ true
+
+ true
+
+
diff --git a/org.eclipse.osgitech.rest.tests/pom.xml b/org.eclipse.osgitech.rest.tests/pom.xml
index d97857f..8ff06e0 100644
--- a/org.eclipse.osgitech.rest.tests/pom.xml
+++ b/org.eclipse.osgitech.rest.tests/pom.xml
@@ -15,6 +15,10 @@
JakartaREST / Jersey Whitebboard Application Tests
Application tests for using the Jakarta RESTful Web Services Whiteboard implementation
+
+ true
+
+
org.eclipse.osgi-technology.rest
@@ -216,6 +220,14 @@
biz.aQute.bnd
bnd-testing-maven-plugin
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ true
+
+ true
+
+
diff --git a/org.eclipse.osgitech.rest/pom.xml b/org.eclipse.osgitech.rest/pom.xml
index 2aa626e..02c29aa 100644
--- a/org.eclipse.osgitech.rest/pom.xml
+++ b/org.eclipse.osgitech.rest/pom.xml
@@ -14,6 +14,11 @@
Implementation of the Jakarta RESTful Web Services Whiteboard based on Eclipse Jersey
+
+ ${project.groupId}
+ org.eclipse.osgitech.rest.sse
+ ${project.version}
+
org.glassfish.jersey.core
jersey-client
@@ -102,10 +107,20 @@
org.ow2.asm
asm
+
+ org.glassfish.jersey.inject
+ jersey-hk2
+ runtime
+
+
+ org.glassfish.jersey.media
+ jersey-media-jaxb
+ runtime
+
jakarta.xml.bind
jakarta.xml.bind-api
- test
+ runtime
org.junit.jupiter
diff --git a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/application/JerseyApplication.java b/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/application/JerseyApplication.java
index 551221d..a25cae2 100644
--- a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/application/JerseyApplication.java
+++ b/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/application/JerseyApplication.java
@@ -24,7 +24,6 @@
import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.osgitech.rest.binder.PromiseResponseHandlerBinder;
diff --git a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderComponent.java b/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderComponent.java
index 7dbe44a..1599972 100644
--- a/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderComponent.java
+++ b/org.eclipse.osgitech.rest/src/main/java/org/eclipse/osgitech/rest/runtime/common/ClientBuilderComponent.java
@@ -21,6 +21,7 @@
import java.util.Hashtable;
import org.eclipse.osgitech.rest.provider.JerseyConstants;
+import org.eclipse.osgitech.rest.sse.SseEventSourceFactoryImpl;
import org.glassfish.jersey.client.JerseyClientBuilder;
import org.osgi.annotation.bundle.Capability;
import org.osgi.framework.Bundle;
diff --git a/pom.xml b/pom.xml
index b79beb9..6677d40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
https://github.com/osgi/jakartarest-osgi
scm:git:https://github.com/osgi/jakartarest-osgi
scm:git:https://github.com/osgi/jakartarest-osgi
- main
+ release
@@ -72,8 +72,9 @@
- org.eclipse.osgitech.rest.bnd.library
+
org.eclipse.osgitech.rest
org.eclipse.osgitech.rest.config
org.eclipse.osgitech.rest.jetty
@@ -83,7 +84,6 @@
org.eclipse.osgitech.rest.sse
org.eclipse.osgitech.rest.tck
org.eclipse.osgitech.rest.tests
- org.eclipse.osgitech.rest.archetype
@@ -376,11 +376,6 @@
1.1.1
compile
-
- org.osgi
- org.osgi.test.cases.jakartars
- 8.1.0-SNAPSHOT
-
org.apache.felix
org.apache.felix.scr
@@ -668,6 +663,18 @@
true
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ 3.0.1
+
+ v@{project.version}
+ true
+ 1
+ release
+ true
+
+
@@ -723,6 +730,10 @@
org.apache.maven.plugins
maven-gpg-plugin
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
org.sonatype.plugins
nexus-staging-maven-plugin