From 8568b1dfa0feeb054dd01f96d96b3e10df615126 Mon Sep 17 00:00:00 2001
From: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
Date: Wed, 23 Aug 2023 15:43:19 +0200
Subject: [PATCH 1/5] Ignore Deploy

- added deploy skip for nexus staging plugin

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
---
 .../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 @@
 				<artifactId>bnd-testing-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
-            	<groupId>org.apache.maven.plugins</groupId>
-            	<artifactId>maven-deploy-plugin</artifactId>
-            	<configuration>
-            		<skip>true</skip>
-            	</configuration>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>
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 @@
 				</executions>
 			</plugin>
 			<plugin>
-            	<groupId>org.apache.maven.plugins</groupId>
-            	<artifactId>maven-deploy-plugin</artifactId>
-            	<configuration>
-            		<skip>true</skip>
-            	</configuration>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>
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 @@
 				<artifactId>bnd-testing-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
-            	<groupId>org.apache.maven.plugins</groupId>
-            	<artifactId>maven-deploy-plugin</artifactId>
-            	<configuration>
-            		<skip>true</skip>
-            	</configuration>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>

From a793461025e84e356368061202ea9d3e53a5467b Mon Sep 17 00:00:00 2001
From: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
Date: Tue, 19 Sep 2023 14:14:09 +0200
Subject: [PATCH 2/5] Remove project templates modules from build

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
---
 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 @@
 	</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</module>
 		<module>org.eclipse.osgitech.rest.config</module>
 		<module>org.eclipse.osgitech.rest.jetty</module>
@@ -83,7 +84,6 @@
 		<module>org.eclipse.osgitech.rest.sse</module>
 		<module>org.eclipse.osgitech.rest.tck</module>
 		<module>org.eclipse.osgitech.rest.tests</module>
-		<module>org.eclipse.osgitech.rest.archetype</module>
 	</modules>
 	
 	<repositories>

From 3ad2706f6b19f93ce64f941d8b48dc3e28ccc425 Mon Sep 17 00:00:00 2001
From: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
Date: Tue, 19 Sep 2023 15:01:36 +0200
Subject: [PATCH 3/5] Allow timestmped snapshots in release

- allow timestamped snapshots for latest tck

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
---
 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 @@
       					<autoVersionSubmodules>true</autoVersionSubmodules>
       					<autoResolveSnapshots>1</autoResolveSnapshots>
       					<releaseProfiles>release</releaseProfiles>
+      					<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
    					</configuration>
 				</plugin>
 			</plugins>

From 209870e01fa70db72092394ad2f797b8d0935d49 Mon Sep 17 00:00:00 2001
From: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
Date: Tue, 19 Sep 2023 15:20:24 +0200
Subject: [PATCH 4/5] ignore snapshots

- set dependency scope to test

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
---
 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 @@
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.test.cases.jakartars</artifactId>
 			<version>8.1.0-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index 6677d40..b959fd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -672,7 +672,6 @@
       					<autoVersionSubmodules>true</autoVersionSubmodules>
       					<autoResolveSnapshots>1</autoResolveSnapshots>
       					<releaseProfiles>release</releaseProfiles>
-      					<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
    					</configuration>
 				</plugin>
 			</plugins>

From 796309b54a27b5a0cc8abd44ca993f2ca30d4084 Mon Sep 17 00:00:00 2001
From: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
Date: Fri, 20 Oct 2023 21:05:15 +0200
Subject: [PATCH 5/5] Merge branch 'main' of
 git@github.com:maho7791/jakartarest-osgi.git into main

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>
---
 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 @@
 	
 	<scm>
 		<url>https://github.com/osgi/jakartarest-osgi</url>
-		<connection>scm:git:https://github.com/osgi/jakartarest-osgi</connection>
-		<developerConnection>scm:git:https://github.com/osgi/jakartarest-osgi</developerConnection>
+		<connection>scm:git:git@github.com:osgi/jakartarest-osgi.git</connection>
+		<developerConnection>scm:git:git@github.com:osgi/jakartarest-osgi.git</developerConnection>
 		<tag>release</tag>		
 	</scm>