Import java.util.zip from jdk-17.0.4-ga
List of files:
ojluni/src/main/java/java/util/zip/DataFormatException.java
ojluni/src/main/java/java/util/zip/ZipError.java
ojluni/src/main/java/java/util/zip/ZipException.java
Generated by tools/expected_upstream/ojluni_merge_to_master.py
Bug: 254213857
Test: N/A
Change-Id: I240a88bb0b3cdf0a3c0d845bd19d6d960ea0b3f7
diff --git a/EXPECTED_UPSTREAM b/EXPECTED_UPSTREAM
index e3fc209..1df9155 100644
--- a/EXPECTED_UPSTREAM
+++ b/EXPECTED_UPSTREAM
@@ -1200,7 +1200,7 @@
ojluni/src/main/java/java/util/zip/CheckedInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/CheckedInputStream.java
ojluni/src/main/java/java/util/zip/CheckedOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/CheckedOutputStream.java
ojluni/src/main/java/java/util/zip/Checksum.java,jdk17u/jdk-17.0.4-ga,src/java.base/share/classes/java/util/zip/Checksum.java
-ojluni/src/main/java/java/util/zip/DataFormatException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/DataFormatException.java
+ojluni/src/main/java/java/util/zip/DataFormatException.java,jdk17u/jdk-17.0.4-ga,src/java.base/share/classes/java/util/zip/DataFormatException.java
ojluni/src/main/java/java/util/zip/Deflater.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/Deflater.java
ojluni/src/main/java/java/util/zip/DeflaterInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/DeflaterInputStream.java
ojluni/src/main/java/java/util/zip/DeflaterOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
@@ -1214,8 +1214,8 @@
ojluni/src/main/java/java/util/zip/ZipConstants.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/ZipConstants.java
ojluni/src/main/java/java/util/zip/ZipConstants64.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/ZipConstants64.java
ojluni/src/main/java/java/util/zip/ZipEntry.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/ZipEntry.java
-ojluni/src/main/java/java/util/zip/ZipError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/ZipError.java
-ojluni/src/main/java/java/util/zip/ZipException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/ZipException.java
+ojluni/src/main/java/java/util/zip/ZipError.java,jdk17u/jdk-17.0.4-ga,src/java.base/share/classes/java/util/zip/ZipError.java
+ojluni/src/main/java/java/util/zip/ZipException.java,jdk17u/jdk-17.0.4-ga,src/java.base/share/classes/java/util/zip/ZipException.java
ojluni/src/main/java/java/util/zip/ZipFile.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/ZipFile.java
ojluni/src/main/java/java/util/zip/ZipInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/ZipInputStream.java
ojluni/src/main/java/java/util/zip/ZipOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/ZipOutputStream.java
diff --git a/ojluni/src/main/java/java/util/zip/DataFormatException.java b/ojluni/src/main/java/java/util/zip/DataFormatException.java
index a5639b3..cfb6eb6 100644
--- a/ojluni/src/main/java/java/util/zip/DataFormatException.java
+++ b/ojluni/src/main/java/java/util/zip/DataFormatException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,8 @@
* @author David Connelly
* @since 1.1
*/
-public
-class DataFormatException extends Exception {
+public class DataFormatException extends Exception {
+ @java.io.Serial
private static final long serialVersionUID = 2219632870893641452L;
/**
diff --git a/ojluni/src/main/java/java/util/zip/ZipError.java b/ojluni/src/main/java/java/util/zip/ZipError.java
index 2799c8e6..2aa37be 100644
--- a/ojluni/src/main/java/java/util/zip/ZipError.java
+++ b/ojluni/src/main/java/java/util/zip/ZipError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
* @since 1.6
*/
public class ZipError extends InternalError {
+ @java.io.Serial
private static final long serialVersionUID = 853973422266861979L;
/**
diff --git a/ojluni/src/main/java/java/util/zip/ZipException.java b/ojluni/src/main/java/java/util/zip/ZipException.java
index 588611f..45048a4 100644
--- a/ojluni/src/main/java/java/util/zip/ZipException.java
+++ b/ojluni/src/main/java/java/util/zip/ZipException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,16 @@
/**
* Signals that a Zip exception of some sort has occurred.
*
- * @author unascribed
* @see java.io.IOException
* @since 1.1
*/
-public
-class ZipException extends IOException {
+public class ZipException extends IOException {
+ @java.io.Serial
private static final long serialVersionUID = 8000196834066748623L;
/**
- * Constructs a <code>ZipException</code> with <code>null</code>
+ * Constructs a {@code ZipException} with {@code null}
* as its error detail message.
*/
public ZipException() {
@@ -48,7 +47,7 @@
}
/**
- * Constructs a <code>ZipException</code> with the specified detail
+ * Constructs a {@code ZipException} with the specified detail
* message.
*
* @param s the detail message.
