Author: ggregory
Date: Wed Nov 28 06:50:55 2012
New Revision: 1414547
URL: http://svn.apache.org/viewvc?rev=1414547&view=rev
Log:
I committed a refactoring to trunk which failed in Continuum because I used a
String Java 6 API (getBytes(Charset)). Welcome to 2012, almost 2013 ;) I
believe using this API is the best way forward and similar to other code in
Commons.
This commit updates the POM and continuum for builds with Java 6 for the
3.3-SNAPSHOT.
If someone wants to keep running on Java 5 /and/ wants a bug fix post release
3.2, it will be in a 3.2.x release.
Modified:
commons/proper/net/trunk/pom.xml
commons/proper/net/trunk/src/site/site.xml
commons/proper/net/trunk/src/site/xdoc/download_net.xml
Modified: commons/proper/net/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/pom.xml?rev=1414547&r1=1414546&r2=1414547&view=diff
==============================================================================
--- commons/proper/net/trunk/pom.xml (original)
+++ commons/proper/net/trunk/pom.xml Wed Nov 28 06:50:55 2012
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.2-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<name>Commons Net</name>
<!-- N.B. the description content is deliberately not indented
! to improve the layout of the Release Notes generated by mvn
changes:announcement-generate
@@ -129,17 +129,19 @@ Supported protocols include: Echo, Finge
</distributionManagement>
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
-
<commons.javadoc.java.link>http://download.oracle.com/javase/1.5.0/docs/api/</commons.javadoc.java.link>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
+
<commons.javadoc.java.link>http://download.oracle.com/javase/1.6.0/docs/api/</commons.javadoc.java.link>
<commons.componentid>net</commons.componentid>
- <commons.release.version>3.2</commons.release.version>
+ <commons.release.version>3.3</commons.release.version>
<commons.rc.version>RC1</commons.rc.version>
- <commons.release.desc>(Requires Java 1.5 or
later)</commons.release.desc>
- <commons.release.2.version>1.4.1</commons.release.2.version>
+ <commons.release.desc>(Requires Java 1.6 or
later)</commons.release.desc>
+ <commons.release.2.version>3.2</commons.release.2.version>
+ <commons.release.2.desc>(Requires Java 1.5 or
later)</commons.release.2.desc>
+ <commons.release.3.version>1.4.1</commons.release.3.version>
<!-- Override Commons parent, as version 1.4.1 does not use the -bin
suffix -->
- <commons.release.2.binary.suffix />
- <commons.release.2.desc>(Requires Java 1.3 or
later)</commons.release.2.desc>
+ <commons.release.3.binary.suffix />
+ <commons.release.3.desc>(Requires Java 1.3 or
later)</commons.release.3.desc>
<commons.jira.id>NET</commons.jira.id>
<commons.jira.pid>12310487</commons.jira.pid>
</properties>
Modified: commons/proper/net/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/site/site.xml?rev=1414547&r1=1414546&r2=1414547&view=diff
==============================================================================
--- commons/proper/net/trunk/src/site/site.xml (original)
+++ commons/proper/net/trunk/src/site/site.xml Wed Nov 28 06:50:55 2012
@@ -30,8 +30,9 @@
<item name="Migration How-to" href="migration.html"/>
<item name="FAQ" href="faq.html"/>
<item name="Download"
href="http://commons.apache.org/net/download_net.cgi"/>
- <item name="Javadoc (3.2)" href="api-3.2/index.html"/>
- <item name="Javadoc (1.4.1)" href="api-1.4.1/index.html"/>
+ <item name="Javadoc 3.3 (Java 1.6)" href="api-3.3/index.html"/>
+ <item name="Javadoc 3.2 (Java 1.5)" href="api-3.2/index.html"/>
+ <item name="Javadoc 1.4.1 (Java 1.3)" href="api-1.4.1/index.html"/>
<item name="Release Notes" href="changes-report.html"/>
</menu>
<menu name="Development">
Modified: commons/proper/net/trunk/src/site/xdoc/download_net.xml
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/site/xdoc/download_net.xml?rev=1414547&r1=1414546&r2=1414547&view=diff
==============================================================================
--- commons/proper/net/trunk/src/site/xdoc/download_net.xml (original)
+++ commons/proper/net/trunk/src/site/xdoc/download_net.xml Wed Nov 28 06:50:55
2012
@@ -95,6 +95,36 @@ limitations under the License.
</p>
</subsection>
</section>
+ <section name="Commons Net 3.3 (Requires Java 1.6 or later)">
+ <subsection name="Binaries">
+ <table>
+ <tr>
+ <td><a
href="[preferred]/commons/net/binaries/commons-net-3.3-bin.tar.gz">commons-net-3.3-bin.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/binaries/commons-net-3.3-bin.tar.gz.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/binaries/commons-net-3.3-bin.tar.gz.asc";>pgp</a></td>
+ </tr>
+ <tr>
+ <td><a
href="[preferred]/commons/net/binaries/commons-net-3.3-bin.zip">commons-net-3.3-bin.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/binaries/commons-net-3.3-bin.zip.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/binaries/commons-net-3.3-bin.zip.asc";>pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="Source">
+ <table>
+ <tr>
+ <td><a
href="[preferred]/commons/net/source/commons-net-3.3-src.tar.gz">commons-net-3.3-src.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/source/commons-net-3.3-src.tar.gz.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/source/commons-net-3.3-src.tar.gz.asc";>pgp</a></td>
+ </tr>
+ <tr>
+ <td><a
href="[preferred]/commons/net/source/commons-net-3.3-src.zip">commons-net-3.3-src.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/source/commons-net-3.3-src.zip.md5";>md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/net/source/commons-net-3.3-src.zip.asc";>pgp</a></td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
<section name="Commons Net 3.2 (Requires Java 1.5 or later)">
<subsection name="Binaries">
<table>
