Author: niallp
Date: Wed Feb 6 10:59:49 2008
New Revision: 619102
URL: http://svn.apache.org/viewvc?rev=619102&view=rev
Log:
Switch to JDK 1.5, remove JDK 1.3 logic from ant build
Modified:
commons/proper/io/trunk/build.xml
commons/proper/io/trunk/pom.xml
commons/proper/io/trunk/project.properties
commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/PackageTestSuite.java
commons/proper/io/trunk/src/test/org/apache/commons/io/input/PackageTestSuite.java
commons/proper/io/trunk/src/test/org/apache/commons/io/output/PackageTestSuite.java
Modified: commons/proper/io/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/build.xml?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
--- commons/proper/io/trunk/build.xml (original)
+++ commons/proper/io/trunk/build.xml Wed Feb 6 10:59:49 2008
@@ -142,28 +142,7 @@
<!-- ========== Compile Targets =========================================== -->
- <target name="compile" depends="init" description="Compile dependant on JDK
version">
- <condition property="is.jdk13">
- <equals arg1="${ant.java.version}" arg2="1.3" />
- </condition>
- <condition property="not.jdk13">
- <not><equals arg1="${ant.java.version}" arg2="1.3" /></not>
- </condition>
- <antcall target="compile.jdk13" />
- <antcall target="compile.all" />
- </target>
-
- <!-- Compile all classes -->
- <target name="compile.all" unless="is.jdk13"
- description="Compile ALL classes">
- <echo message="*** Compiling all classes ***" />
-
- <!-- check JDK 1.4 -->
- <fail message="switch to JDK 1.4+">
- <condition>
- <equals arg1="${ant.java.version}" arg2="1.3" />
- </condition>
- </fail>
+ <target name="compile" depends="init" description="Compile">
<javac srcdir="${source.home}"
destdir="${build.home}/classes"
@@ -176,50 +155,10 @@
</javac>
</target>
- <!-- Compile excluding JDK 1.4 classes -->
- <target name="compile.jdk13" unless="not.jdk13"
- description="Compile ONLY JDK 1.3 compatible classes ">
- <echo message="*** Compiling ONLY JDK 1.3 compatible classes ***" />
-
- <!-- check JDK 1.3 -->
- <fail message="switch to JDK 1.3">
- <condition>
- <not><equals arg1="${ant.java.version}" arg2="1.3" /></not>
- </condition>
- </fail>
- <javac srcdir="${source.home}"
- destdir="${build.home}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- <include name="**/*.java"/>
- <exclude name="**/CharSequenceReader.java"/>
- <exclude name="**/IOExceptionWithCause.java"/>
- <exclude name="**/RegexFileFilter.java"/>
- <exclude name="**/FileWriterWithEncoding.java"/>
- </javac>
- </target>
-
<!-- ========== Unit Test Targets ========================================= -->
<target name="compile.tests" depends="compile, download-dependencies"
description="Compile unit test cases dependant on JDK version">
- <antcall target="compile.tests.jdk13" />
- <antcall target="compile.tests.all" />
- </target>
-
- <!-- Compile all classes -->
- <target name="compile.tests.all" unless="is.jdk13"
- description="Compile ALL test classes">
- <echo message="*** Compiling all test classes ***" />
-
- <!-- check JDK 1.4 -->
- <fail message="switch to JDK 1.4+">
- <condition>
- <equals arg1="${ant.java.version}" arg2="1.3" />
- </condition>
- </fail>
<javac srcdir="${test.home}"
destdir="${build.home}/test-classes"
@@ -230,65 +169,13 @@
</javac>
</target>
- <!-- Compile excluding JDK 1.4 classes -->
- <target name="compile.tests.jdk13" unless="not.jdk13"
- description="Compile ONLY JDK 1.3 compatible test classes ">
- <echo message="*** Compiling ONLY JDK 1.3 compatible test classes ***" />
-
- <fail message="switch to JDK 1.3">
- <condition>
- <not><equals arg1="${ant.java.version}" arg2="1.3" /></not>
- </condition>
- </fail>
- <javac srcdir="${test.home}"
- destdir="${build.home}/test-classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- <include name="**/*.java"/>
- <exclude name="**/RegexFileFilterTestCase.java"/>
- <exclude name="**/FileWriterWithEncodingTest.java"/>
- <exclude name="**/IOExceptionWithCauseTestCase.java"/>
- <exclude name="**/CharSequenceReaderTest.java"/>
- </javac>
- </target>
-
<target name="test" depends="compile.tests"
description="Run all unit test cases">
- <antcall target="run.tests.jdk13" />
- <antcall target="run.tests.jdk14" />
- </target>
-
- <target name="run.tests.jdk13"
- description="Run ONLY JDK 1.3 compatible test classes ">
-
- <echo message="**** Running JDK 1.3 compatible test classes ****"/>
-
<antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.PackageTestSuite"/></antcall>
<antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.comparator.PackageTestSuite"/></antcall>
<antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.filefilter.PackageTestSuite"/></antcall>
<antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.input.PackageTestSuite"/></antcall>
<antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.output.PackageTestSuite"/></antcall>
-
- </target>
-
- <target name="run.tests.jdk14" unless="is.jdk13"
- description="Run ONLY tests requiring JDK 1.4">
-
- <echo message="**** Running tests requiring JDK 1.4 ****"/>
-
- <!-- check JDK 1.4 -->
- <fail message="switch to JDK 1.4+">
- <condition>
- <equals arg1="${ant.java.version}" arg2="1.3" />
- </condition>
- </fail>
-
- <antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.IOExceptionWithCauseTestCase"/></antcall>
- <antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.filefilter.RegexFileFilterTestCase"/></antcall>
- <antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.input.CharSequenceReaderTest"/></antcall>
- <antcall target="exec.test"><param name="testclass"
value="org.apache.commons.io.output.FileWriterWithEncodingTest"/></antcall>
</target>
Modified: commons/proper/io/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/pom.xml?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
--- commons/proper/io/trunk/pom.xml (original)
+++ commons/proper/io/trunk/pom.xml Wed Feb 6 10:59:49 2008
@@ -207,6 +207,11 @@
</dependency>
</dependencies>
+ <properties>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
+ </properties>
+
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
@@ -313,17 +318,6 @@
<configuration>
<configLocation>checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <source>1.4</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
- </links>
</configuration>
</plugin>
<plugin>
Modified: commons/proper/io/trunk/project.properties
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/project.properties?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
--- commons/proper/io/trunk/project.properties (original)
+++ commons/proper/io/trunk/project.properties Wed Feb 6 10:59:49 2008
@@ -59,9 +59,9 @@
# In particular, if you use JDK 1.4+ the generated classes will not be usable
# for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1
# (which is the default value for JDK 1.1 to 1.3).
-maven.compile.target = 1.3
+maven.compile.target = 1.5
# Specifies the source version for the Java compiler.
# Corresponds to the source attribute for the ant javac task.
# Valid values are 1.3, 1.4, 1.5.
-maven.compile.source = 1.3
+maven.compile.source = 1.5
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
Wed Feb 6 10:59:49 2008
@@ -51,6 +51,7 @@
suite.addTest(new TestSuite(FileUtilsTestCase.class));
suite.addTest(new TestSuite(HexDumpTest.class));
suite.addTest(new TestSuite(IOCaseTestCase.class));
+ suite.addTest(new TestSuite(IOExceptionWithCauseTestCase.class));
suite.addTest(new TestSuite(IOUtilsCopyTestCase.class));
suite.addTest(new TestSuite(IOUtilsTestCase.class));
suite.addTest(new TestSuite(IOUtilsWriteTestCase.class));
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/PackageTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/PackageTestSuite.java?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/PackageTestSuite.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/filefilter/PackageTestSuite.java
Wed Feb 6 10:59:49 2008
@@ -36,6 +36,7 @@
suite.addTest(new TestSuite(AndFileFilterTestCase.class));
suite.addTest(new TestSuite(FileFilterTestCase.class));
suite.addTest(new TestSuite(OrFileFilterTestCase.class));
+ suite.addTest(new TestSuite(RegexFileFilterTestCase.class));
return suite;
}
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/input/PackageTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/input/PackageTestSuite.java?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/input/PackageTestSuite.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/input/PackageTestSuite.java
Wed Feb 6 10:59:49 2008
@@ -34,6 +34,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("IO Utilities - input");
suite.addTest(new TestSuite(AutoCloseInputStreamTest.class));
+ suite.addTest(new TestSuite(CharSequenceReaderTest.class));
suite.addTest(new TestSuite(ClassLoaderObjectInputStreamTest.class));
suite.addTest(new TestSuite(ClosedInputStreamTest.class));
suite.addTest(new TestSuite(CloseShieldInputStreamTest.class));
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/output/PackageTestSuite.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/output/PackageTestSuite.java?rev=619102&r1=619101&r2=619102&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/output/PackageTestSuite.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/output/PackageTestSuite.java
Wed Feb 6 10:59:49 2008
@@ -38,6 +38,7 @@
suite.addTest(new TestSuite(CloseShieldOutputStreamTest.class));
suite.addTest(new TestSuite(CountingOutputStreamTest.class));
suite.addTest(new TestSuite(DeferredFileOutputStreamTest.class));
+ suite.addTest(new TestSuite(FileWriterWithEncodingTest.class));
suite.addTest(new TestSuite(LockableFileWriterTest.class));
suite.addTest(new TestSuite(NullOutputStreamTest.class));
suite.addTest(new TestSuite(NullWriterTest.class));
