Update the webstart-maven-plugin to the latest release

This requires some changes to the configuration:
* <pack200> moved to <pack200><enabled>
* the keystore path is (now?) relative to the project directory
* the keytool dependencies seem to be missing

This looks partially like issues in the webstart plugin, which
unfortunately is in the codehaus->github migration bubble.

With this change shiro builds with both the toolchain configuration
and JAVA_HOME (due to the webstart plugin ignoring toolchains, presumably)
pointing to a Java 7 JDK.

This makes it possible to compile shiro with Java 8 and up.


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/c4c3c27f
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/c4c3c27f
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/c4c3c27f

Branch: refs/heads/1.2.x
Commit: c4c3c27f83ab0df24816e731910355238460a8f5
Parents: 9696650
Author: Andreas Kohn <[email protected]>
Authored: Thu Jul 30 16:26:48 2015 +0200
Committer: bdemers <[email protected]>
Committed: Wed Apr 13 11:06:33 2016 -0400

----------------------------------------------------------------------
 samples/spring-client/pom.xml | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/c4c3c27f/samples/spring-client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml
index 1d5f9c6..08edad5 100644
--- a/samples/spring-client/pom.xml
+++ b/samples/spring-client/pom.xml
@@ -35,6 +35,7 @@
 
     <properties>
         <shiro.session.id>${sessionId}</shiro.session.id>
+        <keytoolVersion>1.5</keytoolVersion>
     </properties>
 
     <dependencies>
@@ -90,7 +91,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>webstart-maven-plugin</artifactId>
-                <version>1.0-beta-3</version>
+                <version>1.0-beta-7</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -111,16 +112,40 @@
                     </jnlp>
 
                     <sign>
-                        <keystore>jsecurity-sample.jks</keystore>
+                        
<keystore>${project.build.directory}/jnlp/jsecurity-sample.jks</keystore>
                         <storepass>jsecurity</storepass>
                         <alias>jsecurity</alias>
                         <verify>false</verify>
                     </sign>
                     <!-- BUILDING PROCESS -->
-                    <pack200>true</pack200>
+                    <pack200>
+                        <enabled>true</enabled>
+                    </pack200>
                     <verbose>false</verbose>
 
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>keytool-api</artifactId>
+                        <version>${keytoolVersion}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>keytool-api-1.5</artifactId>
+                        <version>${keytoolVersion}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>keytool-api-1.6</artifactId>
+                        <version>${keytoolVersion}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>keytool-api-1.7</artifactId>
+                        <version>${keytoolVersion}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

Reply via email to