Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename jar to jetty-keystore, remove main from KeystoreGenerator. 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2021-01-08 15:32:21 +11:00
parent a99f8196bc
commit c3e8e8d395
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/pom.xml
View File

@ -778,7 +778,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-test-keystore</artifactId> <artifactId>jetty-keystore</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
jetty-test-keystore/pom.xml → jetty-keystore/pom.xml
View File

@ -6,7 +6,7 @@
<version>10.0.1-SNAPSHOT</version> <version>10.0.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>jetty-test-keystore</artifactId> <artifactId>jetty-keystore</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Jetty :: Test Keystore</name> <name>Jetty :: Test Keystore</name>
<description>Test keystore with self-signed SSL Certificate.</description> <description>Test keystore with self-signed SSL Certificate.</description>

0
jetty-test-keystore/src/main/config/etc/jetty-test-keystore.xml → jetty-keystore/src/main/config/etc/jetty-test-keystore.xml
View File

2
jetty-test-keystore/src/main/config/modules/test-keystore.mod → jetty-keystore/src/main/config/modules/test-keystore.mod
View File

@ -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 maven://org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}|lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar
[lib] [lib]
lib/jetty-test-keystore-${jetty.version}.jar lib/jetty-keystore-${jetty.version}.jar
lib/bouncycastle/bcpkix-jdk15on-${bouncycastle.version}.jar lib/bouncycastle/bcpkix-jdk15on-${bouncycastle.version}.jar
lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar lib/bouncycastle/bcprov-jdk15on-${bouncycastle.version}.jar

6
jetty-test-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java → jetty-keystore/src/main/java/org/eclipse/jetty/keystore/KeystoreGenerator.java
View File

@ -38,11 +38,7 @@ import org.eclipse.jetty.util.security.Password;
public class KeystoreGenerator public class KeystoreGenerator
{ {
public static void main(String[] args) throws Exception @SuppressWarnings("unused")
{
generateTestKeystore("test-keystore.p12", "storepwd");
}
public static File generateTestKeystore(String location, String password) throws Exception public static File generateTestKeystore(String location, String password) throws Exception
{ {
// Generate an RSA key pair. // Generate an RSA key pair.

2
pom.xml
View File

@ -147,7 +147,7 @@
<module>jetty-home</module> <module>jetty-home</module>
<module>jetty-bom</module> <module>jetty-bom</module>
<module>jetty-documentation</module> <module>jetty-documentation</module>
<module>jetty-test-keystore</module> <module>jetty-keystore</module>
</modules> </modules>
<build> <build>