configure toolchains plugin to require jdk 1.6 while being able to deploy with a newer jdk because of https://issues.apache.org/jira/browse/BUILDS-85. Bump jdk version requirement from 1.5 to 1.6
git-svn-id: https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.4@1689790 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index b3382d2..6ed97d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
modules' OSGi metadata: -->
<ehcache.version>2.5.0</ehcache.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
- <jdk.version>1.5</jdk.version>
+ <jdk.version>1.6</jdk.version>
<jetty.version>6.1.26</jetty.version>
<!-- Don't change this version without also changing the shiro-quartz and shiro-features
modules' OSGi metadata: -->
@@ -369,6 +369,29 @@
<printSummary>true</printSummary>
</configuration>
</plugin>
+ <!-- repository.apache.org doesn't accept connections from jdk 1.6 (https://issues.apache.org/jira/browse/BUILDS-85) so use toolchains
+ to require jdk 1.6 for compiling but deploy using a newer jdk
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.6</version>
+ <vendor>sun</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Allow Groovy tests to run: -->
<plugin>
<groupId>org.codehaus.gmaven</groupId>
