diff --git a/org.eclipse.osgitech.rest.archetype/pom.xml b/org.eclipse.osgitech.rest.archetype/pom.xml
index 8aaafec..a409cd6 100644
--- a/org.eclipse.osgitech.rest.archetype/pom.xml
+++ b/org.eclipse.osgitech.rest.archetype/pom.xml
@@ -2,9 +2,9 @@
4.0.0
- org.eclipse.osgi-technology.rest
- parent
- 1.0.0-SNAPSHOT
+ org.eclipse.osgi-technology.rest
+ parent
+ 1.0.0-SNAPSHOT
../pom.xml
diff --git a/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/launch.bndrun b/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/launch.bndrun
index 05d877a..b561167 100644
--- a/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/launch.bndrun
+++ b/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/launch.bndrun
@@ -12,44 +12,53 @@
-runproperties: \
org.osgi.service.http.port=-1
--runbundles: \
- jakarta.activation-api;version='[2.1.0,2.1.1)',\
- jakarta.annotation-api;version='[2.1.1,2.1.2)',\
- jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
- jakarta.validation.jakarta.validation-api;version='[3.0.2,3.0.3)',\
- jakarta.ws.rs-api;version='[3.1.0,3.1.1)',\
- jakarta.xml.bind-api;version='[4.0.0,4.0.1)',\
- javassist;version='[3.29.0,3.29.1)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
- org.apache.felix.cm.json;version='[2.0.0,2.0.1)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+runbundles.jersey: \
+ ${jersey.deps}
+
+-require-bnd: "(version>=6.4.0)"
+
+jersey.deps: \
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.4)',\
+ jakarta.annotation-api;version='[2.1.1,2.2)',\
+ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.1)',\
+ jakarta.validation.jakarta.validation-api;version='[3.0.2,3.1)',\
+ jakarta.ws.rs-api;version='[3.1.0,3.2)',\
+ jakarta.xml.bind-api;version='[4.0.0,4.1)',\
+ javassist;version='[3.29.2,3.30)',\
+ org.osgi.service.jakartars;version='[2.0.0,2.1)',\
+ org.osgi.service.component;version='[1.5.0,1.6)',\
+ org.osgi.util.function;version='[1.2.0,1.3)',\
+ org.osgi.util.promise;version='[1.3.0,1.4)',\
+ org.osgi.util.converter;version='[1,1.1)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.10)',\
+ org.apache.felix.cm.json;version='[2.0.0,2.1)',\
org.apache.felix.configurator;version='[1.0.18,1.0.19)',\
- org.apache.felix.http.jetty;version='[5.0.4,5.0.5)',\
- org.apache.felix.http.servlet-api;version='[2.1.0,2.1.1)',\
- org.apache.felix.scr;version='[2.2.6,2.2.7)',\
- org.eclipse.osgitech.rest;version='[1.0.0,1.0.1)',\
- org.eclipse.osgitech.rest.servlet.whiteboard;version='[1.0.0,1.0.1)',\
- org.eclipse.osgitech.rest.sse;version='[1.0.0,1.0.1)',\
- org.eclipse.parsson.jakarta.json;version='[1.1.2,1.1.3)',\
- org.glassfish.hk2.api;version='[3.0.4,3.0.5)',\
- org.glassfish.hk2.external.aopalliance-repackaged;version='[3.0.4,3.0.5)',\
- org.glassfish.hk2.locator;version='[3.0.4,3.0.5)',\
+ org.apache.felix.http.jetty;version='[5.0.0,5.1)',\
+ org.apache.felix.http.servlet-api;version='[2.1.0,2.2)',\
+ org.apache.felix.scr;version='[2.2.6,2.3)',\
+ org.eclipse.parsson.jakarta.json;version='[1.1.2,1.2)',\
+ com.sun.xml.bind.jaxb-osgi;version='[4,4.1)',\
+ com.sun.activation.jakarta.activation;version='[2,2.1)',\
+ org.glassfish.hk2.api;version='[3.0.4,3.1)',\
+ org.glassfish.hk2.external.aopalliance-repackaged;version='[3.0.4,3.1)',\
+ org.glassfish.hk2.locator;version='[3.0.4,3.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
- org.glassfish.hk2.utils;version='[3.0.4,3.0.5)',\
- org.glassfish.jersey.containers.jersey-container-servlet;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.containers.jersey-container-servlet-core;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.core.jersey-client;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.core.jersey-common;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.core.jersey-server;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.inject.jersey-hk2;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.media.jersey-media-jaxb;version='[3.1.2,3.1.3)',\
- org.glassfish.jersey.media.jersey-media-sse;version='[3.1.2,3.1.3)',\
- org.objectweb.asm;version='[9.5.0,9.5.1)',\
- org.osgi.service.component;version='[1.5.1,1.5.2)',\
- org.osgi.service.jakartars;version='[2.0.0,2.0.1)',\
- org.osgi.util.converter;version='[1.0.9,1.0.10)',\
- org.osgi.util.function;version='[1.2.0,1.2.1)',\
- org.osgi.util.promise;version='[1.3.0,1.3.1)',\
- slf4j.api;version='[1.7.36,1.7.37)',\
- slf4j.simple;version='[1.7.36,1.7.37)',\
- ${artifactId};version=snapshot
+ org.glassfish.hk2.utils;version='[3.0.4,3.1)',\
+ org.glassfish.jersey.containers.jersey-container-servlet;version='[3.1.2,3.2)',\
+ org.glassfish.jersey.containers.jersey-container-servlet-core;version='[3.1.1,3.2)',\
+ org.glassfish.jersey.core.jersey-client;version='[3.1.2,3.2)',\
+ org.glassfish.jersey.core.jersey-common;version='[3.1.2,3.2)',\
+ org.glassfish.jersey.core.jersey-server;version='[3.1.2,3.2)',\
+ org.glassfish.jersey.inject.jersey-hk2;version='[3.1.2,3.2)',\
+ org.glassfish.jersey.media.jersey-media-jaxb;version='[3.1.2,3.2)',\
+ org.glassfish.jersey.media.jersey-media-sse;version='[3.1.2,3.2)',\
+ org.objectweb.asm;version='[9.6,9.7)',\
+ org.objectweb.asm.commons;version='[9.6,9.7)',\
+ org.objectweb.asm.tree;version='[9.6,9.7)',\
+ org.objectweb.asm.tree.analysis;version='[9.6,9.7)',\
+ org.objectweb.asm.util;version='[9.6,9.7)',\
+ slf4j.api;version='[1.7.36,1.8)',\
+ slf4j.simple;version='[1.7.30,1.8)',\
+ org.eclipse.osgitech.rest;version='[1,2)',\
+ org.eclipse.osgitech.rest.sse;version='[1,2)'
+
diff --git a/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/pom.xml b/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/pom.xml
index 3e554ae..0a30f13 100644
--- a/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/pom.xml
+++ b/org.eclipse.osgitech.rest.archetype/src/main/resources/archetype-resources/pom.xml
@@ -11,7 +11,7 @@
11
11
6.4.0
- 3.1.2
+ 3.1.3
diff --git a/org.eclipse.osgitech.rest.bnd.library/bnd.bnd b/org.eclipse.osgitech.rest.bnd.library/bnd.bnd
index c6d8633..cd29da4 100644
--- a/org.eclipse.osgitech.rest.bnd.library/bnd.bnd
+++ b/org.eclipse.osgitech.rest.bnd.library/bnd.bnd
@@ -1,9 +1,12 @@
-resourceonly: true
-jersey.version: 3.1.2
-hk2.version: 3.0.4
+jersey.version: 3.1.3
+hk2.version: 3.0.5
Provide-Capability: \
bnd.library;\
bnd.library = jakartaREST; \
path = library/workspace
+
+-includeresource: {library=library}
+
diff --git a/org.eclipse.osgitech.rest.bnd.library/src/main/resources/library/workspace/jakartarest.mvn b/org.eclipse.osgitech.rest.bnd.library/library/workspace/jakartarest.mvn
similarity index 83%
rename from org.eclipse.osgitech.rest.bnd.library/src/main/resources/library/workspace/jakartarest.mvn
rename to org.eclipse.osgitech.rest.bnd.library/library/workspace/jakartarest.mvn
index 002dc01..4866301 100644
--- a/org.eclipse.osgitech.rest.bnd.library/src/main/resources/library/workspace/jakartarest.mvn
+++ b/org.eclipse.osgitech.rest.bnd.library/library/workspace/jakartarest.mvn
@@ -1,15 +1,16 @@
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.bnd.project.library:${mvn-base-version}
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest:${mvn-base-version}
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.jetty:${mvn-base-version}
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.servlet.whiteboard:${mvn-base-version}
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.config:${mvn-base-version}
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.sse:${mvn-base-version}
-org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.multipart:${mvn-base-version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.bnd.project.library:${project.version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest:${project.version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.jetty:${project.version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.servlet.whiteboard:${project.version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.config:${project.version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.sse:${project.version}
+org.eclipse.osgitech.rest:org.eclipse.osgitech.rest.multipart:${project.version}
org.apache.felix:org.apache.felix.http.jetty:5.0.4
org.apache.felix:org.apache.felix.http.servlet-api:2.1.0
org.apache.felix:org.apache.felix.cm.json:2.0.0
org.apache.felix:org.apache.felix.configurator:1.0.18
+org.apache.felix:org.apache.felix.configadmin:1.9.26
org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:1.3.6
org.osgi:org.osgi.util.promise:1.3.0
org.osgi:org.osgi.service.jakartars:2.0.0
@@ -71,14 +72,14 @@ org.glassfish.jersey.media:jersey-media-sse:${jersey.version}
org.javassist:javassist:3.29.2-GA
org.jvnet.mimepull:mimepull:1.10.0
-org.eclipse.parsson:jakarta.json:1.1.2
-org.eclipse.parsson:parsson-media:1.1.2
+org.eclipse.parsson:jakarta.json:1.1.5
+org.eclipse.parsson:parsson-media:1.1.5
org.slf4j:slf4j-api:1.7.36
org.slf4j:slf4j-simple:1.7.36
# ASM
-org.ow2.asm:asm:9.5
-org.ow2.asm:asm-tree:9.5
-org.ow2.asm:asm-commons:9.5
-org.ow2.asm:asm-analysis:9.5
-org.ow2.asm:asm-util:9.5
\ No newline at end of file
+org.ow2.asm:asm:9.6
+org.ow2.asm:asm-tree:9.6
+org.ow2.asm:asm-commons:9.6
+org.ow2.asm:asm-analysis:9.6
+org.ow2.asm:asm-util:9.6
\ No newline at end of file
diff --git a/org.eclipse.osgitech.rest.bnd.library/src/main/resources/library/workspace/workspace.bnd b/org.eclipse.osgitech.rest.bnd.library/library/workspace/workspace.bnd
similarity index 97%
rename from org.eclipse.osgitech.rest.bnd.library/src/main/resources/library/workspace/workspace.bnd
rename to org.eclipse.osgitech.rest.bnd.library/library/workspace/workspace.bnd
index a636dea..210840f 100644
--- a/org.eclipse.osgitech.rest.bnd.library/src/main/resources/library/workspace/workspace.bnd
+++ b/org.eclipse.osgitech.rest.bnd.library/library/workspace/workspace.bnd
@@ -6,5 +6,4 @@
readOnly=true; \
poll.time=-1; \
name="OSGi Technology Jakarta REST"
-
\ No newline at end of file
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/library/bndrun.bnd b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/library/bndrun.bnd
index b4f8394..f22dfe4 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/library/bndrun.bnd
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/library/bndrun.bnd
@@ -42,11 +42,11 @@ jersey.deps: \
org.glassfish.jersey.inject.jersey-hk2;version='[3.1.2,3.2)',\
org.glassfish.jersey.media.jersey-media-jaxb;version='[3.1.2,3.2)',\
org.glassfish.jersey.media.jersey-media-sse;version='[3.1.2,3.2)',\
- org.objectweb.asm;version='[9.5,9.6)',\
- org.objectweb.asm.commons;version='[9.5,9.6)',\
- org.objectweb.asm.tree;version='[9.5,9.6)',\
- org.objectweb.asm.tree.analysis;version='[9.5,9.6)',\
- org.objectweb.asm.util;version='[9.5,9.6)',\
+ org.objectweb.asm;version='[9.6,9.7)',\
+ org.objectweb.asm.commons;version='[9.6,9.7)',\
+ org.objectweb.asm.tree;version='[9.6,9.7)',\
+ org.objectweb.asm.tree.analysis;version='[9.6,9.7)',\
+ org.objectweb.asm.util;version='[9.6,9.7)',\
slf4j.api;version='[1.7.36,1.8)',\
slf4j.simple;version='[1.7.30,1.8)',\
org.eclipse.osgitech.rest;version='[1,2)',\
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/bnd.bnd b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/bnd.bnd
index 2627fc9..7b52d92 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/bnd.bnd
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/bnd.bnd
@@ -1,6 +1,5 @@
-buildpath: \
- osgi.annotation;version=latest,\
- osgi.core;version=latest
+ org.osgi.service.component.annotations;version=latest
-library: enableJakartaREST
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/launch.bndrun b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/launch.bndrun
index a98fb09..dd05717 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/launch.bndrun
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/launch.bndrun
@@ -6,8 +6,6 @@
-resolve.effective: active;skip:="osgi.service"
--runtrace: true
-
# enabled the runbundles for the Jersey dependencies
# This sets -runbundles.jersey: ${jersey.deps}
-library: enableJakartaREST
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/{{srcDir}}/{{basePackageDir}}/DemoResource.java b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/{{srcDir}}/{{basePackageDir}}/DemoResource.java
index c4ac133..ebf7646 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/{{srcDir}}/{{basePackageDir}}/DemoResource.java
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/{{srcDir}}/{{basePackageDir}}/DemoResource.java
@@ -25,6 +25,11 @@
/**
*
* This is a Demo Resource for a Jakartars Whiteboard
+ * You should see an log output like this, that mentions port and uri:
+ * Started Jakartars whiteboard server for port: and context: /rest/
+ *
+ * So the application can be reached under:
+ * http://localhost:/rest/hello-no-config
*
* @since 1.0
*/
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/bnd.bnd b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/bnd.bnd
index ca20fb0..6355e00 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/bnd.bnd
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/bnd.bnd
@@ -1,6 +1,5 @@
-buildpath: \
- osgi.annotation;version=latest,\
- osgi.core;version=latest,\
+ org.osgi.service.component.annotations;version=latest,\
org.osgi.service.servlet;version=latest
-library: enableJakartaREST
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/launch.bndrun b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/launch.bndrun
index d23421d..6ab2bbe 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/launch.bndrun
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/launch.bndrun
@@ -6,8 +6,6 @@
-resolve.effective: active;skip:="osgi.service"
--runtrace: true
-
# enabled the runbundles for the Jersey dependencies
-library: enableJakartaREST
@@ -17,6 +15,7 @@
# we need to run our project
-runbundles.project: \
org.eclipse.osgitech.rest.servlet.whiteboard;version=latest,\
+ org.eclipse.parsson.jakarta.json;version=latest,\
{{projectName}};version=snapshot
-runblacklist: \
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/bnd.bnd b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/bnd.bnd
index 5188d97..44188dc 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/bnd.bnd
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/bnd.bnd
@@ -1,6 +1,5 @@
-buildpath: \
- osgi.annotation;version=latest,\
- osgi.core;version=latest
+ org.osgi.service.component.annotations;version=latest
-library: enableJakartaREST
diff --git a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/launch.bndrun b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/launch.bndrun
index f861f84..3c938e8 100644
--- a/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/launch.bndrun
+++ b/org.eclipse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/launch.bndrun
@@ -6,8 +6,6 @@
-resolve.effective: active;skip:="osgi.service"
--runtrace: true
-
# enabled the runbundles for the Jersey dependencies
# This sets -runbundles.jersey: ${jersey.deps}
-library: enableJakartaREST
@@ -18,6 +16,7 @@
# we need to run our project
-runbundles.project: \
org.eclipse.osgitech.rest.jetty;version=latest,\
+ org.eclipse.parsson.jakarta.json;version=latest,\
{{projectName}};version=snapshot
-runblacklist: \
diff --git a/org.eclipse.osgitech.rest.tck/pom.xml b/org.eclipse.osgitech.rest.tck/pom.xml
index 57f8123..298c13b 100644
--- a/org.eclipse.osgitech.rest.tck/pom.xml
+++ b/org.eclipse.osgitech.rest.tck/pom.xml
@@ -45,6 +45,7 @@
org.osgi
org.osgi.test.cases.jakartars
8.1.0-SNAPSHOT
+ test
org.junit.jupiter
diff --git a/pom.xml b/pom.xml
index b959fd1..4669456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
https://github.com/osgi/jakartarest-osgi
- scm:git:https://github.com/osgi/jakartarest-osgi
- scm:git:https://github.com/osgi/jakartarest-osgi
+ scm:git:git@github.com:osgi/jakartarest-osgi.git
+ scm:git:git@github.com:osgi/jakartarest-osgi.git
release
@@ -61,20 +61,20 @@
11
11
6.4.0
- 5.9.2
+ 5.10.0
3.24.2
5.4.0
1.2.1
- 3.1.2
- 3.0.4
+ 3.1.3
+ 3.0.5
9.5
2.15.2
-
+ org.eclipse.osgitech.rest.archetype
org.eclipse.osgitech.rest
org.eclipse.osgitech.rest.config
org.eclipse.osgitech.rest.jetty
@@ -738,7 +738,8 @@
nexus-staging-maven-plugin
ossrh
- https://oss.sonatype.org/
+ https://s01.oss.sonatype.org/
+ true
@@ -746,7 +747,7 @@
ossrh
- https://oss.sonatype.org/content/repositories/snapshots/
+ https://s01.oss.sonatype.org/content/repositories/snapshots