From e31360dd7f1e50e74240488fb505ee80f3e25235 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Date: Tue, 27 Aug 2024 14:39:47 +1000
Subject: [PATCH] rename jetty-test-util to jetty-test-common

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
---
 jetty-ee8/jetty-ee8-openid/pom.xml                              | 2 +-
 jetty-ee9/jetty-ee9-openid/pom.xml                              | 2 +-
 jetty-integrations/jetty-openid/pom.xml                         | 2 +-
 pom.xml                                                         | 2 +-
 tests/{jetty-test-util => jetty-test-common}/pom.xml            | 2 +-
 .../src/main/java/org/eclipse/jetty/tests/JwtEncoder.java       | 0
 .../src/main/java/org/eclipse/jetty/tests/OpenIdProvider.java   | 0
 tests/pom.xml                                                   | 2 +-
 tests/test-distribution/test-ee10-distribution/pom.xml          | 2 +-
 tests/test-distribution/test-ee11-distribution/pom.xml          | 2 +-
 tests/test-distribution/test-ee9-distribution/pom.xml           | 2 +-
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/{jetty-test-util => jetty-test-common}/pom.xml (95%)
 rename tests/{jetty-test-util => jetty-test-common}/src/main/java/org/eclipse/jetty/tests/JwtEncoder.java (100%)
 rename tests/{jetty-test-util => jetty-test-common}/src/main/java/org/eclipse/jetty/tests/OpenIdProvider.java (100%)

diff --git a/jetty-ee8/jetty-ee8-openid/pom.xml b/jetty-ee8/jetty-ee8-openid/pom.xml
index 9474870eb21..c6af6f29179 100644
--- a/jetty-ee8/jetty-ee8-openid/pom.xml
+++ b/jetty-ee8/jetty-ee8-openid/pom.xml
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>jetty-test-util</artifactId>
+      <artifactId>jetty-test-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jetty-ee9/jetty-ee9-openid/pom.xml b/jetty-ee9/jetty-ee9-openid/pom.xml
index 8c92210726b..3dd45710155 100644
--- a/jetty-ee9/jetty-ee9-openid/pom.xml
+++ b/jetty-ee9/jetty-ee9-openid/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>jetty-test-util</artifactId>
+      <artifactId>jetty-test-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jetty-integrations/jetty-openid/pom.xml b/jetty-integrations/jetty-openid/pom.xml
index f67543aa805..ffcf4750e3a 100644
--- a/jetty-integrations/jetty-openid/pom.xml
+++ b/jetty-integrations/jetty-openid/pom.xml
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>jetty-test-util</artifactId>
+      <artifactId>jetty-test-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 68311850742..5a386d0f036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1062,7 +1062,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.tests</groupId>
-        <artifactId>jetty-test-util</artifactId>
+        <artifactId>jetty-test-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
diff --git a/tests/jetty-test-util/pom.xml b/tests/jetty-test-common/pom.xml
similarity index 95%
rename from tests/jetty-test-util/pom.xml
rename to tests/jetty-test-common/pom.xml
index cab19941710..d820ada4c30 100644
--- a/tests/jetty-test-util/pom.xml
+++ b/tests/jetty-test-common/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>12.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>jetty-test-util</artifactId>
+  <artifactId>jetty-test-common</artifactId>
   <packaging>jar</packaging>
   <name>Tests :: Test Utilities</name>
 
diff --git a/tests/jetty-test-util/src/main/java/org/eclipse/jetty/tests/JwtEncoder.java b/tests/jetty-test-common/src/main/java/org/eclipse/jetty/tests/JwtEncoder.java
similarity index 100%
rename from tests/jetty-test-util/src/main/java/org/eclipse/jetty/tests/JwtEncoder.java
rename to tests/jetty-test-common/src/main/java/org/eclipse/jetty/tests/JwtEncoder.java
diff --git a/tests/jetty-test-util/src/main/java/org/eclipse/jetty/tests/OpenIdProvider.java b/tests/jetty-test-common/src/main/java/org/eclipse/jetty/tests/OpenIdProvider.java
similarity index 100%
rename from tests/jetty-test-util/src/main/java/org/eclipse/jetty/tests/OpenIdProvider.java
rename to tests/jetty-test-common/src/main/java/org/eclipse/jetty/tests/OpenIdProvider.java
diff --git a/tests/pom.xml b/tests/pom.xml
index b916216f008..022baf529be 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -15,7 +15,7 @@
     <module>jetty-jmh</module>
     <module>jetty-test-multipart</module>
     <module>jetty-test-session-common</module>
-    <module>jetty-test-util</module>
+    <module>jetty-test-common</module>
     <module>test-cross-context-dispatch</module>
     <module>test-distribution</module>
     <module>test-integration</module>
diff --git a/tests/test-distribution/test-ee10-distribution/pom.xml b/tests/test-distribution/test-ee10-distribution/pom.xml
index 37669d365f2..11f3cedaf70 100644
--- a/tests/test-distribution/test-ee10-distribution/pom.xml
+++ b/tests/test-distribution/test-ee10-distribution/pom.xml
@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>jetty-test-util</artifactId>
+      <artifactId>jetty-test-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/tests/test-distribution/test-ee11-distribution/pom.xml b/tests/test-distribution/test-ee11-distribution/pom.xml
index a00a3c20bf3..1b91c48eab8 100644
--- a/tests/test-distribution/test-ee11-distribution/pom.xml
+++ b/tests/test-distribution/test-ee11-distribution/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>jetty-test-util</artifactId>
+      <artifactId>jetty-test-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/tests/test-distribution/test-ee9-distribution/pom.xml b/tests/test-distribution/test-ee9-distribution/pom.xml
index 94a6acb2b33..15ac6a3ce38 100644
--- a/tests/test-distribution/test-ee9-distribution/pom.xml
+++ b/tests/test-distribution/test-ee9-distribution/pom.xml
@@ -58,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
-      <artifactId>jetty-test-util</artifactId>
+      <artifactId>jetty-test-common</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>