Author: ebourg
Date: Fri Oct 21 14:50:57 2011
New Revision: 1187377
URL: http://svn.apache.org/viewvc?rev=1187377&view=rev
Log:
Now targeting Java 5 or later
Modified:
commons/proper/configuration/trunk/build.xml
commons/proper/configuration/trunk/pom.xml
commons/proper/configuration/trunk/src/changes/changes.xml
commons/proper/configuration/trunk/src/site/xdoc/dependencies.xml
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
Modified: commons/proper/configuration/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/build.xml?rev=1187377&r1=1187376&r2=1187377&view=diff
==============================================================================
--- commons/proper/configuration/trunk/build.xml (original)
+++ commons/proper/configuration/trunk/build.xml Fri Oct 21 14:50:57 2011
@@ -39,14 +39,6 @@
</condition>
</target>
- <!-- Check JDK - if 1.4, set isJDK1.4 -->
- <target name="javaCheck">
- <echo message="ant.java.version=${ant.java.version}" />
- <condition property="isJDK1.4">
- <equals arg1="${ant.java.version}" arg2="1.4" />
- </condition>
- </target>
-
<!-- If the maven local repo check failed, create a lib directory to house
dependencies -->
<target name="lib.check" depends="repo.check" unless="repo.exists">
<echo>No maven repo found; creating lib directory for dependencies</echo>
@@ -54,7 +46,7 @@
<mkdir dir="${basedir}/lib"/>
</target>
- <target name="init" depends="lib.check, javaCheck">
+ <target name="init" depends="lib.check">
<property name="lib" value="${maven.repo.local}"/> <!-- only sets if unset
- i.e., repo.check succeeded -->
<path id="build.classpath">
<pathelement
location="${lib}/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
@@ -129,12 +121,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.4"
+ target="1.5"
verbose="false"
fork="false"
- source="1.4">
- <exclude name="**/VFSFileSystem.java" if="isJDK1.4"/>
- <exclude name="**/VFSFileChangedReloadingStrategy.java" if="isJDK1.4"/>
+ source="1.5">
<classpath refid="build.classpath"/>
</javac>
<mkdir dir="${build.classes.dir}/META-INF"/>
@@ -164,13 +154,10 @@
debug="true"
optimize="false"
deprecation="true"
- target="1.4"
+ target="1.5"
verbose="false"
fork="false"
- source="1.4">
- <exclude name="**/TestVFSFileChangedReloadingStrategy.java"
if="isJDK1.4"/>
- <exclude name="**/TestVFSConfigurationBuilder.java" if="isJDK1.4"/>
- <exclude name="**/TestWebdavConfigurationBuilder.java" if="isJDK1.4"/>
+ source="1.5">
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.classes.dir}"/>
@@ -220,9 +207,6 @@
<exclude name="**/TestAbstractConfiguration.java"/>
<exclude name="**/AbstractCombinerTest.java"/>
<exclude name="**/AbstractXPathTest.java"/>
- <exclude name="**/TestVFSFileChangedReloadingStrategy.java"
if="isJDK1.4"/>
- <exclude name="**/TestVFSConfigurationBuilder.java" if="isJDK1.4"/>
- <exclude name="**/TestWebdavConfigurationBuilder.java"
if="isJDK1.4"/>
</fileset>
</batchtest>
<batchtest todir="${build.dir}">
@@ -253,14 +237,12 @@
nonavbar="false"
serialwarn="false"
charset="ISO-8859-1"
- source="1.4"
+ source="1.5"
linksource="true"
breakiterator="false">
<classpath refid="build.classpath"/>
<fileset dir="${src.java.dir}">
<include name="**/*.java"/>
- <exclude name="**/VFSFileSystem.java" if="isJDK1.4"/>
- <exclude name="**/VFSFileChangedReloadingStrategy.java" if="isJDK1.4"/>
</fileset>
<link href="http://download.oracle.com/javase/6/docs/api/"/>
<link href="http://download.oracle.com/javaee/6/api/"/>
Modified: commons/proper/configuration/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1187377&r1=1187376&r2=1187377&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Fri Oct 21 14:50:57 2011
@@ -433,8 +433,8 @@
<commons.release.version>1.7</commons.release.version>
<commons.jira.id>CONFIGURATION</commons.jira.id>
<commons.jira.pid>12310467</commons.jira.pid>
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
</properties>
<build>
@@ -520,46 +520,6 @@
</build>
<profiles>
<profile>
- <!-- A profile for building with JDK 1.4. This profile excludes some
- classes with dependencies to libraries requiring Java 1.5+.
- -->
- <id>java-1.4</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/VFSFileSystem.java</exclude>
- <exclude>**/VFSFileChangedReloadingStrategy.java</exclude>
- </excludes>
- <testExcludes>
- <exclude>**/TestVFSFileChangedReloadingStrategy.java</exclude>
- <exclude>**/TestVFSConfigurationBuilder.java</exclude>
- <exclude>**/TestWebdavConfigurationBuilder.java</exclude>
- </testExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/TestVFSFileChangedReloadingStrategy*.*</exclude>
- <exclude>**/TestVFSConfigurationBuilder*.*</exclude>
- <exclude>**/TestWebdavConfigurationBuilder*.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>webdav</id>
<activation>
<activeByDefault>false</activeByDefault>
Modified: commons/proper/configuration/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/changes/changes.xml?rev=1187377&r1=1187376&r2=1187377&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/changes/changes.xml (original)
+++ commons/proper/configuration/trunk/src/changes/changes.xml Fri Oct 21
14:50:57 2011
@@ -27,6 +27,9 @@
<body>
<release version="1.8" date="in SVN"
description="TBD">
+ <action dev="ebourg" type="add">
+ Commons Configuration now requires Java 5 or later.
+ </action>
<action dev="ebourg" type="add" issue="CONFIGURATION-466">
Binary literals are now supported (i.e Ob11010001).
</action>
Modified: commons/proper/configuration/trunk/src/site/xdoc/dependencies.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/site/xdoc/dependencies.xml?rev=1187377&r1=1187376&r2=1187377&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/site/xdoc/dependencies.xml (original)
+++ commons/proper/configuration/trunk/src/site/xdoc/dependencies.xml Fri Oct
21 14:50:57 2011
@@ -30,7 +30,7 @@
<section name="Runtime dependencies">
<p>
- Commons Configuration requires Java 1.4 or later.
+ Commons Configuration requires Java 5 or later.
</p>
<p>
A lot of dependencies are declared in the Maven POM. These are
all
@@ -58,49 +58,28 @@
</tr>
<tr>
<td>DefaultConfigurationBuilder</td>
- <td>
- commons-beanutils<br/>
- </td>
+ <td>commons-beanutils</td>
</tr>
<tr>
<td>ConfigurationFactory (deprecated)</td>
- <td>
- commons-digester<br/>
- </td>
+ <td>commons-digester</td>
</tr>
<tr>
<td>ConfigurationConverter</td>
- <td>
- commons-collections<br/>
- </td>
+ <td>commons-collections</td>
</tr>
<tr>
<td>
- XMLConfiguration<br/>
- XMLPropertiesConfiguration
+ PropertyListConfiguration<br/>
+ XMLPropertyListConfiguration
</td>
- <td>see notes about XML processing</td>
- </tr>
- <tr>
- <td>PropertyListConfiguration</td>
<td>commons-codec</td>
</tr>
<tr>
- <td>XMLPropertyListConfiguration</td>
- <td>
- commons-codec<br/>
- see notes about XML processing
- </td>
- </tr>
- <tr>
<td>ConfigurationDynaBean</td>
<td>commons-beanutils</td>
</tr>
<tr>
- <td>EnvironmentConfiguration</td>
- <td>Java 1.5 or Ant 1.6.5</td>
- </tr>
- <tr>
<td>XPathExpressionEngine</td>
<td>commons-jxpath</td>
</tr>
@@ -118,7 +97,7 @@
</tr>
<tr>
<td>VFSFileSystem, VFSFileChangedReloadingStrategy</td>
- <td>commons-vfs (requires Java 1.5)</td>
+ <td>commons-vfs</td>
</tr>
</tbody>
</table>
@@ -185,18 +164,6 @@
</tbody>
</table>
</li>
- <li>
- Java 1.4 comes with XML support. If you use only standard
- features (e.g. loading XML documents with
- <code>XMLConfiguration</code>), no additional dependencies
are
- needed. However, some modern features like schema validation
- are not supported by the parser shipped with Java 1.4. On
- Java 1.5 or higher this is not a problem; here everything
- works out of the box. With Java 1.4 you need further
libraries
- to make these advanced features working. We used
- <a href="http://xml.apache.org/xerces2-j/";>Xerces 2.6.2</a>,
- and <a href="http://xml.apache.org/commons/";>XML APIs
1.0.b2</a>.
- </li>
</ul>
</p>
</section>
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java?rev=1187377&r1=1187376&r2=1187377&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestDataConfiguration.java
Fri Oct 21 14:50:57 2011
@@ -298,13 +298,10 @@ public class TestDataConfiguration exten
conf.addProperty("ip.string.interpolated", "${ip.string}");
conf.addProperty("ip.object", InetAddress.getByName("127.0.0.1"));
- // email address (tested on Java 1.4+)
- if (SystemUtils.isJavaVersionAtLeast(1.4f))
- {
- conf.addProperty("email.string", "[email protected]");
- conf.addProperty("email.string.interpolated", "${email.string}");
- conf.addProperty("email.object",
createInternetAddress("[email protected]"));
- }
+ // email address
+ conf.addProperty("email.string", "[email protected]");
+ conf.addProperty("email.string.interpolated", "${email.string}");
+ conf.addProperty("email.object",
createInternetAddress("[email protected]"));
}
public void testGetConfiguration()
