From 8568b1dfa0feeb054dd01f96d96b3e10df615126 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Wed, 23 Aug 2023 15:43:19 +0200 Subject: [PATCH 1/7] Ignore Deploy - added deploy skip for nexus staging plugin Signed-off-by: Mark Hoffmann --- .../pom.xml | 11 ++++++----- org.eclipse.osgitech.rest.tck/pom.xml | 11 ++++++----- org.eclipse.osgitech.rest.tests/pom.xml | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml b/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml index c413132..f1ea66a 100644 --- a/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml +++ b/org.eclipse.osgitech.rest.servlet.whiteboard.tests/pom.xml @@ -226,11 +226,12 @@ bnd-testing-maven-plugin - org.apache.maven.plugins - maven-deploy-plugin - - true - + org.sonatype.plugins + nexus-staging-maven-plugin + true + + true + diff --git a/org.eclipse.osgitech.rest.tck/pom.xml b/org.eclipse.osgitech.rest.tck/pom.xml index ea6f02a..57f8123 100644 --- a/org.eclipse.osgitech.rest.tck/pom.xml +++ b/org.eclipse.osgitech.rest.tck/pom.xml @@ -259,11 +259,12 @@ - org.apache.maven.plugins - maven-deploy-plugin - - true - + 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 ba2828d..8ff06e0 100644 --- a/org.eclipse.osgitech.rest.tests/pom.xml +++ b/org.eclipse.osgitech.rest.tests/pom.xml @@ -221,11 +221,12 @@ bnd-testing-maven-plugin - org.apache.maven.plugins - maven-deploy-plugin - - true - + org.sonatype.plugins + nexus-staging-maven-plugin + true + + true + From a793461025e84e356368061202ea9d3e53a5467b Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Tue, 19 Sep 2023 14:14:09 +0200 Subject: [PATCH 2/7] Remove project templates modules from build Signed-off-by: Mark Hoffmann --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d4939e8..b959fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 3ad2706f6b19f93ce64f941d8b48dc3e28ccc425 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Tue, 19 Sep 2023 15:01:36 +0200 Subject: [PATCH 3/7] Allow timestmped snapshots in release - allow timestamped snapshots for latest tck Signed-off-by: Mark Hoffmann --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b959fd1..6677d40 100644 --- a/pom.xml +++ b/pom.xml @@ -672,6 +672,7 @@ true 1 release + true From 209870e01fa70db72092394ad2f797b8d0935d49 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Tue, 19 Sep 2023 15:20:24 +0200 Subject: [PATCH 4/7] ignore snapshots - set dependency scope to test Signed-off-by: Mark Hoffmann --- org.eclipse.osgitech.rest.tck/pom.xml | 1 + pom.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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 6677d40..b959fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,6 @@ true 1 release - true From 796309b54a27b5a0cc8abd44ca993f2ca30d4084 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Fri, 20 Oct 2023 21:05:15 +0200 Subject: [PATCH 5/7] Merge branch 'main' of git@github.com:maho7791/jakartarest-osgi.git into main Signed-off-by: Mark Hoffmann --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b959fd1..96a1751 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 From 033a7c7b65e4914f974ebecc48bf9747357def54 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Fri, 27 Oct 2023 13:54:51 +0200 Subject: [PATCH 6/7] Add bnd-library, archetype - modified archetype to current deps - modified library to current deps Signed-off-by: Mark Hoffmann --- org.eclipse.osgitech.rest.archetype/pom.xml | 6 +- .../archetype-resources/launch.bndrun | 87 ++++++++++--------- .../resources/archetype-resources/pom.xml | 2 +- org.eclipse.osgitech.rest.bnd.library/bnd.bnd | 7 +- .../library/workspace/jakartarest.mvn | 29 ++++--- .../library/workspace/workspace.bnd | 1 - .../src/main/resources/library/bndrun.bnd | 10 +-- .../templates/rest-no-config/bnd.bnd | 3 +- .../templates/rest-no-config/launch.bndrun | 2 - .../{{basePackageDir}}/DemoResource.java | 5 ++ .../rest-with-config-http-wb/bnd.bnd | 3 +- .../rest-with-config-http-wb/launch.bndrun | 3 +- .../templates/rest-with-config/bnd.bnd | 3 +- .../templates/rest-with-config/launch.bndrun | 3 +- pom.xml | 10 +-- 15 files changed, 92 insertions(+), 82 deletions(-) rename org.eclipse.osgitech.rest.bnd.library/{src/main/resources => }/library/workspace/jakartarest.mvn (83%) rename org.eclipse.osgitech.rest.bnd.library/{src/main/resources => }/library/workspace/workspace.bnd (97%) 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/pom.xml b/pom.xml index 96a1751..c75ddcf 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 464aea8e005ef42f16c920f7e29c10ebc6751a67 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Fri, 27 Oct 2023 16:51:23 +0200 Subject: [PATCH 7/7] Verified Release Setup - added autocloase on release Signed-off-by: Mark Hoffmann --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c75ddcf..4669456 100644 --- a/pom.xml +++ b/pom.xml @@ -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