From cdd88787b62efcc7eaa8f43650b72c1465090e5e Mon Sep 17 00:00:00 2001
From: starlet-dx <15929766099@163.com>
Date: Tue, 14 Oct 2025 11:35:04 +0800
Subject: [PATCH] Update to 31

---
 jetty-parent-26.pom => jetty-parent-31.pom | 65 +++++++++++++---------
 jetty-parent.spec                          | 13 ++++-
 2 files changed, 49 insertions(+), 29 deletions(-)
 rename jetty-parent-26.pom => jetty-parent-31.pom (90%)

diff --git a/jetty-parent-26.pom b/jetty-parent-31.pom
similarity index 90%
rename from jetty-parent-26.pom
rename to jetty-parent-31.pom
index e7826d5..6265ee9 100644
--- a/jetty-parent-26.pom
+++ b/jetty-parent-31.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>jetty-parent</artifactId>
-  <version>26</version>
+  <version>31</version>
   <packaging>pom</packaging>
   <name>Jetty :: Parent</name>
   <description>The Eclipse Jetty Parent</description>
@@ -117,7 +117,7 @@
   <scm>
     <connection>scm:git:https://github.com/jetty/${jetty.git.repo}.git</connection>
     <developerConnection>scm:git:git@github.com:jetty/${jetty.git.repo}.git</developerConnection>
-    <tag>jetty-parent-26</tag>
+    <tag>jetty-parent-31</tag>
     <url>https://github.com/jetty/${jetty.git.repo}</url>
   </scm>
 
@@ -128,14 +128,12 @@
 
   <distributionManagement>
     <repository>
-      <id>oss.sonatype.org</id>
-      <name>Jetty Staging Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <id>sonatype-cp</id>
+      <url>https://repo.maven.apache.org/maven2</url>
     </repository>
     <snapshotRepository>
-      <id>oss.sonatype.org</id>
-      <name>Jetty Snapshot Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
+      <id>sonatype-cp</id>
+      <url>https://central.sonatype.com/repository/maven-snapshots</url>
     </snapshotRepository>
   </distributionManagement>
 
@@ -147,41 +145,42 @@
     <jetty.url>http://www.eclipse.org/jetty</jetty.url>
     <!-- classpath resource coming from jetty-header-templates artifact -->
     <license.header.resource>jetty-header-epl2.0-apache2.0-template.txt</license.header.resource>
-    <maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
-    <maven.clean.plugin.version>3.3.2</maven.clean.plugin.version>
-    <maven.compiler.plugin.version>3.12.0</maven.compiler.plugin.version>
+    <maven.assembly.plugin.version>3.7.1</maven.assembly.plugin.version>
+    <maven.clean.plugin.version>3.5.0</maven.clean.plugin.version>
+    <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
     <maven.compiler.source>${jdk.version.minimum}</maven.compiler.source>
     <maven.compiler.target>${jdk.version.minimum}</maven.compiler.target>
-    <maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
+    <maven.dependency.plugin.version>3.8.1</maven.dependency.plugin.version>
     <maven.deploy.plugin.retryFailedDeploymentCount>10</maven.deploy.plugin.retryFailedDeploymentCount>
-    <maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
-    <maven.enforcer.plugin.version>3.4.1</maven.enforcer.plugin.version>
-    <maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
-    <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
-    <maven.invoker.plugin.version>3.6.0</maven.invoker.plugin.version>
-    <maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
-    <maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
-    <maven.license.plugin.version>4.3</maven.license.plugin.version>
+    <maven.deploy.plugin.version>3.1.4</maven.deploy.plugin.version>
+    <maven.enforcer.plugin.version>3.6.0</maven.enforcer.plugin.version>
+    <maven.gpg.plugin.version>3.2.8</maven.gpg.plugin.version>
+    <maven.install.plugin.version>3.1.4</maven.install.plugin.version>
+    <maven.invoker.plugin.version>3.9.1</maven.invoker.plugin.version>
+    <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
+    <maven.javadoc.plugin.version>3.11.2</maven.javadoc.plugin.version>
+    <maven.license.plugin.version>5.0.0</maven.license.plugin.version>
     <maven.release.plugin.arguments />
     <maven.release.plugin.goals>deploy</maven.release.plugin.goals>
     <maven.release.plugin.preparationGoals>clean install</maven.release.plugin.preparationGoals>
-    <maven.release.plugin.version>3.0.1</maven.release.plugin.version>
-    <maven.remote.resources.plugin.version>3.1.0</maven.remote.resources.plugin.version>
+    <maven.release.plugin.version>3.1.1</maven.release.plugin.version>
+    <maven.remote.resources.plugin.version>3.3.0</maven.remote.resources.plugin.version>
     <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
-    <maven.shade.plugin.version>3.5.1</maven.shade.plugin.version>
-    <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
-    <maven.spotless.plugin.version>2.41.1</maven.spotless.plugin.version>
+    <maven.shade.plugin.version>3.6.0</maven.shade.plugin.version>
+    <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
+    <maven.spotless.plugin.version>2.45.0</maven.spotless.plugin.version>
     <maven.surefire.argLine />
-    <maven.surefire.plugin.version>3.2.3</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>3.5.3</maven.surefire.plugin.version>
     <maven.version.minimum>3.9</maven.version.minimum>
     <mavenPluginToolsVersion>3.5.2</mavenPluginToolsVersion>
     <mavenVersion>3.5.0</mavenVersion>
+    <njord.autoPublish>true</njord.autoPublish>
+    <njord.version>0.8.2</njord.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <surefire.timeout>3600</surefire.timeout>
   </properties>
 
   <build>
-
     <pluginManagement>
       <plugins>
         <plugin>
@@ -189,6 +188,11 @@
           <artifactId>spotless-maven-plugin</artifactId>
           <version>${maven.spotless.plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>eu.maveniverse.maven.plugins</groupId>
+          <artifactId>njord</artifactId>
+          <version>${njord.version}</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
@@ -424,6 +428,13 @@
         </executions>
       </plugin>
     </plugins>
+    <extensions>
+      <extension>
+        <groupId>eu.maveniverse.maven.njord</groupId>
+        <artifactId>extension3</artifactId>
+        <version>${njord.version}</version>
+      </extension>
+    </extensions>
   </build>
 
   <profiles>
diff --git a/jetty-parent.spec b/jetty-parent.spec
index 744b2e9..2fb4ffe 100644
--- a/jetty-parent.spec
+++ b/jetty-parent.spec
@@ -1,14 +1,15 @@
 Name:                jetty-parent
-Version:             26
+Version:             31
 Release:             1
 Summary:             Jetty parent POM file
-License:             ASL 2.0 or EPL-1.0
+License:             Apache-2.0 OR EPL-1.0
 URL:                 https://www.eclipse.org/jetty/
 Source0:             https://repo1.maven.org/maven2/org/eclipse/jetty/%{name}/%{version}/%{name}-%{version}.pom
 Source2:             https://www.eclipse.org/legal/epl-v10.html
 Source3:             https://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:           noarch
 BuildRequires:       maven-local
+BuildRequires:       xmlstarlet
 %description
 Jetty parent POM file
 
@@ -21,6 +22,11 @@ cp -p %{SOURCE2} %{SOURCE3} .
 %pom_remove_plugin :license-maven-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 
+xmlstarlet ed --inplace \
+  -N p=http://maven.apache.org/POM/4.0.0 \
+  -d "//p:build/p:extensions/p:extension[p:groupId='eu.maveniverse.maven.njord'][p:artifactId='extension3']" \
+  pom.xml
+
 %build
 %mvn_build
 
@@ -31,6 +37,9 @@ cp -p %{SOURCE2} %{SOURCE3} .
 %doc epl-v10.html LICENSE-2.0.txt
 
 %changelog
+* Tue Oct 14 2025 yaoxin <1024769339@qq.com> - 31-1
+- Update to 31
+
 * Thu Jun 06 2024 yaoxin <yao_xin001@hoperun.com> - 26-1
 - Upgrade to 26
 
-- 
Gitee