Release Configuration (#31)

* Ignore Deploy - added deploy skip for nexus staging plugin Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> * Remove project templates modules from build Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> * Allow timestmped snapshots in release - allow timestamped snapshots for latest tck Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> * ignore snapshots - set dependency scope to test Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> * Merge branch 'main' of git@github.com:maho7791/jakartarest-osgi.git into main Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> * Add bnd-library, archetype - modified archetype to current deps - modified library to current deps Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> * Verified Release Setup - added autocloase on release Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz> --------- Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
eclipse-osgi-technology · Oct 27, 2023 · b90dde3 · b90dde3
1 parent 031a3d7
commit b90dde3
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 84 deletions.
diff --git a/org.eclipse.osgitech.rest.archetype/pom.xml b/org.eclipse.osgitech.rest.archetype/pom.xml
@@ -2,9 +2,9 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
-  <groupId>org.eclipse.osgi-technology.rest</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.eclipse.osgi-technology.rest</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

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
@@ -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
@@ -11,7 +11,7 @@
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>
  <bnd.version>6.4.0</bnd.version>
- <jersey.version>3.1.2</jersey.version>
+ <jersey.version>3.1.3</jersey.version>
  </properties> 
 
  <dependencies>

diff --git 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/...sources/library/workspace/jakartarest.mvn → ...library/library/workspace/jakartarest.mvn b/...sources/library/workspace/jakartarest.mvn → ...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
+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
diff --git a/...resources/library/workspace/workspace.bnd → ...d.library/library/workspace/workspace.bnd b/...resources/library/workspace/workspace.bnd → ...d.library/library/workspace/workspace.bnd
@@ -6,5 +6,4 @@
  readOnly=true; \
  poll.time=-1; \
  name="OSGi Technology Jakarta REST"
-
 
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
@@ -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/...pse.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/bnd.bnd b/...pse.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/...gitech.rest.bnd.project.library/src/main/resources/templates/rest-no-config/launch.bndrun b/...gitech.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/...c/main/resources/templates/rest-no-config/{{srcDir}}/{{basePackageDir}}/DemoResource.java b/...c/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: <port> and context: /rest/
+ * 
+ * So the application can be reached under:
+ * http://localhost:<port>/rest/hello-no-config
  * 
  * @since 1.0
  */

diff --git a/...ch.rest.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/bnd.bnd b/...ch.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/...t.bnd.project.library/src/main/resources/templates/rest-with-config-http-wb/launch.bndrun b/...t.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/...e.osgitech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/bnd.bnd b/...e.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/...tech.rest.bnd.project.library/src/main/resources/templates/rest-with-config/launch.bndrun b/...tech.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
@@ -61,20 +61,20 @@
  <maven.compiler.source>11</maven.compiler.source>
  <maven.compiler.target>11</maven.compiler.target>
  <bnd.version>6.4.0</bnd.version>
- <junit-jupiter.version>5.9.2</junit-jupiter.version>
+ <junit-jupiter.version>5.10.0</junit-jupiter.version>
  <assertj.version>3.24.2</assertj.version>
  <mockito.version>5.4.0</mockito.version>
  <osgi-test.version>1.2.1</osgi-test.version>
- <jersey.version>3.1.2</jersey.version>
- <hk2.version>3.0.4</hk2.version>
+ <jersey.version>3.1.3</jersey.version>
+ <hk2.version>3.0.5</hk2.version>
  <asm.version>9.5</asm.version>
  <jackson.version>2.15.2</jackson.version>
  </properties>
 
  <modules>
- <!--<module>org.eclipse.osgitech.rest.bnd.library</module>
+ <module>org.eclipse.osgitech.rest.bnd.library</module>
  <module>org.eclipse.osgitech.rest.bnd.project.library</module>
- <module>org.eclipse.osgitech.rest.archetype</module>-->
+ <module>org.eclipse.osgitech.rest.archetype</module>
  <module>org.eclipse.osgitech.rest</module>
  <module>org.eclipse.osgitech.rest.config</module>
  <module>org.eclipse.osgitech.rest.jetty</module>
@@ -739,15 +739,16 @@
  <artifactId>nexus-staging-maven-plugin</artifactId>
  <configuration>
  <serverId>ossrh</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>true</autoReleaseAfterClose>
  </configuration>
  </plugin>
  </plugins>
  </build>
  <distributionManagement>
  <snapshotRepository>
  <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
  </snapshotRepository>
  </distributionManagement>
  </profile>