From 508e94e074c72d73ac5985c0d71f008ce6377cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sat, 12 Jun 2021 08:30:56 +0200
Subject: [PATCH 1/7] Fix 6403 - add an automatic generated maven deployable p2
 site

---
 jetty-p2/pom.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml          |  1 +
 2 files changed, 51 insertions(+)
 create mode 100644 jetty-p2/pom.xml

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
new file mode 100644
index 000000000000..e94824b2b07b
--- /dev/null
+++ b/jetty-p2/pom.xml
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.eclipse.jetty</groupId>
+		<artifactId>jetty-project</artifactId>
+		<version>10.0.5-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>jetty-p2</artifactId>
+	<name>Jetty :: P2</name>
+	<description>Generates a (maven based) P2 Updatesite</description>
+	<packaging>pom</packaging>
+	<properties>
+		<tycho-version>2.4.0</tycho-version>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<configuration>
+							<categoryName>Jetty Bundles</categoryName>
+							<includeReactor>true</includeReactor>
+							<includeDependencies>false</includeDependencies>
+						</configuration>
+						<id>maven-p2-site</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>assemble-maven-repository</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- This dependency is to make sure this projects is build after all relevant 
+			artifacts are created -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-bom</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index 7eb35f3bee1a..d6814c8b9e3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,7 @@
     <module>jetty-bom</module>
     <module>documentation</module>
     <module>jetty-keystore</module>
+    <module>jetty-p2</module>
   </modules>
 
   <build>

From cdc004f2ac8cdde1a00450da4558235bbd28da7d Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 27 Jul 2021 11:10:59 +1000
Subject: [PATCH 2/7] Update jetty-p2/pom.xml fix parent version

---
 jetty-p2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index e94824b2b07b..0fa92adfd537 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.jetty</groupId>
 		<artifactId>jetty-project</artifactId>
-		<version>10.0.5-SNAPSHOT</version>
+		<version>10.0.7-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jetty-p2</artifactId>

From 59a7240f287af28502a643557bab6374cee898fc Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 29 Jul 2021 09:58:16 +1000
Subject: [PATCH 3/7] apply 2 spaces format for pom.xml

---
 jetty-p2/pom.xml | 96 ++++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index 0fa92adfd537..2a2298f5783a 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -1,50 +1,50 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>org.eclipse.jetty</groupId>
-		<artifactId>jetty-project</artifactId>
-		<version>10.0.7-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>jetty-p2</artifactId>
-	<name>Jetty :: P2</name>
-	<description>Generates a (maven based) P2 Updatesite</description>
-	<packaging>pom</packaging>
-	<properties>
-		<tycho-version>2.4.0</tycho-version>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-repository-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<configuration>
-							<categoryName>Jetty Bundles</categoryName>
-							<includeReactor>true</includeReactor>
-							<includeDependencies>false</includeDependencies>
-						</configuration>
-						<id>maven-p2-site</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>assemble-maven-repository</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- This dependency is to make sure this projects is build after all relevant 
-			artifacts are created -->
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-bom</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-project</artifactId>
+    <version>10.0.7-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jetty-p2</artifactId>
+  <name>Jetty :: P2</name>
+  <description>Generates a (maven based) P2 Updatesite</description>
+  <packaging>pom</packaging>
+  <properties>
+    <tycho-version>2.4.0</tycho-version>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-repository-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <executions>
+          <execution>
+            <configuration>
+              <categoryName>Jetty Bundles</categoryName>
+              <includeReactor>true</includeReactor>
+              <includeDependencies>false</includeDependencies>
+            </configuration>
+            <id>maven-p2-site</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>assemble-maven-repository</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <!-- This dependency is to make sure this projects is build after all relevant
+        artifacts are created -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-bom</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+    </dependency>
+  </dependencies>
 </project>

From 34a38286cdc20faeef35955005130de9e5e6da38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Mon, 16 Aug 2021 15:02:32 +0200
Subject: [PATCH 4/7] use snapshot for now

---
 jetty-p2/pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index 2a2298f5783a..b442330e3708 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -12,8 +12,15 @@
   <description>Generates a (maven based) P2 Updatesite</description>
   <packaging>pom</packaging>
   <properties>
-    <tycho-version>2.4.0</tycho-version>
+    <tycho-version>2.5.0-SNAPSHOT</tycho-version>
   </properties>
+  <pluginRepositories>
+  <!-- TODO just until next release for testing latest changes -->
+    <pluginRepository>
+        <id>tycho-snapshots</id>
+        <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+     </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>

From 243febafa1219eaa6e5c8c1f1f454ebbcd18f2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sun, 22 Aug 2021 18:42:12 +0200
Subject: [PATCH 5/7] Include PGP signatures

---
 jetty-p2/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index b442330e3708..1cfa022d0900 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -33,6 +33,7 @@
               <categoryName>Jetty Bundles</categoryName>
               <includeReactor>true</includeReactor>
               <includeDependencies>false</includeDependencies>
+              <includePGPSignature>true</includePGPSignature>
             </configuration>
             <id>maven-p2-site</id>
             <phase>prepare-package</phase>

From 9dcc2529aebfe11f3d37f9e9d6e657a73f1f4d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Thu, 30 Sep 2021 19:42:36 +0200
Subject: [PATCH 6/7] Update pom.xml

use the new tycho release
---
 jetty-p2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index 1cfa022d0900..678b27f991dc 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -12,7 +12,7 @@
   <description>Generates a (maven based) P2 Updatesite</description>
   <packaging>pom</packaging>
   <properties>
-    <tycho-version>2.5.0-SNAPSHOT</tycho-version>
+    <tycho-version>2.5.0</tycho-version>
   </properties>
   <pluginRepositories>
   <!-- TODO just until next release for testing latest changes -->

From 6f40a4442407b487a13fccd3f00425c5ef5c0aa5 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 1 Oct 2021 12:33:59 +1000
Subject: [PATCH 7/7] remove of tycho snapshot repository

---
 jetty-p2/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/jetty-p2/pom.xml b/jetty-p2/pom.xml
index 678b27f991dc..310933c1bb81 100644
--- a/jetty-p2/pom.xml
+++ b/jetty-p2/pom.xml
@@ -14,13 +14,6 @@
   <properties>
     <tycho-version>2.5.0</tycho-version>
   </properties>
-  <pluginRepositories>
-  <!-- TODO just until next release for testing latest changes -->
-    <pluginRepository>
-        <id>tycho-snapshots</id>
-        <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-     </pluginRepository>
-  </pluginRepositories>
   <build>
     <plugins>
       <plugin>