You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/04/13 17:21:44 UTC
[5/5] shiro git commit: Update the webstart-maven-plugin to the
latest release
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.
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/1460419c
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/1460419c
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/1460419c
Branch: refs/heads/master
Commit: 1460419cc7e4eacbcef7ccc17c75e74d058b73c1
Parents: 5b603d1
Author: Andreas Kohn <an...@gmail.com>
Authored: Thu Jul 30 16:26:48 2015 +0200
Committer: bdemers <bd...@apache.org>
Committed: Wed Apr 13 10:46:17 2016 -0400
----------------------------------------------------------------------
samples/spring-client/pom.xml | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/1460419c/samples/spring-client/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml
index 2d1532e..19660fd 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>
@@ -111,7 +112,7 @@
</jnlp>
<sign>
- <keystore>${project.basedir}/src/main/jnlp/resources/jsecurity-sample.jks</keystore>
+ <keystore>${project.build.directory}/jnlp/jsecurity-sample.jks</keystore>
<storepass>jsecurity</storepass>
<alias>jsecurity</alias>
<verify>false</verify>
@@ -123,6 +124,28 @@
<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>