Skip to content

Commit 10a2976

Browse files
committed
[ARCH-2673] use hardware keys
* enable certchain argument for jarsigner * update maven-jarsigner to 3.0.0 * update maven-shared-utils to 0.6
1 parent 12f4a88 commit 10a2976

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>org.codehaus.mojo</groupId>
1212
<artifactId>webstart</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
13+
<version>1.0-beta-7.bravura.8.java7</version>
1414
<packaging>pom</packaging>
1515

1616
<name>MWEBSTART :: Project</name>
@@ -208,7 +208,7 @@
208208
<dependency>
209209
<groupId>org.apache.maven.shared</groupId>
210210
<artifactId>maven-shared-utils</artifactId>
211-
<version>0.5</version>
211+
<version>0.6</version>
212212
</dependency>
213213

214214
<dependency>
@@ -221,7 +221,7 @@
221221
<dependency>
222222
<groupId>org.apache.maven.shared</groupId>
223223
<artifactId>maven-jarsigner</artifactId>
224-
<version>1.3.1</version>
224+
<version>3.0.0</version>
225225
<exclusions>
226226
<exclusion>
227227
<groupId>org.codehaus.plexus</groupId>

webstart-jnlp-servlet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.codehaus.mojo</groupId>
77
<artifactId>webstart</artifactId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.0-beta-7.bravura.8.java7</version>
99
</parent>
1010

1111
<groupId>org.codehaus.mojo</groupId>

webstart-maven-plugin/pom.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.codehaus.mojo</groupId>
77
<artifactId>webstart</artifactId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.0-beta-7.bravura.8.java7</version>
99
</parent>
1010

1111
<groupId>org.codehaus.mojo</groupId>
@@ -76,6 +76,13 @@
7676
<groupId>org.apache.maven.plugin-tools</groupId>
7777
<artifactId>maven-plugin-annotations</artifactId>
7878
</dependency>
79+
<!--
80+
<dependency>
81+
<groupId>org.codehaus.mojo</groupId>
82+
<artifactId>keytool-maven-plugin</artifactId>
83+
<version>1.7</version>
84+
</dependency>
85+
-->
7986

8087
<!-- dependencies to plexus annotations -->
8188
<dependency>

webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/sign/SignConfig.java

+11
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public class SignConfig
6565
*/
6666
private File workingKeystore;
6767

68+
private File certchain;
69+
6870
/**
6971
*/
7072
private String keyalg;
@@ -331,6 +333,7 @@ public JarSignerRequest createSignRequest( File jarToSign, File signedJar )
331333
request.setTsaLocation( getTsaLocation() );
332334
request.setProviderArg( getProviderArg() );
333335
request.setProviderClass( getProviderClass() );
336+
request.setCertchain( getCertchain() );
334337

335338
// Special handling for passwords through the Maven Security Dispatcher
336339
request.setKeypass( decrypt( keypass ) );
@@ -707,6 +710,14 @@ public void setProviderClass(String providerClass) {
707710
this.providerClass = providerClass;
708711
}
709712

713+
public File getCertchain() {
714+
return certchain;
715+
}
716+
717+
public void setCertchain(File certchain) {
718+
this.certchain = certchain;
719+
}
720+
710721
private void appendToDnameBuffer( final String property, StringBuffer buffer, final String prefix )
711722
{
712723
if ( property != null )

0 commit comments

Comments
 (0)