Fixed NET-329; removed fields have now been deprecated or reinstated to preserve binary compat.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0@962957 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

RELEASE-NOTES.txt

@@ -16,6 +16,7 @@ o NET-263:  SubnetUtils / SubNetInfo toString() implementations
 o Javadoc fixes, improvements, and refactoring. 
 
 Fixed Bugs:
+o NET-329:  TelnetInoutStream#__read() bug in the __receiveState handling for the _STATE_IAC state. 
 o NET-283:  SocketClient should ensure input and output streams are closed 
 o NET-302:  FTP: initiateListParsing should not cache entryParser 
 o NET-264:  Telnet spyStream NullPointerException 
@@ -48,15 +49,12 @@ o Fix inconsistent handling of socket read/write buffer size
 o NET-294:  UnixFTPEntryParser fails to parse some entries 
 
 Changes:
+o Deprecated the following unused fields from org.apache.commons.net.ftp.FTPSClient:
+                KEYSTORE_ALGORITHM, PROVIDER, STORE_TYPE, TRUSTSTORE_ALGORITHM 
 o NET-261:  SubnetUtils.SubnetInfo.isInRange(...) behaviour not documented 
 o NET-251:  Moved class "ThreadContainer" from Threader.java into its own source file 
 o Refactor examples package. 
 
-Removed:
-o Removed the following unused fields from org.apache.commons.net.ftp.FTPSClient:
-                KEYSTORE_ALGORITHM, PROVIDER, STORE_TYPE, TRUSTSTORE_ALGORITHM 
-o Removed the field constant CODE_408 from org.apache.commons.net.nntp.NNTPReply.
-                This was previously incorrectly used to define AUTHENTICATION_REQUIRED, see NET-277 
 
 For complete information on Commons Net, including instructions on how to submit bug reports,
 patches, or suggestions for improvement, see the Apache Commons Net website:

src/changes/changes.xml

@@ -61,6 +61,9 @@ This is primarily a maintenance release, but it also includes new features and e
  
   TO BE COMPLETED
 ">
+            <action issue="NET-329" dev="sebb" type="fix">
+                TelnetInoutStream#__read() bug in the __receiveState handling for the _STATE_IAC state.
+            </action>
             <action issue="NET-283" dev="sebb" type="fix">
                 SocketClient should ensure input and output streams are closed
             </action>
@@ -70,8 +73,8 @@ This is primarily a maintenance release, but it also includes new features and e
             <action issue="NET-264" dev="sebb" type="fix">
                 Telnet spyStream NullPointerException
             </action>
-            <action dev="sebb" type="remove">
-                Removed the following unused fields from org.apache.commons.net.ftp.FTPSClient:
+            <action dev="sebb" type="update">
+                Deprecated the following unused fields from org.apache.commons.net.ftp.FTPSClient:
                 KEYSTORE_ALGORITHM, PROVIDER, STORE_TYPE, TRUSTSTORE_ALGORITHM
             </action>
             <action dev="niallp" type="fix">
@@ -155,10 +158,6 @@ This is primarily a maintenance release, but it also includes new features and e
             <action dev="rwinston" type="fix" issue="NET-277">
                 Fix incorrect NNTP constant
             </action>
-            <action dev="rwinston" type="remove">
-                Removed the field constant CODE_408 from org.apache.commons.net.nntp.NNTPReply.
-                This was previously incorrectly used to define AUTHENTICATION_REQUIRED, see NET-277
-            </action>
             <action dev="rwinston" type="fix" issue="NET-276">
                 Use long instead of int for newsgroup counts
             </action>