From c01ed296176b6cabfcf0f6a92c5e6f13f21306f2 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 6 Nov 2023 16:17:15 +1000
Subject: [PATCH 1/3] use new toolchain parent

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 header-template.txt |  10 ---
 pom.xml             | 197 ++++++++++++++++----------------------------
 2 files changed, 73 insertions(+), 134 deletions(-)
 delete mode 100644 header-template.txt

diff --git a/header-template.txt b/header-template.txt
deleted file mode 100644
index 6213a95..0000000
--- a/header-template.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-========================================================================
-Copyright (c) ${project.inceptionYear} Mort Bay Consulting Pty Ltd and others.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v. 2.0 which is available at
-https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
-which is available at https://www.apache.org/licenses/LICENSE-2.0.
-
-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
-========================================================================
diff --git a/pom.xml b/pom.xml
index a24deff..a4ad101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,45 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.jetty.toolchain</groupId>
     <artifactId>jetty-toolchain</artifactId>
-    <version>1.7</version>
+    <version>1.8-parent-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.toolchain.setuid</groupId>
   <artifactId>jetty-setuid-jna</artifactId>
   <version>2.0.3-SNAPSHOT</version>
-  <name>Jetty :: SetUID JNA</name>
   <packaging>jar</packaging>
+  <name>Jetty :: SetUID JNA</name>
+  <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
+    <connection>scm:git:https://github.com/jetty/${jetty.git.repo}.git</connection>
+    <developerConnection>scm:git:git@github.com:eclipse/${jetty.git.repo}.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://github.com/jetty/${jetty.git.repo}</url>
+  </scm>
   <properties>
-    <compiler.source>17</compiler.source>
-    <compiler.target>17</compiler.target>
-    <compiler.release>17</compiler.release>
+    <jdk.version.minimum>17</jdk.version.minimum>
+    <jetty-test-helper.version>6.2</jetty-test-helper.version>
+    <jetty.git.repo>jetty.setuid</jetty.git.repo>
     <jetty.version>12.0.2</jetty.version>
     <jna.version>5.13.0</jna.version>
-    <jetty-test-helper.version>6.2</jetty-test-helper.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-  <licenses>
-    <license>
-      <name>Eclipse Public License - Version 2.0</name>
-      <url>https://www.eclipse.org/legal/epl-2.0/</url>
-    </license>
-    <license>
-      <name>Apache Software License - Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
+
   <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
       <version>${jna.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -52,67 +49,80 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>jetty.snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/jetty-snapshots</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>jetty.snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/jetty-snapshots</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <compilerArgument>-Xlint:all</compilerArgument>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
-        <configuration>
-          <source>${compiler.source}</source>
-          <target>${compiler.target}</target>
-          <release>${compiler.release}</release>
-          <showWarnings>true</showWarnings>
-          <compilerArgument>-Xlint:all</compilerArgument>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <useReleaseProfile>true</useReleaseProfile>
-          <releaseProfiles>eclipse-release</releaseProfiles>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.4.1</version>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-assembly-descriptors</artifactId>
+            <version>1.1</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
-            <id>enforce-build-env</id>
+            <id>assemble-config</id>
             <goals>
-              <goal>enforce</goal>
+              <goal>single</goal>
             </goals>
-            <phase>validate</phase>
+            <phase>package</phase>
             <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.8.4,)</version>
-                  <message>[ERROR] OLD MAVEN [${maven.version}] in use, Jetty ${project.version} requires Maven 3.8.4 or newer</message>
-                </requireMavenVersion>
-                <requireJavaVersion>
-                  <version>[17,)</version>
-                  <message>[ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 17 or newer</message>
-                </requireJavaVersion>
-                <requireUpperBoundDeps />
-              </rules>
+              <descriptors>
+                <descriptor>src/main/assembly/config.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-	      <artifactId>maven-resources-plugin</artifactId>
-  	    <version>3.3.1</version>
+        <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
             <id>copy-resources</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
+            <phase>process-resources</phase>
             <configuration>
               <encoding>UTF-8</encoding>
               <useDefaultDelimiters>false</useDefaultDelimiters>
@@ -130,68 +140,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.mycila</groupId>
-        <artifactId>license-maven-plugin</artifactId>
-        <version>4.3</version>
-        <configuration>
-          <licenseSets>
-            <licenseSet>
-              <header>header-template.txt</header>
-              <includes>
-                <include>**/*.java</include>
-              </includes>
-            </licenseSet>
-          </licenseSets>
-          <failIfMissing>true</failIfMissing>
-          <aggregate>true</aggregate>
-          <strictCheck>true</strictCheck>
-          <mapping>
-            <java>DOUBLESLASH_STYLE</java>
-          </mapping>
-        </configuration>
-        <executions>
-          <execution>
-            <id>check-headers</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.6.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-assembly-descriptors</artifactId>
-            <version>1.1</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>assemble-config</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
-  <scm>
-    <connection>scm:git:https://github.com/jetty/jetty.setuid.git</connection>
-    <developerConnection>scm:git:git@github.com:jetty/jetty.setuid.git</developerConnection>
-    <url>https://github.com/jetty/jetty.setuid/tree/master</url>
-    <tag>HEAD</tag>
-  </scm>
+
 </project>

From f58be69b9c2b86223bb35aec95064f7032f71f0c Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 7 Nov 2023 13:31:26 +1000
Subject: [PATCH 2/3] remove useless attributes

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4ad101..b3493d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <version>2.0.3-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Jetty :: SetUID JNA</name>
-  <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
+  <scm>
     <connection>scm:git:https://github.com/jetty/${jetty.git.repo}.git</connection>
     <developerConnection>scm:git:git@github.com:eclipse/${jetty.git.repo}.git</developerConnection>
     <tag>HEAD</tag>

From 59b7ae5cec782b39501c6cc5fbaa697dcb54e7f5 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 7 Nov 2023 14:15:43 +1000
Subject: [PATCH 3/3] fix org name

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b3493d1..7bfb0ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
   <name>Jetty :: SetUID JNA</name>
   <scm>
     <connection>scm:git:https://github.com/jetty/${jetty.git.repo}.git</connection>
-    <developerConnection>scm:git:git@github.com:eclipse/${jetty.git.repo}.git</developerConnection>
+    <developerConnection>scm:git:git@github.com:jetty/${jetty.git.repo}.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://github.com/jetty/${jetty.git.repo}</url>
   </scm>