Remove deprecated code for 2.0.0 release

CHANGES.md

@@ -1,8 +1,73 @@
-Unreleased
-----------
-
-#### Dependency upgrades
+2.0.0
+-----
 
+### Removals
+
+#### Removed Apache HttpClient 3.1
+
+`HTTPSeekableLineReaderFactory` and `ZipNumBlockLoader` now default to HttpClient 4.3.
+
+| Removed                                                   | Replacement                          |
+|-----------------------------------------------------------|--------------------------------------|
+| `org.apache.commons.httpclient.URIException`              | `org.archive.url.URIException`       |
+| `org.apache.commons.httpclient.Header`                    | `org.archive.format.http.HttpHeader` |
+| `org.archive.httpclient.HttpRecorderGetMethod`            |                                      |
+| `org.archive.httpclient.HttpRecorderMethod`               |                                      |
+| `org.archive.httpclient.HttpRecorderPostMethod`           |                                      |
+| `org.archive.httpclient.SingleHttpConnectionManager`      |                                      |
+| `org.archive.httpclient.ThreadLocalHttpConnectionManager` |                                      |
+
+#### Removed deprecated versions of renamed classes
+
+| Removed                                       | Replacement                                      |
+|-----------------------------------------------|--------------------------------------------------|
+| `org.archive.io.ArchiveFileConstants`         | `org.archive.format.ArchiveFileConstants`        |
+| `org.archive.io.GzipHeader`                   | `org.archive.util.zip.GzipHeader`                |
+| `org.archive.io.GZIPMembersInputStream`       | `org.archive.util.zip.GZIPMembersInputStream`    |
+| `org.archive.io.NoGzipMagicException`         | `org.archive.util.zip.NoGzipMagicException`      |
+| `org.archive.io.arc.ARCConstants`             | `org.archive.format.arc.ARCConstants`            |
+| `org.archive.io.warc.WARCConstants`           | `org.archive.format.warc.WARCConstants`          |
+| `org.archive.url.DefaultIACanonicalizerRules` | `org.archive.url.AggressiveIACanonicalizerRules` |
+| `org.archive.url.DefaultIAURLCanonicalizer`   | `org.archive.url.AggressiveIAURLCanonicalizer`   |
+| `org.archive.url.GoogleURLCanonicalizer`      | `org.archive.url.BasicURLCanonicalizer`          |
+
+#### Removed deprecated methods
+
+| Removed                                       | Replacement                               |
+|-----------------------------------------------|-------------------------------------------|
+| `ANVLRecord(int)`                             | `ANVLRecord()`                            |
+| `DevUtils.betterPrintStack(RuntimeException)` | `Throwable.printStackStrace()`            |
+| `Recorder.getReplayCharSequence()`            | `Recorder.getContentReplayCharSequence()` |
+| `Reporter.shortReportLineTo(PrintWriter)`     | `Reporter.reportTo(PrintWriter)`          |
+
+##### Removed usages of constant interfaces
+
+Static imports should be used instead.
+
+* `ArchiveFileConstants` is no longer implemented by:
+  * `ArchiveReader`
+  * `ArchiveReaderFactory`
+  * `WARCWriter`
+  * `WriterPool`
+  * `WriterPoolMember`
+* `ARCConstants` is no longer implemented by:
+  * `ARCReader`
+  * `ARCReaderFactory`
+  * `ARCRecord`
+  * `ARCRecordMetaData`
+  * `ARCUtils`
+  * `ARCWriter`
+* `WARCConstants` is no longer implemented by:
+  * `WARCReader`
+  * `WARCReaderFactory`
+  * `WARCRecord`
+  * `WARCWriter`
+
+### Dependency upgrades
+
+- **commons-io**: 2.18.0 → 2.19.0
+- **guava**: 33.3.1-jre → 33.4.8-jre
+- **json**: 20240303 → 20250517
 - **junit**: 4.13.2 → 5.12.2
 
 1.3.0

pom.xml

@@ -61,13 +61,13 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.3.1-jre</version>
+      <version>33.4.8-jre</version>
     </dependency>
 
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20240303</version>
+      <version>20250517</version>
     </dependency>
     <dependency>
       <groupId>org.htmlparser</groupId>
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.18.0</version>
+      <version>2.19.0</version>
     </dependency>
 
     <dependency>
@@ -162,7 +162,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.14.0</version>
         <configuration>
           <source>8</source>
           <target>8</target>
@@ -265,6 +265,15 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk9-plus</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.release>8</maven.compiler.release>
+      </properties>
+    </profile>
   </profiles>
 
 </project>

src/main/java/org/archive/io/ArchiveReader.java

@@ -42,13 +42,15 @@
 
 import com.google.common.io.CountingInputStream;
 
+import static org.archive.format.ArchiveFileConstants.*;
+
 
 /**
  * Reader for an Archive file of Archive {@link ArchiveRecord}s.
  * @author stack
  * @version $Date$ $Version$
  */
-public abstract class ArchiveReader implements ArchiveFileConstants, Iterable<ArchiveRecord>, Closeable {    
+public abstract class ArchiveReader implements Iterable<ArchiveRecord>, Closeable {
     /**
      * Is this Archive file compressed?
      */
@@ -601,8 +603,7 @@ public String getStrippedFileName() {
      */
     public static String getStrippedFileName(String name,
     		final String dotFileExtension) {
-    	name = stripExtension(name,
-    		ArchiveFileConstants.DOT_COMPRESSED_FILE_EXTENSION);
+    	name = stripExtension(name, DOT_COMPRESSED_FILE_EXTENSION);
     	return stripExtension(name, dotFileExtension);
     }
 
@@ -699,7 +700,7 @@ public boolean outputRecord(final String format)
     	boolean result = true;
         if (format.equals(CDX)) {
             System.out.println(get().outputCdx(getStrippedFileName()));
-        } else if(format.equals(ArchiveFileConstants.DUMP)) {
+        } else if(format.equals(DUMP)) {
             // No point digesting if dumping content.
             setDigest(false);
             get().dump();

src/main/java/org/archive/io/ArchiveReaderFactory.java

@@ -33,14 +33,15 @@
 import org.archive.url.UsableURI;
 import org.archive.util.FileUtils;
 
+import static org.archive.format.ArchiveFileConstants.*;
 
 /**
  * Factory that returns an Archive file Reader.
  * Returns Readers for ARCs or WARCs.
  * @author stack
  * @version $Date$ $Revision$
  */
-public class ArchiveReaderFactory implements ArchiveFileConstants {
+public class ArchiveReaderFactory {
   // Static block to enable S3 URLs
   static {
     if (System.getProperty("java.protocol.handler.pkgs") != null) {

src/main/java/org/archive/io/ArchiveRecord.java

@@ -25,6 +25,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.logging.Level;
 
+import org.archive.format.ArchiveFileConstants;
 import org.archive.util.Base32;
 
 /**

src/main/java/org/archive/io/HeaderedArchiveRecord.java

@@ -27,7 +27,7 @@
 import java.io.PrintStream;
 
 import org.archive.format.http.HttpHeader;
-import org.archive.io.arc.ARCConstants;
+import org.archive.format.arc.ARCConstants;
 import org.archive.util.LaxHttpParser;
 
 /**

src/main/java/org/archive/io/WriterPool.java

@@ -30,6 +30,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.archive.format.ArchiveFileConstants;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -215,7 +216,7 @@ public synchronized void invalidateFile(WriterPoolMember f)
         // gets attention.
         File file = f.getFile();
         file.renameTo(new File(file.getAbsoluteFile() +
-                WriterPoolMember.INVALID_SUFFIX));
+                ArchiveFileConstants.INVALID_SUFFIX));
     }
 
 	/**

src/main/java/org/archive/io/WriterPoolMember.java

@@ -38,6 +38,7 @@
 import org.archive.util.FileUtils;
 import org.archive.util.PropertyUtils;
 
+import static org.archive.format.ArchiveFileConstants.*;
 
 
 /**
@@ -48,7 +49,7 @@
  * @author stack
  * @version $Date$ $Revision$
  */
-public abstract class WriterPoolMember implements ArchiveFileConstants {
+public abstract class WriterPoolMember {
     private final Logger logger = Logger.getLogger(this.getClass().getName());
 
     public static final String UTF8 = "UTF-8";

src/main/java/org/archive/io/arc/ARCReader.java

@@ -43,6 +43,7 @@
 import org.archive.io.WriterPoolMember;
 import org.archive.util.ArchiveUtils;
 
+import static org.archive.format.arc.ARCConstants.*;
 
 /**
  * Get an iterator on an ARC file or get a record by absolute position.
@@ -66,7 +67,7 @@
  * @version $Date$ $Revision$
  */
 public abstract class ARCReader extends ArchiveReader
-implements ARCConstants, Closeable {
+implements Closeable {
     private final Logger logger = Logger.getLogger(ARCReader.class.getName());
 
     /**