Permalink
Browse files

Update to JDK 1.6

  • Loading branch information...
1 parent e3a5c50 commit 9549db7153993c78fd9c471689425d682a12e2b5 @jodastephen jodastephen committed Jan 30, 2013
Showing with 14 additions and 12 deletions.
  1. +2 −2 .classpath
  2. +7 −8 pom.xml
  3. +4 −1 src/changes/changes.xml
  4. +1 −1 src/site/xdoc/index.xml
View
@@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="var" path="M2_REPO/org/testng/testng/5.8/testng-5.8-jdk15.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.8/testng-6.8.jar"/>
<classpathentry kind="var" path="M2_REPO/org/joda/joda-convert/1.1/joda-convert-1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
15 pom.xml
@@ -87,9 +87,9 @@
<configuration>
<verbose>true</verbose>
<fork>true</fork>
- <compilerVersion>1.5</compilerVersion>
- <source>1.5</source>
- <target>1.5</target>
+ <compilerVersion>1.6</compilerVersion>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -193,15 +193,14 @@
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
+ <version>6.8</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -280,7 +279,7 @@
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>1.6</targetJdk>
</configuration>
</plugin>
<plugin>
@@ -337,7 +336,7 @@
<configuration>
<toolchains>
<jdk>
- <version>1.5</version>
+ <version>1.6</version>
<vendor>sun</vendor>
</jdk>
</toolchains>
View
@@ -8,7 +8,10 @@
<body>
<!-- types are add, fix, remove, update -->
- <release version="0.7" date="2013-01-30" description="Version 0.7.1">
+ <release version="0.8" date="2013-01-30" description="Version 0.8">
+ <action dev="scolebourne" type="update" >
+ Change to requiring JDK 1.6.
+ </action>
<action dev="timmolter" type="add">
Allow a second currency data file to enhance those in the base file [9,13]
</action>
View
@@ -80,7 +80,7 @@ The code is fully tested, but there may yet be bugs and the API may yet change.
There should be no great reason why it cannot be used in production if you can cope with future API change.
</p>
<p>
-There are no runtime dependencies beyond JDK 1.5.<br />
+There are no runtime dependencies beyond JDK 1.6.<br />
Joda-Money does have a <i>compile-time</i> dependency on Joda-Convert, but this is not required at runtime
thanks to the magic of annotations.
</p>

0 comments on commit 9549db7

Please sign in to comment.