From c3e8e8d3952a8e33e8d0899fb36e01a7e8c32c75 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Fri, 8 Jan 2021 15:32:21 +1100
Subject: [PATCH] Rename jar to jetty-keystore, remove main from
 KeystoreGenerator.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-home/pom.xml                                          | 2 +-
 {jetty-test-keystore => jetty-keystore}/pom.xml             | 2 +-
 .../src/main/config/etc/jetty-test-keystore.xml             | 0
 .../src/main/config/modules/test-keystore.mod               | 2 +-
 .../java/org/eclipse/jetty/keystore/KeystoreGenerator.java  | 6 +-----
 pom.xml                                                     | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)
 rename {jetty-test-keystore => jetty-keystore}/pom.xml (96%)
 rename {jetty-test-keystore => jetty-keystore}/src/main/config/etc/jetty-test-keystore.xml (100%)
 rename {jetty-test-keystore => jetty-keystore}/src/main/config/modules/test-keystore.mod (95%)
 rename {jetty-test-keystore => jetty-keystore}/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java (96%)

diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index f67979b46a2..4a59619a88a 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -778,7 +778,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-test-keystore</artifactId>
+      <artifactId>jetty-keystore</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
diff --git a/jetty-test-keystore/pom.xml b/jetty-keystore/pom.xml
similarity index 96%
rename from jetty-test-keystore/pom.xml
rename to jetty-keystore/pom.xml
index 42a82b8621c..4e3ed8adec4 100644
--- a/jetty-test-keystore/pom.xml
+++ b/jetty-keystore/pom.xml
@@ -6,7 +6,7 @@
     <version>10.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>jetty-test-keystore</artifactId>
+  <artifactId>jetty-keystore</artifactId>
   <packaging>jar</packaging>
   <name>Jetty :: Test Keystore</name>
   <description>Test keystore with self-signed SSL Certificate.</description>
diff --git a/jetty-test-keystore/src/main/config/etc/jetty-test-keystore.xml b/jetty-keystore/src/main/config/etc/jetty-test-keystore.xml
similarity index 100%
rename from jetty-test-keystore/src/main/config/etc/jetty-test-keystore.xml
rename to jetty-keystore/src/main/config/etc/jetty-test-keystore.xml
diff --git a/jetty-test-keystore/src/main/config/modules/test-keystore.mod b/jetty-keystore/src/main/config/modules/test-keystore.mod
similarity index 95%
rename from jetty-test-keystore/src/main/config/modules/test-keystore.mod
rename to jetty-keystore/src/main/config/modules/test-keystore.mod
index 2369688efd7..82765ab4d32 100644
--- a/jetty-test-keystore/src/main/config/modules/test-keystore.mod
+++ b/jetty-keystore/src/main/config/modules/test-keystore.mod
@@ -14,7 +14,7 @@ maven://org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}|lib/bouncycastle
 maven://org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}|lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar
 
 [lib]
-lib/jetty-test-keystore-${jetty.version}.jar
+lib/jetty-keystore-${jetty.version}.jar
 lib/bouncycastle/bcpkix-jdk15on-${bouncycastle.version}.jar
 lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar
 
diff --git a/jetty-test-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java b/jetty-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java
similarity index 96%
rename from jetty-test-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java
rename to jetty-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java
index af04fb04822..791c659d67b 100644
--- a/jetty-test-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java
+++ b/jetty-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java
@@ -38,11 +38,7 @@ import org.eclipse.jetty.util.security.Password;
 
 public class KeystoreGenerator
 {
-    public static void main(String[] args) throws Exception
-    {
-        generateTestKeystore("test-keystore.p12", "storepwd");
-    }
-
+    @SuppressWarnings("unused")
     public static File generateTestKeystore(String location, String password) throws Exception
     {
         // Generate an RSA key pair.
diff --git a/pom.xml b/pom.xml
index d7b2205d03c..59b3b1cb844 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
     <module>jetty-home</module>
     <module>jetty-bom</module>
     <module>jetty-documentation</module>
-    <module>jetty-test-keystore</module>
+    <module>jetty-keystore</module>
   </modules>
 
   <build>