Skip to content

Commit edb4ce3

Browse files
garydgregorygarydgregory
committed
[CODEC-207] Charsets Javadoc breaks build when using Java 8.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1743751 13f79535-47bb-0310-9956-ffa450edef68
1 parent 07cd456 commit edb4ce3

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

‎src/changes/changes.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ The <action> type attribute can be add,update,fix,remove.
4444
<body>
4545
<release version="1.11" date="DD MM 2015" description="Feature and fix release.">
4646
<action issue="CODEC-200" dev="sebb" type="fix" due-to="Luciano Vernaschi">Base32.HEX_DECODE_TABLE contains the wrong value 32</action>
47+
<action dev="ggregory" type="fix" issue="CODEC-207" due-to="Gary Gregory">Charsets Javadoc breaks build when using Java 8</action>
4748
<action dev="ggregory" type="fix" issue="CODEC-199" due-to="Yossi Tamari">Bug in HW rule in Soundex</action>
4849
<action dev="ggregory" type="add" issue="CODEC-183" due-to="Steven Wurster">BaseNCodecOutputStream only supports writing EOF on close()</action>
4950
<action dev="ggregory" type="add" issue="CODEC-195" due-to="Gary Gregory">Support SHA-224 in DigestUtils on Java 8</action>

‎src/main/java/org/apache/commons/codec/Charsets.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static Charset toCharset(final String charset) {
9393
* Every implementation of the Java platform is required to support this character encoding.
9494
*
9595
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
96-
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets.ISO_8859_1} instead
96+
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#ISO_8859_1} instead
9797
*/
9898
@Deprecated
9999
public static final Charset ISO_8859_1 = Charset.forName(CharEncoding.ISO_8859_1);
@@ -104,7 +104,7 @@ public static Charset toCharset(final String charset) {
104104
* Every implementation of the Java platform is required to support this character encoding.
105105
*
106106
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
107-
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets.US_ASCII} instead
107+
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#US_ASCII} instead
108108
*/
109109
@Deprecated
110110
public static final Charset US_ASCII = Charset.forName(CharEncoding.US_ASCII);
@@ -116,7 +116,7 @@ public static Charset toCharset(final String charset) {
116116
* Every implementation of the Java platform is required to support this character encoding.
117117
*
118118
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
119-
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets.UTF_16} instead
119+
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#UTF_16} instead
120120
*/
121121
@Deprecated
122122
public static final Charset UTF_16 = Charset.forName(CharEncoding.UTF_16);
@@ -127,7 +127,7 @@ public static Charset toCharset(final String charset) {
127127
* Every implementation of the Java platform is required to support this character encoding.
128128
*
129129
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
130-
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets.UTF_16BE} instead
130+
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#UTF_16BE} instead
131131
*/
132132
@Deprecated
133133
public static final Charset UTF_16BE = Charset.forName(CharEncoding.UTF_16BE);
@@ -138,7 +138,7 @@ public static Charset toCharset(final String charset) {
138138
* Every implementation of the Java platform is required to support this character encoding.
139139
*
140140
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
141-
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets.UTF_16LE} instead
141+
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#UTF_16LE} instead
142142
*/
143143
@Deprecated
144144
public static final Charset UTF_16LE = Charset.forName(CharEncoding.UTF_16LE);
@@ -149,7 +149,7 @@ public static Charset toCharset(final String charset) {
149149
* Every implementation of the Java platform is required to support this character encoding.
150150
*
151151
* @see <a href="http://docs.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
152-
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets.UTF_8}
152+
* @deprecated Use Java 7's {@link java.nio.charset.StandardCharsets#UTF_8}
153153
*/
154154
@Deprecated
155155
public static final Charset UTF_8 = Charset.forName(CharEncoding.UTF_8);

0 commit comments

Comments
 (0)