Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-dbcp.git
diff --git a/pom.xml b/pom.xml
index a004299..6f0c2a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,20 +317,6 @@
<commons.release.2.desc>for JDBC 4.1 on Java 7</commons.release.2.desc>
<commons.release.2.hash>sha256</commons.release.2.hash>
- <!-- override parent name, because 1.x uses different artifactId -->
- <commons.release.3.name>commons-dbcp-${commons.release.3.version}</commons.release.3.name>
- <commons.release.3.version>1.4</commons.release.3.version>
- <commons.release.3.desc>for JDBC 4 on Java 6</commons.release.3.desc>
- <commons.release.3.hash>sha256</commons.release.3.hash>
-
- <!-- override parent name, because 1.x uses different artifactId -->
- <commons.release.4.name>commons-dbcp-${commons.release.4.version}</commons.release.4.name>
- <commons.release.4.version>1.3</commons.release.4.version>
- <commons.release.4.desc>for JDBC 3 on Java 1.4 or 5</commons.release.4.desc>
- <commons.release.4.hash>sha256</commons.release.4.hash>
- <!-- This is needed until CP49 is released -->
- <commons.release.4.binary.suffix>-bin</commons.release.4.binary.suffix>
-
<commons.site.path>dbcp</commons.site.path>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-dbcp</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
diff --git a/src/site/xdoc/download_dbcp.xml b/src/site/xdoc/download_dbcp.xml
index c4a9a10..e626149 100644
--- a/src/site/xdoc/download_dbcp.xml
+++ b/src/site/xdoc/download_dbcp.xml
@@ -173,66 +173,6 @@
</table>
</subsection>
</section>
- <section name="Apache Commons DBCP 1.4 for JDBC 4 on Java 6">
- <subsection name="Binaries">
- <table>
- <tr>
- <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz">commons-dbcp-1.4-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.4-bin.zip">commons-dbcp-1.4-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4-bin.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- <subsection name="Source">
- <table>
- <tr>
- <td><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz">commons-dbcp-1.4-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.4-src.zip">commons-dbcp-1.4-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- </section>
- <section name="Apache Commons DBCP 1.3 for JDBC 3 on Java 1.4 or 5">
- <subsection name="Binaries">
- <table>
- <tr>
- <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3-bin.tar.gz">commons-dbcp-1.3-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3-bin.zip">commons-dbcp-1.3-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3-bin.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- <subsection name="Source">
- <table>
- <tr>
- <td><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.3-src.tar.gz">commons-dbcp-1.3-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.tar.gz.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.tar.gz.asc">pgp</a></td>
- </tr>
- <tr>
- <td><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.3-src.zip">commons-dbcp-1.3-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.zip.sha256">sha256</a></td>
- <td><a href="https://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.zip.asc">pgp</a></td>
- </tr>
- </table>
- </subsection>
- </section>
<section name="Archives">
<p>
Older releases can be obtained from the archives.
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 4f4f72c..670cdc9 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -54,15 +54,11 @@
<ul>
<li>DBCP 2.5.0 and up compiles and runs under Java 8 (JDBC 4.2) and up.</li>
<li>DBCP 2.4.0 compiles and runs under Java 7 (JDBC 4.1) and above.</li>
-<li>DBCP 1.4 compiles and runs under Java 6 (JDBC 4) and above.</li>
-<li>DBCP 1.3 compiles and runs under Java 1.4-5.0 (JDBC 3) and above.</li>
</ul>
<p>Running</p>
<ul>
<li>DBCP 2.5.0 and up binaries should be used by applications running on Java 8 and up.</li>
<li>DBCP 2.4.0 binaries should be used by applications running under Java 7.</li>
-<li>DBCP 1.4 binaries should be used by applications running under Java 6.</li>
-<li>DBCP 1.3 should be used when running under Java 1.4 and 5.0.</li>
</ul>
<p>DBCP 2 is based on Commons Pool 2 and provides increased performance, JMX
support as well as numerous other new features compared to DBCP 1.x. Users
@@ -72,10 +68,6 @@
to maxTotal) have been renamed to align them with the new names used by Commons
Pool 2.</p>
-<p>There is no difference in the codebase supporting DBCP 1.4.x and 1.3.x other
-than that the code implementing methods added to support JDBC 4 has been
-filtered out of the DBCP 1.3 sources.</p>
-
</section>
<section name="Releases">
