commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1087590 - in /commons/proper/codec/trunk: ./ src/changes/ src/java/org/apache/commons/codec/ src/java/org/apache/commons/codec/binary/ src/java/org/apache/commons/codec/net/ src/site/ src/site/xdoc/
Date Fri, 01 Apr 2011 05:48:28 GMT
Author: ggregory
Date: Fri Apr  1 05:48:27 2011
New Revision: 1087590

URL: http://svn.apache.org/viewvc?rev=1087590&view=rev
Log:
https://issues.apache.org/jira/browse/CODEC-119 Migrate to Java 5
https://issues.apache.org/jira/browse/CODEC-120 Migrate to JUnit 4
No [codec] code changes yet. This is all set up for 2.0, Java 5 and JUnit 4.

Modified:
    commons/proper/codec/trunk/build.xml
    commons/proper/codec/trunk/pom.xml
    commons/proper/codec/trunk/src/changes/changes.xml
    commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java
    commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java
    commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java
    commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
    commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java
    commons/proper/codec/trunk/src/site/site.xml
    commons/proper/codec/trunk/src/site/xdoc/index.xml
    commons/proper/codec/trunk/src/site/xdoc/userguide.xml

Modified: commons/proper/codec/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/build.xml?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/build.xml (original)
+++ commons/proper/codec/trunk/build.xml Fri Apr  1 05:48:27 2011
@@ -89,7 +89,7 @@ limitations under the License.
             windowtitle="${component.title} (Version ${component.version})"
             bottom="${component.name} version ${component.version} - Copyright ©
2002-${current.year} - Apache Software Foundation"
             use="true"
-            link="http://download.oracle.com/javase/1.4.2/docs/api/"
+            link="http://download.oracle.com/javase/1.5.0/docs/api/"
 			encoding="${compile.encoding}">
             <classpath refid="compile.classpath"/>
         </javadoc>

Modified: commons/proper/codec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Fri Apr  1 05:48:27 2011
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-codec</groupId>
   <artifactId>commons-codec</artifactId>
-  <version>1.6-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <name>Commons Codec</name>
   <inceptionYear>2002</inceptionYear>
   <description>
@@ -180,15 +180,15 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
   <properties>
-    <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>
     <commons.componentid>codec</commons.componentid>
-    <commons.release.version>1.6</commons.release.version>
+    <commons.release.version>2.0</commons.release.version>
     <!-- The RC version used in the staging repository URL. -->
     <commons.rc.version>RC1</commons.rc.version>
     <commons.jira.id>CODEC</commons.jira.id>
@@ -276,7 +276,7 @@
         <artifactId>clirr-maven-plugin</artifactId>
         <version>2.3</version>
         <configuration>
-          <comparisonVersion>1.4</comparisonVersion>
+          <comparisonVersion>1.5</comparisonVersion>
           <minSeverity>info</minSeverity>
         </configuration>
       </plugin>
@@ -287,7 +287,7 @@
         <configuration>
           <linksource>true</linksource>
           <links>
-            <link>http://download.oracle.com/javase/1.4.2/docs/api/</link>
+            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
           </links>
         </configuration>
       </plugin>

Modified: commons/proper/codec/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/changes/changes.xml?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/changes/changes.xml (original)
+++ commons/proper/codec/trunk/src/changes/changes.xml Fri Apr  1 05:48:27 2011
@@ -22,6 +22,8 @@
         <author>Gary D. Gregory</author>
     </properties>
     <body>
+        <release version="2.0" date="TBA" description="Feature and fix release.">
+		</release>
         <release version="1.5" date="29 March 2011" description="Feature and fix release.">
             <action dev="sebb" type="fix" issue="CODEC-89">
              new Base64().encode() appends a CRLF, and chunks results into 76 character lines.

Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java Fri Apr
 1 05:48:27 2011
@@ -20,7 +20,7 @@ package org.apache.commons.codec;
 /**
  * Character encoding names required of every implementation of the Java platform.
  * 
- * From the Java documentation <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
+ * From the Java documentation <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
  * charsets</a>:
  * <p>
  * <cite>Every implementation of the Java platform is required to support the following
character encodings. Consult the
@@ -47,7 +47,7 @@ package org.apache.commons.codec;
  * This perhaps would best belong in the [lang] project. Even if a similar interface is defined
in [lang], it is not
  * forseen that [codec] would be made to depend on [lang].
  * 
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+ * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
  * @author Apache Software Foundation
  * @since 1.4
  * @version $Id$
@@ -59,7 +59,7 @@ public class CharEncoding {
      * Every implementation of the Java platform is required to support this character encoding.
      * </p>
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public static final String ISO_8859_1 = "ISO-8859-1";
 
@@ -71,7 +71,7 @@ public class CharEncoding {
      * Every implementation of the Java platform is required to support this character encoding.
      * </p>
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public static final String US_ASCII = "US-ASCII";
 
@@ -84,7 +84,7 @@ public class CharEncoding {
      * Every implementation of the Java platform is required to support this character encoding.
      * </p>
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public static final String UTF_16 = "UTF-16";
 
@@ -96,7 +96,7 @@ public class CharEncoding {
      * Every implementation of the Java platform is required to support this character encoding.
      * </p>
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public static final String UTF_16BE = "UTF-16BE";
 
@@ -108,7 +108,7 @@ public class CharEncoding {
      * Every implementation of the Java platform is required to support this character encoding.
      * </p>
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public static final String UTF_16LE = "UTF-16LE";
 
@@ -120,7 +120,7 @@ public class CharEncoding {
      * Every implementation of the Java platform is required to support this character encoding.
      * </p>
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public static final String UTF_8 = "UTF-8";
 }
\ No newline at end of file

Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java Fri
Apr  1 05:48:27 2011
@@ -23,10 +23,10 @@ import org.apache.commons.codec.CharEnco
 
 /**
  * Converts String to and from bytes using the encodings required by the Java specification.
These encodings are specified in <a
- * href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+ * href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
  * 
  * @see CharEncoding
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+ * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @version $Id$
  * @since 1.4
@@ -42,7 +42,7 @@ public class StringUtils {
      * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
      * @throws IllegalStateException
      *             Thrown when the charset is missing, which should be never according the
the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesIso8859_1(String string) {
@@ -58,7 +58,7 @@ public class StringUtils {
      * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
      * @throws IllegalStateException
      *             Thrown when the charset is missing, which should be never according the
the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesUsAscii(String string) {
@@ -74,7 +74,7 @@ public class StringUtils {
      * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
      * @throws IllegalStateException
      *             Thrown when the charset is missing, which should be never according the
the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesUtf16(String string) {
@@ -90,7 +90,7 @@ public class StringUtils {
      * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
      * @throws IllegalStateException
      *             Thrown when the charset is missing, which should be never according the
the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesUtf16Be(String string) {
@@ -106,7 +106,7 @@ public class StringUtils {
      * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
      * @throws IllegalStateException
      *             Thrown when the charset is missing, which should be never according the
the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesUtf16Le(String string) {
@@ -122,7 +122,7 @@ public class StringUtils {
      * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
      * @throws IllegalStateException
      *             Thrown when the charset is missing, which should be never according the
the Java specification.
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      * @see #getBytesUnchecked(String, String)
      */
     public static byte[] getBytesUtf8(String string) {

Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java Fri Apr 
1 05:48:27 2011
@@ -64,7 +64,7 @@ public class BCodec extends RFC1522Codec
      * @param charset
      *                  the default string charset to use.
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public BCodec(final String charset) {
         super();

Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java Fri Apr 
1 05:48:27 2011
@@ -119,7 +119,7 @@ public class QCodec extends RFC1522Codec
      * @param charset
      *                  the default string charset to use.
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     public QCodec(final String charset) {
         super();

Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java Fri
Apr  1 05:48:27 2011
@@ -76,7 +76,7 @@ abstract class RFC1522Codec {
      *  process.
      * @throws UnsupportedEncodingException thrown if charset is not supported 
      * 
-     * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
+     * @see <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html">Standard
charsets</a>
      */
     protected String encodeText(final String text, final String charset)
      throws EncoderException, UnsupportedEncodingException  

Modified: commons/proper/codec/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/site/site.xml?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/site/site.xml (original)
+++ commons/proper/codec/trunk/src/site/site.xml Fri Apr  1 05:48:27 2011
@@ -27,7 +27,7 @@
             <item name="Overview"      href="/index.html"/>
             <item name="Download"      href="http://commons.apache.org/codec/download_codec.cgi"/>
             <item name="Users guide"   href="/userguide.html"/>
-            <item name="Javadoc (1.4 release)" href="api-release/index.html"/>
+            <item name="Javadoc (1.5 release)" href="api-release/index.html"/>
         </menu>
 
         <menu name="Development">

Modified: commons/proper/codec/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/site/xdoc/index.xml?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/codec/trunk/src/site/xdoc/index.xml Fri Apr  1 05:48:27 2011
@@ -83,6 +83,7 @@ The <a href="source-repository.html">sub
 <!-- ================================================== -->
 <section name="Releases">
 <ul>
+<li>Codec 2.0 requires Java 1.5</li>
 <li>Codec 1.5 requires Java 1.4</li>
 <li>Codec 1.4 requires Java 1.4</li>
 </ul>

Modified: commons/proper/codec/trunk/src/site/xdoc/userguide.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/site/xdoc/userguide.xml?rev=1087590&r1=1087589&r2=1087590&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/site/xdoc/userguide.xml (original)
+++ commons/proper/codec/trunk/src/site/xdoc/userguide.xml Fri Apr  1 05:48:27 2011
@@ -96,7 +96,7 @@
             <td>
               Simplifies common
               <a
-                href="http://download.oracle.com/javase/1.4.2/docs/api/java/security/MessageDigest.html">MessageDigest</a>
+                href="http://download.oracle.com/javase/1.5.0/docs/api/java/security/MessageDigest.html">MessageDigest</a>
               tasks.
             </td>
           </tr>



Mime
View raw message