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 2015/03/12 03:32:32 UTC
svn commit: r1666068 - in /shiro/branches/2.0-api-design-changes:
core/pom.xml pom.xml samples/spring-client/pom.xml
Author: bdemers
Date: Thu Mar 12 02:32:32 2015
New Revision: 1666068
URL: http://svn.apache.org/r1666068
Log:
Minor pom cleanup
* re-enable the shirk-core tests jar as it was needed by another module
* allow building with JDK 1.8
Modified:
shiro/branches/2.0-api-design-changes/core/pom.xml
shiro/branches/2.0-api-design-changes/pom.xml
shiro/branches/2.0-api-design-changes/samples/spring-client/pom.xml
Modified: shiro/branches/2.0-api-design-changes/core/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/core/pom.xml?rev=1666068&r1=1666067&r2=1666068&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/core/pom.xml (original)
+++ shiro/branches/2.0-api-design-changes/core/pom.xml Thu Mar 12 02:32:32 2015
@@ -34,7 +34,7 @@
<build>
<plugins>
<!-- collect the test classes so they can be referenced by other modules -->
- <!-- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -44,7 +44,7 @@
</goals>
</execution>
</executions>
- </plugin> -->
+ </plugin>
<!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Modified: shiro/branches/2.0-api-design-changes/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/pom.xml?rev=1666068&r1=1666067&r2=1666068&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/pom.xml (original)
+++ shiro/branches/2.0-api-design-changes/pom.xml Thu Mar 12 02:32:32 2015
@@ -179,8 +179,7 @@
<name>Brian Demers</name>
<email>bdemers@apache.org</email>
<url>http://about.me/brian.demers</url>
- <organization>Sonatype</organization>
- <organizationUrl>http://www.sonatype.com/</organizationUrl>
+ <organization>Apache Software Foundation</organization>
<timezone>-5</timezone>
</developer>
<developer>
Modified: shiro/branches/2.0-api-design-changes/samples/spring-client/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/2.0-api-design-changes/samples/spring-client/pom.xml?rev=1666068&r1=1666067&r2=1666068&view=diff
==============================================================================
--- shiro/branches/2.0-api-design-changes/samples/spring-client/pom.xml (original)
+++ shiro/branches/2.0-api-design-changes/samples/spring-client/pom.xml Thu Mar 12 02:32:32 2015
@@ -90,7 +90,22 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
+ <version>1.0-beta-6</version>
+ <dependencies>
+ <!-- The following two dependencies are needed when building with JDK 1.8
+ This has been fixed in 1.0-beta-7 (which is not released yet) -->
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>webstart-pack200-impl</artifactId>
+ <version>1.0-beta-6</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>keytool-api-1.7</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>package</phase>
@@ -111,13 +126,15 @@
</jnlp>
<sign>
- <keystore>jsecurity-sample.jks</keystore>
+ <keystore>${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>