Author: psteitz
Date: Mon Dec 7 03:56:29 2009
New Revision: 887831
URL: http://svn.apache.org/viewvc?rev=887831&view=rev
Log:
Changed version, jdk level for 1.3 release.
Modified:
commons/proper/dbcp/branches/DBCP_1_3_BRANCH/build.xml
commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml
Modified: commons/proper/dbcp/branches/DBCP_1_3_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH/build.xml?rev=887831&r1=887830&r2=887831&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_3_BRANCH/build.xml (original)
+++ commons/proper/dbcp/branches/DBCP_1_3_BRANCH/build.xml Mon Dec 7 03:56:29
2009
@@ -51,7 +51,7 @@
<property name="name" value="commons-dbcp"/>
<property name="title" value="Apache Commons Database Pooling Package"/>
- <property name="version" value="Nightly-${DSTAMP}${TSTAMP}"/>
+ <property name="version" value="1.3"/>
<property name="package" value="org.apache.commons.dbcp.*"/>
<property name="build.dir" value="${basedir}/build"/>
@@ -65,15 +65,15 @@
<property name="test.runner" value="junit.textui.TestRunner" />
<property name="javadoc.dir" value="${dist.dir}/docs/api"/>
- <property name="javadoc.bottom" value="<small>Copyright &copy;
2001-2004 Apache Software Foundation. Documenation generated
${TODAY}</small>."/>
+ <property name="javadoc.bottom" value="<small>Copyright &copy;
2001-2009 Apache Software Foundation. Documenation generated
${TODAY}</small>."/>
<property name="javadoc.overview"
value="${basedir}/src/java/org/apache/commons/dbcp/overview.html"/>
<property name="javac.optimize" value="false"/>
<property name="javac.debug" value="true"/>
<property name="javac.deprecation" value="false"/>
+ <property name="javac.source" value="1.4" />
<available property="jndi.present" classname="javax.naming.Context"/>
- <available property="jdbc4.present" classname="java.sql.Wrapper"/>
</target>
<target name="check_jar">
@@ -128,36 +128,20 @@
<delete dir="${dist.dir}"/>
</target>
- <target name="prepare-nojdbc4" depends="init" unless="jdbc4.present">
- <echo message="Commenting out the jdbc4 additional methods since JDBC 4
was not detected."/>
- <property name="src.dir" value="${build.dir}/src"/>
+ <target name="filter-sources">
+ <echo message="Comment out the jdbc4 additional methods."/>
+ <property name="src.dir" value="${basedir}/src"/>
<property name="src.java.dir" value="${src.dir}/java"/>
<property name="src.test.dir" value="${src.dir}/test"/>
- <property name="javac.source" value="1.4" />
- <mkdir dir="${src.dir}"/>
- <copy todir="${src.dir}" filtering="yes">
- <fileset dir="${basedir}/src" defaultexcludes="no">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- <include name="**/*.jocl"/>
- <include name="**/package.html"/>
- </fileset>
- </copy>
- <replace dir="${src.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */" value="/*"/>
- <replace dir="${src.dir}" token="/* JDBC_4_ANT_KEY_END */" value="*/"/>
- </target>
+ <replace dir="${src.java.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */"
value="/*"/>
+ <replace dir="${src.java.dir}" token="/* JDBC_4_ANT_KEY_END */"
value="*/"/>
- <target name="prepare-jdbc4" depends="init" if="jdbc4.present">
- <echo message="JDBC 4 was detected."/>
- <property name="src.dir" value="${basedir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
- <property name="javac.source" value="1.5" />
+ <replace dir="${src.test.dir}" token="/* JDBC_4_ANT_KEY_BEGIN */"
value="/*"/>
+ <replace dir="${src.test.dir}" token="/* JDBC_4_ANT_KEY_END */"
value="*/"/>
</target>
- <target name="prepare" depends="init,prepare-nojdbc4,prepare-jdbc4"/>
+ <target name="prepare" depends="init,filter-sources"/>
<target name="javadoc" depends="prepare" description="generates javadocs">
<mkdir dir="${javadoc.dir}"/>
Modified: commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml?rev=887831&r1=887830&r2=887831&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml (original)
+++ commons/proper/dbcp/branches/DBCP_1_3_BRANCH/pom.xml Mon Dec 7 03:56:29
2009
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>1.3</version>
<name>Commons DBCP</name>
<inceptionYear>2001</inceptionYear>
@@ -49,8 +49,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/dbcp/trunk</url>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</developerConnection>
+
<url>http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</url>
</scm>
<developers>
@@ -214,12 +214,11 @@
</dependencies>
<properties>
- <!-- Target Java versions are actually 1.4, 1.5 and 1.6
- but maven build only supports 1.6 -->
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
+ <!-- Target Java versions are actually 1.4, 1.5 and 1.6 -->
+ <maven.compile.source>1.4</maven.compile.source>
+ <maven.compile.target>1.4</maven.compile.target>
<commons.componentid>dbcp</commons.componentid>
- <commons.release.version>1.4</commons.release.version>
+ <commons.release.version>1.3</commons.release.version>
<commons.binary.suffix></commons.binary.suffix>
<commons.jira.id>DBCP</commons.jira.id>
<commons.jira.pid>12310469</commons.jira.pid>
@@ -345,8 +344,6 @@
<configuration>
<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
- <template>dbcp-release-notes.vm</template>
- <templateDirectory>src/template</templateDirectory>
</configuration>
<reportSets>
<reportSet>
