Merge changes from topic "method-handles-private-lookup-in"
* changes:
Tidying up the documentation for MethodHandles.privateLookupIn
Adding MethodHandles.privateLookupIn
diff --git a/EXPECTED_UPSTREAM b/EXPECTED_UPSTREAM
index 4f674a0..255ba9d 100644
--- a/EXPECTED_UPSTREAM
+++ b/EXPECTED_UPSTREAM
@@ -29,206 +29,206 @@
ojluni/src/main/java/java/beans/PropertyChangeListener.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/beans/PropertyChangeListener.java
ojluni/src/main/java/java/beans/PropertyChangeListenerProxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/beans/PropertyChangeListenerProxy.java
ojluni/src/main/java/java/beans/PropertyChangeSupport.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/beans/PropertyChangeSupport.java
-ojluni/src/main/java/java/io/Bits.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Bits.java
+ojluni/src/main/java/java/io/Bits.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Bits.java
ojluni/src/main/java/java/io/BufferedInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/BufferedInputStream.java
-ojluni/src/main/java/java/io/BufferedOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/BufferedOutputStream.java
+ojluni/src/main/java/java/io/BufferedOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/BufferedOutputStream.java
ojluni/src/main/java/java/io/BufferedReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/BufferedReader.java
-ojluni/src/main/java/java/io/BufferedWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/BufferedWriter.java
-ojluni/src/main/java/java/io/ByteArrayInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ByteArrayInputStream.java
-ojluni/src/main/java/java/io/ByteArrayOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ByteArrayOutputStream.java
-ojluni/src/main/java/java/io/CharArrayReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/CharArrayReader.java
-ojluni/src/main/java/java/io/CharArrayWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/CharArrayWriter.java
-ojluni/src/main/java/java/io/CharConversionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/CharConversionException.java
-ojluni/src/main/java/java/io/Closeable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Closeable.java
+ojluni/src/main/java/java/io/BufferedWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/BufferedWriter.java
+ojluni/src/main/java/java/io/ByteArrayInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ByteArrayInputStream.java
+ojluni/src/main/java/java/io/ByteArrayOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ByteArrayOutputStream.java
+ojluni/src/main/java/java/io/CharArrayReader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/CharArrayReader.java
+ojluni/src/main/java/java/io/CharArrayWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/CharArrayWriter.java
+ojluni/src/main/java/java/io/CharConversionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/CharConversionException.java
+ojluni/src/main/java/java/io/Closeable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Closeable.java
ojluni/src/main/java/java/io/Console.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/Console.java
-ojluni/src/main/java/java/io/DataInput.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/DataInput.java
-ojluni/src/main/java/java/io/DataInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/DataInputStream.java
-ojluni/src/main/java/java/io/DataOutput.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/DataOutput.java
-ojluni/src/main/java/java/io/DataOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/DataOutputStream.java
-ojluni/src/main/java/java/io/DefaultFileSystem.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/io/DefaultFileSystem.java
-ojluni/src/main/java/java/io/DeleteOnExitHook.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/DeleteOnExitHook.java
-ojluni/src/main/java/java/io/EOFException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/EOFException.java
-ojluni/src/main/java/java/io/ExpiringCache.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ExpiringCache.java
-ojluni/src/main/java/java/io/Externalizable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Externalizable.java
+ojluni/src/main/java/java/io/DataInput.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/DataInput.java
+ojluni/src/main/java/java/io/DataInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/DataInputStream.java
+ojluni/src/main/java/java/io/DataOutput.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/DataOutput.java
+ojluni/src/main/java/java/io/DataOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/DataOutputStream.java
+ojluni/src/main/java/java/io/DefaultFileSystem.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/java/io/DefaultFileSystem.java
+ojluni/src/main/java/java/io/DeleteOnExitHook.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/DeleteOnExitHook.java
+ojluni/src/main/java/java/io/EOFException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/EOFException.java
+ojluni/src/main/java/java/io/ExpiringCache.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ExpiringCache.java
+ojluni/src/main/java/java/io/Externalizable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Externalizable.java
ojluni/src/main/java/java/io/File.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/File.java
ojluni/src/main/java/java/io/FileDescriptor.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/io/FileDescriptor.java
-ojluni/src/main/java/java/io/FileFilter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FileFilter.java
+ojluni/src/main/java/java/io/FileFilter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FileFilter.java
ojluni/src/main/java/java/io/FileInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/FileInputStream.java
-ojluni/src/main/java/java/io/FileNotFoundException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FileNotFoundException.java
+ojluni/src/main/java/java/io/FileNotFoundException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FileNotFoundException.java
ojluni/src/main/java/java/io/FileOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/FileOutputStream.java
ojluni/src/main/java/java/io/FilePermission.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FilePermission.java
-ojluni/src/main/java/java/io/FileReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FileReader.java
+ojluni/src/main/java/java/io/FileReader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FileReader.java
ojluni/src/main/java/java/io/FileSystem.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/FileSystem.java
-ojluni/src/main/java/java/io/FileWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FileWriter.java
-ojluni/src/main/java/java/io/FilenameFilter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FilenameFilter.java
-ojluni/src/main/java/java/io/FilterInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FilterInputStream.java
-ojluni/src/main/java/java/io/FilterOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FilterOutputStream.java
-ojluni/src/main/java/java/io/FilterReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FilterReader.java
-ojluni/src/main/java/java/io/FilterWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/FilterWriter.java
-ojluni/src/main/java/java/io/Flushable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Flushable.java
-ojluni/src/main/java/java/io/IOError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/IOError.java
-ojluni/src/main/java/java/io/IOException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/IOException.java
-ojluni/src/main/java/java/io/InputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/InputStream.java
+ojluni/src/main/java/java/io/FileWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FileWriter.java
+ojluni/src/main/java/java/io/FilenameFilter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FilenameFilter.java
+ojluni/src/main/java/java/io/FilterInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FilterInputStream.java
+ojluni/src/main/java/java/io/FilterOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FilterOutputStream.java
+ojluni/src/main/java/java/io/FilterReader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FilterReader.java
+ojluni/src/main/java/java/io/FilterWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/FilterWriter.java
+ojluni/src/main/java/java/io/Flushable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Flushable.java
+ojluni/src/main/java/java/io/IOError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/IOError.java
+ojluni/src/main/java/java/io/IOException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/IOException.java
+ojluni/src/main/java/java/io/InputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/InputStream.java
ojluni/src/main/java/java/io/InputStreamReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/InputStreamReader.java
-ojluni/src/main/java/java/io/InterruptedIOException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/InterruptedIOException.java
-ojluni/src/main/java/java/io/InvalidClassException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/InvalidClassException.java
-ojluni/src/main/java/java/io/InvalidObjectException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/InvalidObjectException.java
-ojluni/src/main/java/java/io/LineNumberInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/LineNumberInputStream.java
+ojluni/src/main/java/java/io/InterruptedIOException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/InterruptedIOException.java
+ojluni/src/main/java/java/io/InvalidClassException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/InvalidClassException.java
+ojluni/src/main/java/java/io/InvalidObjectException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/InvalidObjectException.java
+ojluni/src/main/java/java/io/LineNumberInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/LineNumberInputStream.java
ojluni/src/main/java/java/io/LineNumberReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/LineNumberReader.java
-ojluni/src/main/java/java/io/NotActiveException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/NotActiveException.java
-ojluni/src/main/java/java/io/NotSerializableException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/NotSerializableException.java
-ojluni/src/main/java/java/io/ObjectInput.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ObjectInput.java
+ojluni/src/main/java/java/io/NotActiveException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/NotActiveException.java
+ojluni/src/main/java/java/io/NotSerializableException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/NotSerializableException.java
+ojluni/src/main/java/java/io/ObjectInput.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ObjectInput.java
ojluni/src/main/java/java/io/ObjectInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/ObjectInputStream.java
-ojluni/src/main/java/java/io/ObjectInputValidation.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ObjectInputValidation.java
-ojluni/src/main/java/java/io/ObjectOutput.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ObjectOutput.java
+ojluni/src/main/java/java/io/ObjectInputValidation.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ObjectInputValidation.java
+ojluni/src/main/java/java/io/ObjectOutput.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ObjectOutput.java
ojluni/src/main/java/java/io/ObjectOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/ObjectOutputStream.java
ojluni/src/main/java/java/io/ObjectStreamClass.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/ObjectStreamClass.java
ojluni/src/main/java/java/io/ObjectStreamConstants.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/ObjectStreamConstants.java
-ojluni/src/main/java/java/io/ObjectStreamException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/ObjectStreamException.java
+ojluni/src/main/java/java/io/ObjectStreamException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/ObjectStreamException.java
ojluni/src/main/java/java/io/ObjectStreamField.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/ObjectStreamField.java
-ojluni/src/main/java/java/io/OptionalDataException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/OptionalDataException.java
-ojluni/src/main/java/java/io/OutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/OutputStream.java
+ojluni/src/main/java/java/io/OptionalDataException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/OptionalDataException.java
+ojluni/src/main/java/java/io/OutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/OutputStream.java
ojluni/src/main/java/java/io/OutputStreamWriter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/OutputStreamWriter.java
-ojluni/src/main/java/java/io/PipedInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PipedInputStream.java
-ojluni/src/main/java/java/io/PipedOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PipedOutputStream.java
-ojluni/src/main/java/java/io/PipedReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PipedReader.java
-ojluni/src/main/java/java/io/PipedWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PipedWriter.java
-ojluni/src/main/java/java/io/PrintStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PrintStream.java
-ojluni/src/main/java/java/io/PrintWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PrintWriter.java
-ojluni/src/main/java/java/io/PushbackInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PushbackInputStream.java
-ojluni/src/main/java/java/io/PushbackReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/PushbackReader.java
+ojluni/src/main/java/java/io/PipedInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PipedInputStream.java
+ojluni/src/main/java/java/io/PipedOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PipedOutputStream.java
+ojluni/src/main/java/java/io/PipedReader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PipedReader.java
+ojluni/src/main/java/java/io/PipedWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PipedWriter.java
+ojluni/src/main/java/java/io/PrintStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PrintStream.java
+ojluni/src/main/java/java/io/PrintWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PrintWriter.java
+ojluni/src/main/java/java/io/PushbackInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PushbackInputStream.java
+ojluni/src/main/java/java/io/PushbackReader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/PushbackReader.java
ojluni/src/main/java/java/io/RandomAccessFile.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/RandomAccessFile.java
-ojluni/src/main/java/java/io/Reader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Reader.java
+ojluni/src/main/java/java/io/Reader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Reader.java
ojluni/src/main/java/java/io/SequenceInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/SequenceInputStream.java
ojluni/src/main/java/java/io/SerialCallbackContext.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/io/SerialCallbackContext.java
-ojluni/src/main/java/java/io/Serializable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Serializable.java
-ojluni/src/main/java/java/io/SerializablePermission.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/SerializablePermission.java
-ojluni/src/main/java/java/io/StreamCorruptedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/StreamCorruptedException.java
-ojluni/src/main/java/java/io/StreamTokenizer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/StreamTokenizer.java
-ojluni/src/main/java/java/io/StringBufferInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/StringBufferInputStream.java
-ojluni/src/main/java/java/io/StringReader.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/StringReader.java
-ojluni/src/main/java/java/io/StringWriter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/StringWriter.java
-ojluni/src/main/java/java/io/SyncFailedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/SyncFailedException.java
-ojluni/src/main/java/java/io/UTFDataFormatException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/UTFDataFormatException.java
-ojluni/src/main/java/java/io/UncheckedIOException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/UncheckedIOException.java
+ojluni/src/main/java/java/io/Serializable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Serializable.java
+ojluni/src/main/java/java/io/SerializablePermission.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/SerializablePermission.java
+ojluni/src/main/java/java/io/StreamCorruptedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/StreamCorruptedException.java
+ojluni/src/main/java/java/io/StreamTokenizer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/StreamTokenizer.java
+ojluni/src/main/java/java/io/StringBufferInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/StringBufferInputStream.java
+ojluni/src/main/java/java/io/StringReader.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/StringReader.java
+ojluni/src/main/java/java/io/StringWriter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/StringWriter.java
+ojluni/src/main/java/java/io/SyncFailedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/SyncFailedException.java
+ojluni/src/main/java/java/io/UTFDataFormatException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/UTFDataFormatException.java
+ojluni/src/main/java/java/io/UncheckedIOException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/UncheckedIOException.java
ojluni/src/main/java/java/io/UnixFileSystem.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/io/UnixFileSystem.java
-ojluni/src/main/java/java/io/UnsupportedEncodingException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/UnsupportedEncodingException.java
-ojluni/src/main/java/java/io/WriteAbortedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/WriteAbortedException.java
-ojluni/src/main/java/java/io/Writer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/io/Writer.java
-ojluni/src/main/java/java/lang/AbstractMethodError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/AbstractMethodError.java
+ojluni/src/main/java/java/io/UnsupportedEncodingException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/UnsupportedEncodingException.java
+ojluni/src/main/java/java/io/WriteAbortedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/WriteAbortedException.java
+ojluni/src/main/java/java/io/Writer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/io/Writer.java
+ojluni/src/main/java/java/lang/AbstractMethodError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/AbstractMethodError.java
ojluni/src/main/java/java/lang/AbstractStringBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/AbstractStringBuilder.java
-ojluni/src/main/java/java/lang/Appendable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Appendable.java
-ojluni/src/main/java/java/lang/ArithmeticException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ArithmeticException.java
-ojluni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java
-ojluni/src/main/java/java/lang/ArrayStoreException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ArrayStoreException.java
-ojluni/src/main/java/java/lang/AssertionError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/AssertionError.java
-ojluni/src/main/java/java/lang/AutoCloseable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/AutoCloseable.java
-ojluni/src/main/java/java/lang/Boolean.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Boolean.java
-ojluni/src/main/java/java/lang/BootstrapMethodError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/BootstrapMethodError.java
-ojluni/src/main/java/java/lang/Byte.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Byte.java
+ojluni/src/main/java/java/lang/Appendable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Appendable.java
+ojluni/src/main/java/java/lang/ArithmeticException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ArithmeticException.java
+ojluni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ArrayIndexOutOfBoundsException.java
+ojluni/src/main/java/java/lang/ArrayStoreException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ArrayStoreException.java
+ojluni/src/main/java/java/lang/AssertionError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/AssertionError.java
+ojluni/src/main/java/java/lang/AutoCloseable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/AutoCloseable.java
+ojluni/src/main/java/java/lang/Boolean.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Boolean.java
+ojluni/src/main/java/java/lang/BootstrapMethodError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/BootstrapMethodError.java
+ojluni/src/main/java/java/lang/Byte.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Byte.java
ojluni/src/main/java/java/lang/CharSequence.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/CharSequence.java
ojluni/src/main/java/java/lang/Character.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Character.java
ojluni/src/main/java/java/lang/Class.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Class.java
-ojluni/src/main/java/java/lang/ClassCastException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ClassCastException.java
-ojluni/src/main/java/java/lang/ClassCircularityError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ClassCircularityError.java
-ojluni/src/main/java/java/lang/ClassFormatError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ClassFormatError.java
+ojluni/src/main/java/java/lang/ClassCastException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ClassCastException.java
+ojluni/src/main/java/java/lang/ClassCircularityError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ClassCircularityError.java
+ojluni/src/main/java/java/lang/ClassFormatError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ClassFormatError.java
ojluni/src/main/java/java/lang/ClassLoader.java,jdk8u/jdk8u60-b31,jdk/src/share/classes/java/lang/ClassLoader.java
-ojluni/src/main/java/java/lang/ClassNotFoundException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ClassNotFoundException.java
-ojluni/src/main/java/java/lang/CloneNotSupportedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/CloneNotSupportedException.java
-ojluni/src/main/java/java/lang/Cloneable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Cloneable.java
-ojluni/src/main/java/java/lang/Comparable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Comparable.java
-ojluni/src/main/java/java/lang/Compiler.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Compiler.java
-ojluni/src/main/java/java/lang/Deprecated.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Deprecated.java
-ojluni/src/main/java/java/lang/Double.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Double.java
-ojluni/src/main/java/java/lang/Enum.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Enum.java
-ojluni/src/main/java/java/lang/EnumConstantNotPresentException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java
-ojluni/src/main/java/java/lang/Error.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Error.java
-ojluni/src/main/java/java/lang/Exception.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Exception.java
-ojluni/src/main/java/java/lang/ExceptionInInitializerError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
-ojluni/src/main/java/java/lang/Float.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Float.java
-ojluni/src/main/java/java/lang/FunctionalInterface.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/FunctionalInterface.java
-ojluni/src/main/java/java/lang/IllegalAccessError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalAccessError.java
-ojluni/src/main/java/java/lang/IllegalAccessException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalAccessException.java
-ojluni/src/main/java/java/lang/IllegalArgumentException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalArgumentException.java
-ojluni/src/main/java/java/lang/IllegalCallerException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalCallerException.java
-ojluni/src/main/java/java/lang/IllegalMonitorStateException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalMonitorStateException.java
-ojluni/src/main/java/java/lang/IllegalStateException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalStateException.java
-ojluni/src/main/java/java/lang/IllegalThreadStateException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IllegalThreadStateException.java
-ojluni/src/main/java/java/lang/IncompatibleClassChangeError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java
-ojluni/src/main/java/java/lang/IndexOutOfBoundsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java
-ojluni/src/main/java/java/lang/InheritableThreadLocal.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/InheritableThreadLocal.java
-ojluni/src/main/java/java/lang/InstantiationError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/InstantiationError.java
-ojluni/src/main/java/java/lang/InstantiationException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/InstantiationException.java
+ojluni/src/main/java/java/lang/ClassNotFoundException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ClassNotFoundException.java
+ojluni/src/main/java/java/lang/CloneNotSupportedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/CloneNotSupportedException.java
+ojluni/src/main/java/java/lang/Cloneable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Cloneable.java
+ojluni/src/main/java/java/lang/Comparable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Comparable.java
+ojluni/src/main/java/java/lang/Compiler.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Compiler.java
+ojluni/src/main/java/java/lang/Deprecated.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Deprecated.java
+ojluni/src/main/java/java/lang/Double.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Double.java
+ojluni/src/main/java/java/lang/Enum.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Enum.java
+ojluni/src/main/java/java/lang/EnumConstantNotPresentException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/EnumConstantNotPresentException.java
+ojluni/src/main/java/java/lang/Error.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Error.java
+ojluni/src/main/java/java/lang/Exception.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Exception.java
+ojluni/src/main/java/java/lang/ExceptionInInitializerError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
+ojluni/src/main/java/java/lang/Float.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Float.java
+ojluni/src/main/java/java/lang/FunctionalInterface.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/FunctionalInterface.java
+ojluni/src/main/java/java/lang/IllegalAccessError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalAccessError.java
+ojluni/src/main/java/java/lang/IllegalAccessException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalAccessException.java
+ojluni/src/main/java/java/lang/IllegalArgumentException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalArgumentException.java
+ojluni/src/main/java/java/lang/IllegalCallerException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalCallerException.java
+ojluni/src/main/java/java/lang/IllegalMonitorStateException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalMonitorStateException.java
+ojluni/src/main/java/java/lang/IllegalStateException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalStateException.java
+ojluni/src/main/java/java/lang/IllegalThreadStateException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IllegalThreadStateException.java
+ojluni/src/main/java/java/lang/IncompatibleClassChangeError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java
+ojluni/src/main/java/java/lang/IndexOutOfBoundsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/IndexOutOfBoundsException.java
+ojluni/src/main/java/java/lang/InheritableThreadLocal.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/InheritableThreadLocal.java
+ojluni/src/main/java/java/lang/InstantiationError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/InstantiationError.java
+ojluni/src/main/java/java/lang/InstantiationException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/InstantiationException.java
ojluni/src/main/java/java/lang/Integer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Integer.java
-ojluni/src/main/java/java/lang/InternalError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/InternalError.java
-ojluni/src/main/java/java/lang/InterruptedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/InterruptedException.java
-ojluni/src/main/java/java/lang/Iterable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Iterable.java
-ojluni/src/main/java/java/lang/LinkageError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/LinkageError.java
+ojluni/src/main/java/java/lang/InternalError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/InternalError.java
+ojluni/src/main/java/java/lang/InterruptedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/InterruptedException.java
+ojluni/src/main/java/java/lang/Iterable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Iterable.java
+ojluni/src/main/java/java/lang/LinkageError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/LinkageError.java
ojluni/src/main/java/java/lang/Long.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Long.java
ojluni/src/main/java/java/lang/Math.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Math.java
-ojluni/src/main/java/java/lang/NegativeArraySizeException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NegativeArraySizeException.java
-ojluni/src/main/java/java/lang/NoClassDefFoundError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NoClassDefFoundError.java
-ojluni/src/main/java/java/lang/NoSuchFieldError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NoSuchFieldError.java
-ojluni/src/main/java/java/lang/NoSuchFieldException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NoSuchFieldException.java
-ojluni/src/main/java/java/lang/NoSuchMethodError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NoSuchMethodError.java
-ojluni/src/main/java/java/lang/NoSuchMethodException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NoSuchMethodException.java
-ojluni/src/main/java/java/lang/NullPointerException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NullPointerException.java
-ojluni/src/main/java/java/lang/Number.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Number.java
-ojluni/src/main/java/java/lang/NumberFormatException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/NumberFormatException.java
+ojluni/src/main/java/java/lang/NegativeArraySizeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NegativeArraySizeException.java
+ojluni/src/main/java/java/lang/NoClassDefFoundError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NoClassDefFoundError.java
+ojluni/src/main/java/java/lang/NoSuchFieldError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NoSuchFieldError.java
+ojluni/src/main/java/java/lang/NoSuchFieldException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NoSuchFieldException.java
+ojluni/src/main/java/java/lang/NoSuchMethodError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NoSuchMethodError.java
+ojluni/src/main/java/java/lang/NoSuchMethodException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NoSuchMethodException.java
+ojluni/src/main/java/java/lang/NullPointerException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NullPointerException.java
+ojluni/src/main/java/java/lang/Number.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Number.java
+ojluni/src/main/java/java/lang/NumberFormatException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/NumberFormatException.java
ojluni/src/main/java/java/lang/Object.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Object.java
-ojluni/src/main/java/java/lang/OutOfMemoryError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/OutOfMemoryError.java
-ojluni/src/main/java/java/lang/Override.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Override.java
+ojluni/src/main/java/java/lang/OutOfMemoryError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/OutOfMemoryError.java
+ojluni/src/main/java/java/lang/Override.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Override.java
ojluni/src/main/java/java/lang/Package.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Package.java
ojluni/src/main/java/java/lang/Process.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Process.java
ojluni/src/main/java/java/lang/ProcessBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/ProcessBuilder.java
ojluni/src/main/java/java/lang/ProcessEnvironment.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/lang/ProcessEnvironment.java
ojluni/src/main/java/java/lang/ProcessImpl.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/lang/ProcessImpl.java
-ojluni/src/main/java/java/lang/Readable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Readable.java
-ojluni/src/main/java/java/lang/ReflectiveOperationException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ReflectiveOperationException.java
-ojluni/src/main/java/java/lang/Runnable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Runnable.java
+ojluni/src/main/java/java/lang/Readable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Readable.java
+ojluni/src/main/java/java/lang/ReflectiveOperationException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ReflectiveOperationException.java
+ojluni/src/main/java/java/lang/Runnable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Runnable.java
ojluni/src/main/java/java/lang/Runtime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/Runtime.java
-ojluni/src/main/java/java/lang/RuntimeException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/RuntimeException.java
-ojluni/src/main/java/java/lang/RuntimePermission.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/RuntimePermission.java
-ojluni/src/main/java/java/lang/SafeVarargs.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/SafeVarargs.java
-ojluni/src/main/java/java/lang/SecurityException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/SecurityException.java
-ojluni/src/main/java/java/lang/SecurityManager.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/SecurityManager.java
-ojluni/src/main/java/java/lang/Short.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Short.java
-ojluni/src/main/java/java/lang/StackOverflowError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/StackOverflowError.java
+ojluni/src/main/java/java/lang/RuntimeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/RuntimeException.java
+ojluni/src/main/java/java/lang/RuntimePermission.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/RuntimePermission.java
+ojluni/src/main/java/java/lang/SafeVarargs.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/SafeVarargs.java
+ojluni/src/main/java/java/lang/SecurityException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/SecurityException.java
+ojluni/src/main/java/java/lang/SecurityManager.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/SecurityManager.java
+ojluni/src/main/java/java/lang/Short.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Short.java
+ojluni/src/main/java/java/lang/StackOverflowError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/StackOverflowError.java
ojluni/src/main/java/java/lang/StackTraceElement.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/StackTraceElement.java
ojluni/src/main/java/java/lang/StrictMath.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/StrictMath.java
ojluni/src/main/java/java/lang/String.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/String.java
ojluni/src/main/java/java/lang/StringBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/StringBuffer.java
ojluni/src/main/java/java/lang/StringBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/StringBuilder.java
-ojluni/src/main/java/java/lang/StringIndexOutOfBoundsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java
+ojluni/src/main/java/java/lang/StringIndexOutOfBoundsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java
ojluni/src/main/java/java/lang/SuppressWarnings.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/SuppressWarnings.java
ojluni/src/main/java/java/lang/System.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/System.java
ojluni/src/main/java/java/lang/Thread.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Thread.java
-ojluni/src/main/java/java/lang/ThreadDeath.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ThreadDeath.java
+ojluni/src/main/java/java/lang/ThreadDeath.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ThreadDeath.java
ojluni/src/main/java/java/lang/ThreadGroup.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/ThreadGroup.java
ojluni/src/main/java/java/lang/ThreadLocal.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/ThreadLocal.java
ojluni/src/main/java/java/lang/Throwable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Throwable.java
-ojluni/src/main/java/java/lang/TypeNotPresentException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/TypeNotPresentException.java
+ojluni/src/main/java/java/lang/TypeNotPresentException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/TypeNotPresentException.java
ojluni/src/main/java/java/lang/UNIXProcess.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/lang/UNIXProcess.java
-ojluni/src/main/java/java/lang/UnknownError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/UnknownError.java
-ojluni/src/main/java/java/lang/UnsatisfiedLinkError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java
-ojluni/src/main/java/java/lang/UnsupportedClassVersionError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java
-ojluni/src/main/java/java/lang/UnsupportedOperationException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/UnsupportedOperationException.java
-ojluni/src/main/java/java/lang/VerifyError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/VerifyError.java
-ojluni/src/main/java/java/lang/VirtualMachineError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/VirtualMachineError.java
-ojluni/src/main/java/java/lang/Void.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/Void.java
-ojluni/src/main/java/java/lang/annotation/Annotation.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Annotation.java
-ojluni/src/main/java/java/lang/annotation/AnnotationFormatError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java
-ojluni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
-ojluni/src/main/java/java/lang/annotation/Documented.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Documented.java
-ojluni/src/main/java/java/lang/annotation/ElementType.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/ElementType.java
-ojluni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java
-ojluni/src/main/java/java/lang/annotation/Inherited.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Inherited.java
-ojluni/src/main/java/java/lang/annotation/Native.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Native.java
-ojluni/src/main/java/java/lang/annotation/Repeatable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Repeatable.java
-ojluni/src/main/java/java/lang/annotation/Retention.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Retention.java
-ojluni/src/main/java/java/lang/annotation/RetentionPolicy.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java
-ojluni/src/main/java/java/lang/annotation/Target.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/Target.java
-ojluni/src/main/java/java/lang/annotation/package-info.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/annotation/package-info.java
+ojluni/src/main/java/java/lang/UnknownError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/UnknownError.java
+ojluni/src/main/java/java/lang/UnsatisfiedLinkError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java
+ojluni/src/main/java/java/lang/UnsupportedClassVersionError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java
+ojluni/src/main/java/java/lang/UnsupportedOperationException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/UnsupportedOperationException.java
+ojluni/src/main/java/java/lang/VerifyError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/VerifyError.java
+ojluni/src/main/java/java/lang/VirtualMachineError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/VirtualMachineError.java
+ojluni/src/main/java/java/lang/Void.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/Void.java
+ojluni/src/main/java/java/lang/annotation/Annotation.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Annotation.java
+ojluni/src/main/java/java/lang/annotation/AnnotationFormatError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/AnnotationFormatError.java
+ojluni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
+ojluni/src/main/java/java/lang/annotation/Documented.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Documented.java
+ojluni/src/main/java/java/lang/annotation/ElementType.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/ElementType.java
+ojluni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java
+ojluni/src/main/java/java/lang/annotation/Inherited.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Inherited.java
+ojluni/src/main/java/java/lang/annotation/Native.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Native.java
+ojluni/src/main/java/java/lang/annotation/Repeatable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Repeatable.java
+ojluni/src/main/java/java/lang/annotation/Retention.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Retention.java
+ojluni/src/main/java/java/lang/annotation/RetentionPolicy.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/RetentionPolicy.java
+ojluni/src/main/java/java/lang/annotation/Target.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/Target.java
+ojluni/src/main/java/java/lang/annotation/package-info.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/annotation/package-info.java
ojluni/src/main/java/java/lang/invoke/CallSite.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/invoke/CallSite.java
ojluni/src/main/java/java/lang/invoke/ConstantCallSite.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java
ojluni/src/main/java/java/lang/invoke/LambdaConversionException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java
@@ -245,69 +245,69 @@
# java.lang.invoke.Transformers isn't in the upstream OpenJDK
ojluni/src/main/java/java/lang/invoke/VarHandle.java,jdk9/jdk-9+181,jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java
ojluni/src/main/java/java/lang/invoke/VolatileCallSite.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/invoke/VolatileCallSite.java
-ojluni/src/main/java/java/lang/invoke/WrongMethodTypeException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/invoke/WrongMethodTypeException.java
-ojluni/src/main/java/java/lang/package-info.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/package-info.java
-ojluni/src/main/java/java/lang/ref/PhantomReference.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ref/PhantomReference.java
+ojluni/src/main/java/java/lang/invoke/WrongMethodTypeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java
+ojluni/src/main/java/java/lang/package-info.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/package-info.java
+ojluni/src/main/java/java/lang/ref/PhantomReference.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ref/PhantomReference.java
ojluni/src/main/java/java/lang/ref/Reference.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/ref/Reference.java
ojluni/src/main/java/java/lang/ref/ReferenceQueue.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/ref/ReferenceQueue.java
-ojluni/src/main/java/java/lang/ref/SoftReference.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ref/SoftReference.java
-ojluni/src/main/java/java/lang/ref/WeakReference.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/ref/WeakReference.java
+ojluni/src/main/java/java/lang/ref/SoftReference.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ref/SoftReference.java
+ojluni/src/main/java/java/lang/ref/WeakReference.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/ref/WeakReference.java
ojluni/src/main/java/java/lang/reflect/AccessibleObject.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
-ojluni/src/main/java/java/lang/reflect/AnnotatedElement.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
-ojluni/src/main/java/java/lang/reflect/Array.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/Array.java
+ojluni/src/main/java/java/lang/reflect/AnnotatedElement.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java
+ojluni/src/main/java/java/lang/reflect/Array.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/Array.java
ojluni/src/main/java/java/lang/reflect/Constructor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/Constructor.java
ojluni/src/main/java/java/lang/reflect/Executable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/Executable.java
ojluni/src/main/java/java/lang/reflect/Field.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/lang/reflect/Field.java
-ojluni/src/main/java/java/lang/reflect/GenericArrayType.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/GenericArrayType.java
-ojluni/src/main/java/java/lang/reflect/GenericDeclaration.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
-ojluni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java
-ojluni/src/main/java/java/lang/reflect/InvocationHandler.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
-ojluni/src/main/java/java/lang/reflect/InvocationTargetException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
-ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
-ojluni/src/main/java/java/lang/reflect/MalformedParametersException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
-ojluni/src/main/java/java/lang/reflect/Member.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/Member.java
+ojluni/src/main/java/java/lang/reflect/GenericArrayType.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/GenericArrayType.java
+ojluni/src/main/java/java/lang/reflect/GenericDeclaration.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
+ojluni/src/main/java/java/lang/reflect/GenericSignatureFormatError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/GenericSignatureFormatError.java
+ojluni/src/main/java/java/lang/reflect/InvocationHandler.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
+ojluni/src/main/java/java/lang/reflect/InvocationTargetException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java
+ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+ojluni/src/main/java/java/lang/reflect/MalformedParametersException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/MalformedParametersException.java
+ojluni/src/main/java/java/lang/reflect/Member.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/Member.java
ojluni/src/main/java/java/lang/reflect/Method.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/Method.java
-ojluni/src/main/java/java/lang/reflect/Modifier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/Modifier.java
-ojluni/src/main/java/java/lang/reflect/Parameter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/Parameter.java
-ojluni/src/main/java/java/lang/reflect/ParameterizedType.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/ParameterizedType.java
+ojluni/src/main/java/java/lang/reflect/Modifier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/Modifier.java
+ojluni/src/main/java/java/lang/reflect/Parameter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/Parameter.java
+ojluni/src/main/java/java/lang/reflect/ParameterizedType.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/ParameterizedType.java
ojluni/src/main/java/java/lang/reflect/Proxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/Proxy.java
-ojluni/src/main/java/java/lang/reflect/ReflectPermission.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
-ojluni/src/main/java/java/lang/reflect/Type.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/Type.java
-ojluni/src/main/java/java/lang/reflect/TypeVariable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/TypeVariable.java
-ojluni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
+ojluni/src/main/java/java/lang/reflect/ReflectPermission.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/ReflectPermission.java
+ojluni/src/main/java/java/lang/reflect/Type.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/Type.java
+ojluni/src/main/java/java/lang/reflect/TypeVariable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/TypeVariable.java
+ojluni/src/main/java/java/lang/reflect/UndeclaredThrowableException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java
ojluni/src/main/java/java/lang/reflect/WeakCache.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/WeakCache.java
-ojluni/src/main/java/java/lang/reflect/WildcardType.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/lang/reflect/WildcardType.java
+ojluni/src/main/java/java/lang/reflect/WildcardType.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/lang/reflect/WildcardType.java
ojluni/src/main/java/java/lang/reflect/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/lang/reflect/package-info.java
ojluni/src/main/java/java/math/BigDecimal.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/BigDecimal.java
ojluni/src/main/java/java/math/BigInteger.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/BigInteger.java
-ojluni/src/main/java/java/math/BitSieve.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/BitSieve.java
-ojluni/src/main/java/java/math/MathContext.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/MathContext.java
+ojluni/src/main/java/java/math/BitSieve.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/math/BitSieve.java
+ojluni/src/main/java/java/math/MathContext.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/math/MathContext.java
ojluni/src/main/java/java/math/MutableBigInteger.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/MutableBigInteger.java
-ojluni/src/main/java/java/math/RoundingMode.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/RoundingMode.java
-ojluni/src/main/java/java/math/SignedMutableBigInteger.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/SignedMutableBigInteger.java
-ojluni/src/main/java/java/math/package-info.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/math/package-info.java
+ojluni/src/main/java/java/math/RoundingMode.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/math/RoundingMode.java
+ojluni/src/main/java/java/math/SignedMutableBigInteger.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/math/SignedMutableBigInteger.java
+ojluni/src/main/java/java/math/package-info.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/math/package-info.java
ojluni/src/main/java/java/net/AbstractPlainDatagramSocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
ojluni/src/main/java/java/net/Authenticator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/Authenticator.java
ojluni/src/main/java/java/net/BindException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/BindException.java
-ojluni/src/main/java/java/net/CacheRequest.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/CacheRequest.java
-ojluni/src/main/java/java/net/CacheResponse.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/CacheResponse.java
+ojluni/src/main/java/java/net/CacheRequest.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/CacheRequest.java
+ojluni/src/main/java/java/net/CacheResponse.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/CacheResponse.java
ojluni/src/main/java/java/net/ConnectException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ConnectException.java
ojluni/src/main/java/java/net/ContentHandler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ContentHandler.java
ojluni/src/main/java/java/net/ContentHandlerFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ContentHandlerFactory.java
ojluni/src/main/java/java/net/CookieHandler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/CookieHandler.java
ojluni/src/main/java/java/net/CookieManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/CookieManager.java
-ojluni/src/main/java/java/net/CookiePolicy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/CookiePolicy.java
-ojluni/src/main/java/java/net/CookieStore.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/CookieStore.java
+ojluni/src/main/java/java/net/CookiePolicy.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/CookiePolicy.java
+ojluni/src/main/java/java/net/CookieStore.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/CookieStore.java
ojluni/src/main/java/java/net/DatagramPacket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/DatagramPacket.java
ojluni/src/main/java/java/net/DatagramSocket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/DatagramSocket.java
ojluni/src/main/java/java/net/DatagramSocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/DatagramSocketImpl.java
-ojluni/src/main/java/java/net/DatagramSocketImplFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/DatagramSocketImplFactory.java
+ojluni/src/main/java/java/net/DatagramSocketImplFactory.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/DatagramSocketImplFactory.java
ojluni/src/main/java/java/net/DefaultDatagramSocketImplFactory.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java
-ojluni/src/main/java/java/net/DefaultInterface.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/net/DefaultInterface.java
+ojluni/src/main/java/java/net/DefaultInterface.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/java/net/DefaultInterface.java
ojluni/src/main/java/java/net/FileNameMap.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/FileNameMap.java
ojluni/src/main/java/java/net/HttpCookie.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/HttpCookie.java
-ojluni/src/main/java/java/net/HttpRetryException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/HttpRetryException.java
+ojluni/src/main/java/java/net/HttpRetryException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/HttpRetryException.java
ojluni/src/main/java/java/net/HttpURLConnection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/HttpURLConnection.java
ojluni/src/main/java/java/net/IDN.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/IDN.java
ojluni/src/main/java/java/net/InMemoryCookieStore.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/InMemoryCookieStore.java
@@ -315,42 +315,42 @@
ojluni/src/main/java/java/net/Inet6Address.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/Inet6Address.java
ojluni/src/main/java/java/net/Inet6AddressImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/Inet6AddressImpl.java
ojluni/src/main/java/java/net/InetAddress.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/InetAddress.java
-ojluni/src/main/java/java/net/InetAddressContainer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/InetAddressContainer.java
-ojluni/src/main/java/java/net/InetAddressImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/InetAddressImpl.java
+ojluni/src/main/java/java/net/InetAddressContainer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/InetAddressContainer.java
+ojluni/src/main/java/java/net/InetAddressImpl.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/InetAddressImpl.java
ojluni/src/main/java/java/net/InetSocketAddress.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/InetSocketAddress.java
-ojluni/src/main/java/java/net/InterfaceAddress.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/InterfaceAddress.java
+ojluni/src/main/java/java/net/InterfaceAddress.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/InterfaceAddress.java
ojluni/src/main/java/java/net/JarURLConnection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/JarURLConnection.java
ojluni/src/main/java/java/net/MalformedURLException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/MalformedURLException.java
ojluni/src/main/java/java/net/MulticastSocket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/MulticastSocket.java
ojluni/src/main/java/java/net/NetPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/NetPermission.java
ojluni/src/main/java/java/net/NetworkInterface.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/NetworkInterface.java
ojluni/src/main/java/java/net/NoRouteToHostException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/NoRouteToHostException.java
-ojluni/src/main/java/java/net/PasswordAuthentication.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/PasswordAuthentication.java
+ojluni/src/main/java/java/net/PasswordAuthentication.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/PasswordAuthentication.java
ojluni/src/main/java/java/net/PlainDatagramSocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/net/PlainDatagramSocketImpl.java
ojluni/src/main/java/java/net/PlainSocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/net/PlainSocketImpl.java
-ojluni/src/main/java/java/net/PortUnreachableException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/PortUnreachableException.java
+ojluni/src/main/java/java/net/PortUnreachableException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/PortUnreachableException.java
ojluni/src/main/java/java/net/ProtocolException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ProtocolException.java
-ojluni/src/main/java/java/net/ProtocolFamily.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ProtocolFamily.java
+ojluni/src/main/java/java/net/ProtocolFamily.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/ProtocolFamily.java
ojluni/src/main/java/java/net/Proxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/Proxy.java
ojluni/src/main/java/java/net/ProxySelector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ProxySelector.java
ojluni/src/main/java/java/net/ResponseCache.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ResponseCache.java
-ojluni/src/main/java/java/net/SecureCacheResponse.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SecureCacheResponse.java
+ojluni/src/main/java/java/net/SecureCacheResponse.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/SecureCacheResponse.java
ojluni/src/main/java/java/net/ServerSocket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/ServerSocket.java
ojluni/src/main/java/java/net/Socket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/Socket.java
-ojluni/src/main/java/java/net/SocketAddress.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketAddress.java
+ojluni/src/main/java/java/net/SocketAddress.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/SocketAddress.java
ojluni/src/main/java/java/net/SocketException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketException.java
ojluni/src/main/java/java/net/SocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketImpl.java
ojluni/src/main/java/java/net/SocketImplFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketImplFactory.java
ojluni/src/main/java/java/net/SocketInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketInputStream.java
-ojluni/src/main/java/java/net/SocketOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketOption.java
+ojluni/src/main/java/java/net/SocketOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/SocketOption.java
ojluni/src/main/java/java/net/SocketOptions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketOptions.java
ojluni/src/main/java/java/net/SocketOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketOutputStream.java
ojluni/src/main/java/java/net/SocketPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketPermission.java
ojluni/src/main/java/java/net/SocketSecrets.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketSecrets.java
-ojluni/src/main/java/java/net/SocketTimeoutException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocketTimeoutException.java
-ojluni/src/main/java/java/net/SocksConsts.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocksConsts.java
+ojluni/src/main/java/java/net/SocketTimeoutException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/SocketTimeoutException.java
+ojluni/src/main/java/java/net/SocksConsts.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/SocksConsts.java
ojluni/src/main/java/java/net/SocksSocketImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/SocksSocketImpl.java
-ojluni/src/main/java/java/net/StandardProtocolFamily.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/StandardProtocolFamily.java
+ojluni/src/main/java/java/net/StandardProtocolFamily.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/net/StandardProtocolFamily.java
ojluni/src/main/java/java/net/StandardSocketOptions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/StandardSocketOptions.java
ojluni/src/main/java/java/net/URI.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/URI.java
ojluni/src/main/java/java/net/URISyntaxException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/net/URISyntaxException.java
@@ -368,146 +368,146 @@
ojluni/src/main/java/java/nio/Bits.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/Bits.java
ojluni/src/main/java/java/nio/Buffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/Buffer.java
ojluni/src/main/java/java/nio/ByteOrder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/ByteOrder.java
-ojluni/src/main/java/java/nio/CharBufferSpliterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/CharBufferSpliterator.java
+ojluni/src/main/java/java/nio/CharBufferSpliterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/CharBufferSpliterator.java
ojluni/src/main/java/java/nio/MappedByteBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/MappedByteBuffer.java
ojluni/src/main/java/java/nio/StringCharBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/StringCharBuffer.java
ojluni/src/main/java/java/nio/channels/AsynchronousByteChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
-ojluni/src/main/java/java/nio/channels/AsynchronousChannel.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java
+ojluni/src/main/java/java/nio/channels/AsynchronousChannel.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/AsynchronousChannel.java
ojluni/src/main/java/java/nio/channels/AsynchronousChannelGroup.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
ojluni/src/main/java/java/nio/channels/AsynchronousFileChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
ojluni/src/main/java/java/nio/channels/AsynchronousServerSocketChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
ojluni/src/main/java/java/nio/channels/AsynchronousSocketChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
-ojluni/src/main/java/java/nio/channels/ByteChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/ByteChannel.java
+ojluni/src/main/java/java/nio/channels/ByteChannel.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/ByteChannel.java
ojluni/src/main/java/java/nio/channels/Channel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/Channel.java
ojluni/src/main/java/java/nio/channels/Channels.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/Channels.java
-ojluni/src/main/java/java/nio/channels/CompletionHandler.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/CompletionHandler.java
+ojluni/src/main/java/java/nio/channels/CompletionHandler.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/CompletionHandler.java
ojluni/src/main/java/java/nio/channels/DatagramChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/DatagramChannel.java
ojluni/src/main/java/java/nio/channels/FileChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/FileChannel.java
ojluni/src/main/java/java/nio/channels/FileLock.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/FileLock.java
ojluni/src/main/java/java/nio/channels/GatheringByteChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/GatheringByteChannel.java
ojluni/src/main/java/java/nio/channels/InterruptibleChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/InterruptibleChannel.java
-ojluni/src/main/java/java/nio/channels/MembershipKey.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/MembershipKey.java
+ojluni/src/main/java/java/nio/channels/MembershipKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/MembershipKey.java
ojluni/src/main/java/java/nio/channels/MulticastChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/MulticastChannel.java
-ojluni/src/main/java/java/nio/channels/NetworkChannel.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/NetworkChannel.java
+ojluni/src/main/java/java/nio/channels/NetworkChannel.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/NetworkChannel.java
ojluni/src/main/java/java/nio/channels/Pipe.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/Pipe.java
ojluni/src/main/java/java/nio/channels/ReadableByteChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/ReadableByteChannel.java
ojluni/src/main/java/java/nio/channels/ScatteringByteChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/ScatteringByteChannel.java
-ojluni/src/main/java/java/nio/channels/SeekableByteChannel.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java
+ojluni/src/main/java/java/nio/channels/SeekableByteChannel.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/SeekableByteChannel.java
ojluni/src/main/java/java/nio/channels/SelectableChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/SelectableChannel.java
-ojluni/src/main/java/java/nio/channels/SelectionKey.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/SelectionKey.java
+ojluni/src/main/java/java/nio/channels/SelectionKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/SelectionKey.java
ojluni/src/main/java/java/nio/channels/Selector.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/Selector.java
ojluni/src/main/java/java/nio/channels/ServerSocketChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/ServerSocketChannel.java
ojluni/src/main/java/java/nio/channels/SocketChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/SocketChannel.java
ojluni/src/main/java/java/nio/channels/WritableByteChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/WritableByteChannel.java
ojluni/src/main/java/java/nio/channels/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/package-info.java
ojluni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
-ojluni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
-ojluni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
-ojluni/src/main/java/java/nio/channels/spi/AbstractSelector.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
-ojluni/src/main/java/java/nio/channels/spi/AsynchronousChannelProvider.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
-ojluni/src/main/java/java/nio/channels/spi/SelectorProvider.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
+ojluni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
+ojluni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
+ojluni/src/main/java/java/nio/channels/spi/AbstractSelector.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
+ojluni/src/main/java/java/nio/channels/spi/AsynchronousChannelProvider.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
+ojluni/src/main/java/java/nio/channels/spi/SelectorProvider.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
ojluni/src/main/java/java/nio/charset/Charset.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/Charset.java
-ojluni/src/main/java/java/nio/charset/CoderMalfunctionError.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/CoderMalfunctionError.java
+ojluni/src/main/java/java/nio/charset/CoderMalfunctionError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/charset/CoderMalfunctionError.java
ojluni/src/main/java/java/nio/charset/CoderResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/CoderResult.java
-ojluni/src/main/java/java/nio/charset/CodingErrorAction.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/CodingErrorAction.java
-ojluni/src/main/java/java/nio/charset/MalformedInputException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/MalformedInputException.java
+ojluni/src/main/java/java/nio/charset/CodingErrorAction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/charset/CodingErrorAction.java
+ojluni/src/main/java/java/nio/charset/MalformedInputException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/charset/MalformedInputException.java
ojluni/src/main/java/java/nio/charset/StandardCharsets.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/StandardCharsets.java
-ojluni/src/main/java/java/nio/charset/UnmappableCharacterException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java
+ojluni/src/main/java/java/nio/charset/UnmappableCharacterException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java
ojluni/src/main/java/java/nio/charset/spi/CharsetProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/charset/spi/CharsetProvider.java
-ojluni/src/main/java/java/nio/file/AccessDeniedException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/AccessDeniedException.java
-ojluni/src/main/java/java/nio/file/AccessMode.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/AccessMode.java
-ojluni/src/main/java/java/nio/file/AtomicMoveNotSupportedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java
-ojluni/src/main/java/java/nio/file/ClosedDirectoryStreamException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java
-ojluni/src/main/java/java/nio/file/ClosedFileSystemException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java
-ojluni/src/main/java/java/nio/file/ClosedWatchServiceException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java
-ojluni/src/main/java/java/nio/file/CopyMoveHelper.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/CopyMoveHelper.java
-ojluni/src/main/java/java/nio/file/CopyOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/CopyOption.java
-ojluni/src/main/java/java/nio/file/DirectoryIteratorException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/DirectoryIteratorException.java
-ojluni/src/main/java/java/nio/file/DirectoryNotEmptyException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/DirectoryNotEmptyException.java
-ojluni/src/main/java/java/nio/file/DirectoryStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/DirectoryStream.java
-ojluni/src/main/java/java/nio/file/FileAlreadyExistsException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileAlreadyExistsException.java
+ojluni/src/main/java/java/nio/file/AccessDeniedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/AccessDeniedException.java
+ojluni/src/main/java/java/nio/file/AccessMode.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/AccessMode.java
+ojluni/src/main/java/java/nio/file/AtomicMoveNotSupportedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/AtomicMoveNotSupportedException.java
+ojluni/src/main/java/java/nio/file/ClosedDirectoryStreamException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/ClosedDirectoryStreamException.java
+ojluni/src/main/java/java/nio/file/ClosedFileSystemException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/ClosedFileSystemException.java
+ojluni/src/main/java/java/nio/file/ClosedWatchServiceException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/ClosedWatchServiceException.java
+ojluni/src/main/java/java/nio/file/CopyMoveHelper.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/CopyMoveHelper.java
+ojluni/src/main/java/java/nio/file/CopyOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/CopyOption.java
+ojluni/src/main/java/java/nio/file/DirectoryIteratorException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/DirectoryIteratorException.java
+ojluni/src/main/java/java/nio/file/DirectoryNotEmptyException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/DirectoryNotEmptyException.java
+ojluni/src/main/java/java/nio/file/DirectoryStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/DirectoryStream.java
+ojluni/src/main/java/java/nio/file/FileAlreadyExistsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileAlreadyExistsException.java
ojluni/src/main/java/java/nio/file/FileStore.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileStore.java
-ojluni/src/main/java/java/nio/file/FileSystem.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/FileSystem.java
-ojluni/src/main/java/java/nio/file/FileSystemAlreadyExistsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java
-ojluni/src/main/java/java/nio/file/FileSystemException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileSystemException.java
-ojluni/src/main/java/java/nio/file/FileSystemLoopException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileSystemLoopException.java
-ojluni/src/main/java/java/nio/file/FileSystemNotFoundException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java
+ojluni/src/main/java/java/nio/file/FileSystem.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileSystem.java
+ojluni/src/main/java/java/nio/file/FileSystemAlreadyExistsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileSystemAlreadyExistsException.java
+ojluni/src/main/java/java/nio/file/FileSystemException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileSystemException.java
+ojluni/src/main/java/java/nio/file/FileSystemLoopException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileSystemLoopException.java
+ojluni/src/main/java/java/nio/file/FileSystemNotFoundException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileSystemNotFoundException.java
ojluni/src/main/java/java/nio/file/FileSystems.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileSystems.java
-ojluni/src/main/java/java/nio/file/FileTreeIterator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/FileTreeIterator.java
-ojluni/src/main/java/java/nio/file/FileTreeWalker.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/FileTreeWalker.java
-ojluni/src/main/java/java/nio/file/FileVisitOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileVisitOption.java
-ojluni/src/main/java/java/nio/file/FileVisitResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileVisitResult.java
-ojluni/src/main/java/java/nio/file/FileVisitor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/FileVisitor.java
+ojluni/src/main/java/java/nio/file/FileTreeIterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileTreeIterator.java
+ojluni/src/main/java/java/nio/file/FileTreeWalker.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileTreeWalker.java
+ojluni/src/main/java/java/nio/file/FileVisitOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileVisitOption.java
+ojluni/src/main/java/java/nio/file/FileVisitResult.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileVisitResult.java
+ojluni/src/main/java/java/nio/file/FileVisitor.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/FileVisitor.java
ojluni/src/main/java/java/nio/file/Files.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/Files.java
-ojluni/src/main/java/java/nio/file/InvalidPathException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/InvalidPathException.java
-ojluni/src/main/java/java/nio/file/LinkOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/LinkOption.java
+ojluni/src/main/java/java/nio/file/InvalidPathException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/InvalidPathException.java
+ojluni/src/main/java/java/nio/file/LinkOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/LinkOption.java
ojluni/src/main/java/java/nio/file/LinkPermission.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/LinkPermission.java
-ojluni/src/main/java/java/nio/file/NoSuchFileException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/NoSuchFileException.java
-ojluni/src/main/java/java/nio/file/NotDirectoryException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/NotDirectoryException.java
-ojluni/src/main/java/java/nio/file/NotLinkException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/NotLinkException.java
-ojluni/src/main/java/java/nio/file/OpenOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/OpenOption.java
+ojluni/src/main/java/java/nio/file/NoSuchFileException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/NoSuchFileException.java
+ojluni/src/main/java/java/nio/file/NotDirectoryException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/NotDirectoryException.java
+ojluni/src/main/java/java/nio/file/NotLinkException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/NotLinkException.java
+ojluni/src/main/java/java/nio/file/OpenOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/OpenOption.java
ojluni/src/main/java/java/nio/file/Path.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/Path.java
-ojluni/src/main/java/java/nio/file/PathMatcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/PathMatcher.java
+ojluni/src/main/java/java/nio/file/PathMatcher.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/PathMatcher.java
ojluni/src/main/java/java/nio/file/Paths.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/Paths.java
-ojluni/src/main/java/java/nio/file/ProviderMismatchException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/ProviderMismatchException.java
-ojluni/src/main/java/java/nio/file/ProviderNotFoundException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java
-ojluni/src/main/java/java/nio/file/ReadOnlyFileSystemException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java
-ojluni/src/main/java/java/nio/file/SecureDirectoryStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
-ojluni/src/main/java/java/nio/file/SimpleFileVisitor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java
-ojluni/src/main/java/java/nio/file/StandardCopyOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/StandardCopyOption.java
-ojluni/src/main/java/java/nio/file/StandardOpenOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/StandardOpenOption.java
-ojluni/src/main/java/java/nio/file/StandardWatchEventKinds.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/StandardWatchEventKinds.java
+ojluni/src/main/java/java/nio/file/ProviderMismatchException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/ProviderMismatchException.java
+ojluni/src/main/java/java/nio/file/ProviderNotFoundException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/ProviderNotFoundException.java
+ojluni/src/main/java/java/nio/file/ReadOnlyFileSystemException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/ReadOnlyFileSystemException.java
+ojluni/src/main/java/java/nio/file/SecureDirectoryStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/SecureDirectoryStream.java
+ojluni/src/main/java/java/nio/file/SimpleFileVisitor.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/SimpleFileVisitor.java
+ojluni/src/main/java/java/nio/file/StandardCopyOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/StandardCopyOption.java
+ojluni/src/main/java/java/nio/file/StandardOpenOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/StandardOpenOption.java
+ojluni/src/main/java/java/nio/file/StandardWatchEventKinds.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/StandardWatchEventKinds.java
ojluni/src/main/java/java/nio/file/TempFileHelper.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/TempFileHelper.java
-ojluni/src/main/java/java/nio/file/WatchEvent.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/WatchEvent.java
-ojluni/src/main/java/java/nio/file/WatchKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/WatchKey.java
-ojluni/src/main/java/java/nio/file/WatchService.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/WatchService.java
-ojluni/src/main/java/java/nio/file/Watchable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/Watchable.java
-ojluni/src/main/java/java/nio/file/attribute/AclEntry.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
-ojluni/src/main/java/java/nio/file/attribute/AclEntryFlag.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/AclEntryFlag.java
-ojluni/src/main/java/java/nio/file/attribute/AclEntryPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/AclEntryPermission.java
-ojluni/src/main/java/java/nio/file/attribute/AclEntryType.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/AclEntryType.java
-ojluni/src/main/java/java/nio/file/attribute/AclFileAttributeView.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/AttributeView.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/AttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/BasicFileAttributeView.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/BasicFileAttributes.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java
-ojluni/src/main/java/java/nio/file/attribute/DosFileAttributeView.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/DosFileAttributes.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/DosFileAttributes.java
-ojluni/src/main/java/java/nio/file/attribute/FileAttribute.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/FileAttribute.java
-ojluni/src/main/java/java/nio/file/attribute/FileAttributeView.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/FileAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/FileOwnerAttributeView.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/FileStoreAttributeView.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/FileTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/FileTime.java
-ojluni/src/main/java/java/nio/file/attribute/GroupPrincipal.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/GroupPrincipal.java
-ojluni/src/main/java/java/nio/file/attribute/PosixFileAttributeView.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/PosixFileAttributes.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java
-ojluni/src/main/java/java/nio/file/attribute/PosixFilePermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/PosixFilePermission.java
-ojluni/src/main/java/java/nio/file/attribute/PosixFilePermissions.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java
-ojluni/src/main/java/java/nio/file/attribute/UserDefinedFileAttributeView.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
-ojluni/src/main/java/java/nio/file/attribute/UserPrincipal.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/attribute/UserPrincipal.java
-ojluni/src/main/java/java/nio/file/attribute/UserPrincipalLookupService.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
-ojluni/src/main/java/java/nio/file/attribute/UserPrincipalNotFoundException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
+ojluni/src/main/java/java/nio/file/WatchEvent.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/WatchEvent.java
+ojluni/src/main/java/java/nio/file/WatchKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/WatchKey.java
+ojluni/src/main/java/java/nio/file/WatchService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/WatchService.java
+ojluni/src/main/java/java/nio/file/Watchable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/Watchable.java
+ojluni/src/main/java/java/nio/file/attribute/AclEntry.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/AclEntry.java
+ojluni/src/main/java/java/nio/file/attribute/AclEntryFlag.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/AclEntryFlag.java
+ojluni/src/main/java/java/nio/file/attribute/AclEntryPermission.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/AclEntryPermission.java
+ojluni/src/main/java/java/nio/file/attribute/AclEntryType.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/AclEntryType.java
+ojluni/src/main/java/java/nio/file/attribute/AclFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/AttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/AttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/BasicFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/BasicFileAttributes.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/BasicFileAttributes.java
+ojluni/src/main/java/java/nio/file/attribute/DosFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/DosFileAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/DosFileAttributes.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/DosFileAttributes.java
+ojluni/src/main/java/java/nio/file/attribute/FileAttribute.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/FileAttribute.java
+ojluni/src/main/java/java/nio/file/attribute/FileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/FileAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/FileOwnerAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/FileStoreAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/FileStoreAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/FileTime.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/FileTime.java
+ojluni/src/main/java/java/nio/file/attribute/GroupPrincipal.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/GroupPrincipal.java
+ojluni/src/main/java/java/nio/file/attribute/PosixFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/PosixFileAttributes.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributes.java
+ojluni/src/main/java/java/nio/file/attribute/PosixFilePermission.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/PosixFilePermission.java
+ojluni/src/main/java/java/nio/file/attribute/PosixFilePermissions.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/PosixFilePermissions.java
+ojluni/src/main/java/java/nio/file/attribute/UserDefinedFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
+ojluni/src/main/java/java/nio/file/attribute/UserPrincipal.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/UserPrincipal.java
+ojluni/src/main/java/java/nio/file/attribute/UserPrincipalLookupService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
+ojluni/src/main/java/java/nio/file/attribute/UserPrincipalNotFoundException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
ojluni/src/main/java/java/nio/file/spi/FileSystemProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/spi/FileSystemProvider.java
ojluni/src/main/java/java/nio/file/spi/FileTypeDetector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/nio/file/spi/FileTypeDetector.java
ojluni/src/main/java/java/security/AccessControlContext.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AccessControlContext.java
ojluni/src/main/java/java/security/AccessControlException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AccessControlException.java
ojluni/src/main/java/java/security/AccessController.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AccessController.java
-ojluni/src/main/java/java/security/AlgorithmConstraints.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AlgorithmConstraints.java
+ojluni/src/main/java/java/security/AlgorithmConstraints.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/AlgorithmConstraints.java
ojluni/src/main/java/java/security/AlgorithmParameterGenerator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java
ojluni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
ojluni/src/main/java/java/security/AlgorithmParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AlgorithmParameters.java
-ojluni/src/main/java/java/security/AlgorithmParametersSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AlgorithmParametersSpi.java
+ojluni/src/main/java/java/security/AlgorithmParametersSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/AlgorithmParametersSpi.java
ojluni/src/main/java/java/security/AllPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AllPermission.java
ojluni/src/main/java/java/security/AuthProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/AuthProvider.java
ojluni/src/main/java/java/security/BasicPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/BasicPermission.java
ojluni/src/main/java/java/security/Certificate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Certificate.java
ojluni/src/main/java/java/security/CodeSigner.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/CodeSigner.java
ojluni/src/main/java/java/security/CodeSource.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/CodeSource.java
-ojluni/src/main/java/java/security/CryptoPrimitive.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/CryptoPrimitive.java
+ojluni/src/main/java/java/security/CryptoPrimitive.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/CryptoPrimitive.java
ojluni/src/main/java/java/security/DigestException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/DigestException.java
ojluni/src/main/java/java/security/DigestInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/DigestInputStream.java
ojluni/src/main/java/java/security/DigestOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/DigestOutputStream.java
ojluni/src/main/java/java/security/DomainCombiner.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/DomainCombiner.java
-ojluni/src/main/java/java/security/DomainLoadStoreParameter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/DomainLoadStoreParameter.java
+ojluni/src/main/java/java/security/DomainLoadStoreParameter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/DomainLoadStoreParameter.java
ojluni/src/main/java/java/security/GeneralSecurityException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/GeneralSecurityException.java
ojluni/src/main/java/java/security/Guard.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Guard.java
ojluni/src/main/java/java/security/GuardedObject.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/GuardedObject.java
@@ -519,14 +519,14 @@
ojluni/src/main/java/java/security/Key.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Key.java
ojluni/src/main/java/java/security/KeyException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyException.java
ojluni/src/main/java/java/security/KeyFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyFactory.java
-ojluni/src/main/java/java/security/KeyFactorySpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyFactorySpi.java
+ojluni/src/main/java/java/security/KeyFactorySpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/KeyFactorySpi.java
ojluni/src/main/java/java/security/KeyManagementException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyManagementException.java
ojluni/src/main/java/java/security/KeyPair.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyPair.java
ojluni/src/main/java/java/security/KeyPairGenerator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyPairGenerator.java
ojluni/src/main/java/java/security/KeyPairGeneratorSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyPairGeneratorSpi.java
ojluni/src/main/java/java/security/KeyRep.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyRep.java
ojluni/src/main/java/java/security/KeyStore.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyStore.java
-ojluni/src/main/java/java/security/KeyStoreException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyStoreException.java
+ojluni/src/main/java/java/security/KeyStoreException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/KeyStoreException.java
ojluni/src/main/java/java/security/KeyStoreSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/KeyStoreSpi.java
ojluni/src/main/java/java/security/MessageDigest.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/MessageDigest.java
ojluni/src/main/java/java/security/MessageDigestSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/MessageDigestSpi.java
@@ -537,7 +537,7 @@
ojluni/src/main/java/java/security/PermissionCollection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/PermissionCollection.java
ojluni/src/main/java/java/security/Permissions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Permissions.java
ojluni/src/main/java/java/security/Policy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Policy.java
-ojluni/src/main/java/java/security/PolicySpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/PolicySpi.java
+ojluni/src/main/java/java/security/PolicySpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/PolicySpi.java
ojluni/src/main/java/java/security/Principal.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Principal.java
ojluni/src/main/java/java/security/PrivateKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/PrivateKey.java
ojluni/src/main/java/java/security/PrivilegedAction.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/PrivilegedAction.java
@@ -558,8 +558,8 @@
ojluni/src/main/java/java/security/SignedObject.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/SignedObject.java
ojluni/src/main/java/java/security/Signer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Signer.java
ojluni/src/main/java/java/security/Timestamp.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/Timestamp.java
-ojluni/src/main/java/java/security/UnrecoverableEntryException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/UnrecoverableEntryException.java
-ojluni/src/main/java/java/security/UnrecoverableKeyException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/UnrecoverableKeyException.java
+ojluni/src/main/java/java/security/UnrecoverableEntryException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/UnrecoverableEntryException.java
+ojluni/src/main/java/java/security/UnrecoverableKeyException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/UnrecoverableKeyException.java
ojluni/src/main/java/java/security/UnresolvedPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/UnresolvedPermission.java
ojluni/src/main/java/java/security/UnresolvedPermissionCollection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
ojluni/src/main/java/java/security/acl/Acl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/acl/Acl.java
@@ -574,24 +574,24 @@
ojluni/src/main/java/java/security/cert/CRL.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CRL.java
ojluni/src/main/java/java/security/cert/CRLException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CRLException.java
ojluni/src/main/java/java/security/cert/CRLReason.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CRLReason.java
-ojluni/src/main/java/java/security/cert/CRLSelector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CRLSelector.java
+ojluni/src/main/java/java/security/cert/CRLSelector.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CRLSelector.java
ojluni/src/main/java/java/security/cert/CertPath.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPath.java
ojluni/src/main/java/java/security/cert/CertPathBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathBuilder.java
-ojluni/src/main/java/java/security/cert/CertPathBuilderException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathBuilderException.java
-ojluni/src/main/java/java/security/cert/CertPathBuilderResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathBuilderResult.java
-ojluni/src/main/java/java/security/cert/CertPathBuilderSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java
-ojluni/src/main/java/java/security/cert/CertPathChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathChecker.java
+ojluni/src/main/java/java/security/cert/CertPathBuilderException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathBuilderException.java
+ojluni/src/main/java/java/security/cert/CertPathBuilderResult.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathBuilderResult.java
+ojluni/src/main/java/java/security/cert/CertPathBuilderSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathBuilderSpi.java
+ojluni/src/main/java/java/security/cert/CertPathChecker.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathChecker.java
ojluni/src/main/java/java/security/cert/CertPathHelperImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
-ojluni/src/main/java/java/security/cert/CertPathParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathParameters.java
+ojluni/src/main/java/java/security/cert/CertPathParameters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathParameters.java
ojluni/src/main/java/java/security/cert/CertPathValidator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathValidator.java
-ojluni/src/main/java/java/security/cert/CertPathValidatorException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
-ojluni/src/main/java/java/security/cert/CertPathValidatorResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathValidatorResult.java
-ojluni/src/main/java/java/security/cert/CertPathValidatorSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java
-ojluni/src/main/java/java/security/cert/CertSelector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertSelector.java
+ojluni/src/main/java/java/security/cert/CertPathValidatorException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathValidatorException.java
+ojluni/src/main/java/java/security/cert/CertPathValidatorResult.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathValidatorResult.java
+ojluni/src/main/java/java/security/cert/CertPathValidatorSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertPathValidatorSpi.java
+ojluni/src/main/java/java/security/cert/CertSelector.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertSelector.java
ojluni/src/main/java/java/security/cert/CertStore.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertStore.java
-ojluni/src/main/java/java/security/cert/CertStoreException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertStoreException.java
-ojluni/src/main/java/java/security/cert/CertStoreParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertStoreParameters.java
-ojluni/src/main/java/java/security/cert/CertStoreSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertStoreSpi.java
+ojluni/src/main/java/java/security/cert/CertStoreException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertStoreException.java
+ojluni/src/main/java/java/security/cert/CertStoreParameters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertStoreParameters.java
+ojluni/src/main/java/java/security/cert/CertStoreSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/CertStoreSpi.java
ojluni/src/main/java/java/security/cert/Certificate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/Certificate.java
ojluni/src/main/java/java/security/cert/CertificateEncodingException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertificateEncodingException.java
ojluni/src/main/java/java/security/cert/CertificateException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertificateException.java
@@ -602,16 +602,16 @@
ojluni/src/main/java/java/security/cert/CertificateParsingException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertificateParsingException.java
ojluni/src/main/java/java/security/cert/CertificateRevokedException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CertificateRevokedException.java
ojluni/src/main/java/java/security/cert/CollectionCertStoreParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java
-ojluni/src/main/java/java/security/cert/Extension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/Extension.java
+ojluni/src/main/java/java/security/cert/Extension.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/Extension.java
ojluni/src/main/java/java/security/cert/LDAPCertStoreParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java
ojluni/src/main/java/java/security/cert/PKIXBuilderParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java
ojluni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
-ojluni/src/main/java/java/security/cert/PKIXCertPathChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java
+ojluni/src/main/java/java/security/cert/PKIXCertPathChecker.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/PKIXCertPathChecker.java
ojluni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
ojluni/src/main/java/java/security/cert/PKIXParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXParameters.java
ojluni/src/main/java/java/security/cert/PKIXReason.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXReason.java
ojluni/src/main/java/java/security/cert/PKIXRevocationChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java
-ojluni/src/main/java/java/security/cert/PolicyNode.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PolicyNode.java
+ojluni/src/main/java/java/security/cert/PolicyNode.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/PolicyNode.java
ojluni/src/main/java/java/security/cert/PolicyQualifierInfo.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java
ojluni/src/main/java/java/security/cert/TrustAnchor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/cert/TrustAnchor.java
ojluni/src/main/java/java/security/cert/URICertStoreParameters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/cert/URICertStoreParameters.java
@@ -627,9 +627,9 @@
ojluni/src/main/java/java/security/interfaces/DSAParams.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/DSAParams.java
ojluni/src/main/java/java/security/interfaces/DSAPrivateKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/DSAPrivateKey.java
ojluni/src/main/java/java/security/interfaces/DSAPublicKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/DSAPublicKey.java
-ojluni/src/main/java/java/security/interfaces/ECKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/ECKey.java
-ojluni/src/main/java/java/security/interfaces/ECPrivateKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/ECPrivateKey.java
-ojluni/src/main/java/java/security/interfaces/ECPublicKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/ECPublicKey.java
+ojluni/src/main/java/java/security/interfaces/ECKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/interfaces/ECKey.java
+ojluni/src/main/java/java/security/interfaces/ECPrivateKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
+ojluni/src/main/java/java/security/interfaces/ECPublicKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
ojluni/src/main/java/java/security/interfaces/RSAKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/RSAKey.java
ojluni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
ojluni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
@@ -637,23 +637,23 @@
ojluni/src/main/java/java/security/interfaces/RSAPublicKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/RSAPublicKey.java
ojluni/src/main/java/java/security/interfaces/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/interfaces/package-info.java
ojluni/src/main/java/java/security/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/package-info.java
-ojluni/src/main/java/java/security/spec/AlgorithmParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/AlgorithmParameterSpec.java
-ojluni/src/main/java/java/security/spec/DSAParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/DSAParameterSpec.java
-ojluni/src/main/java/java/security/spec/DSAPrivateKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/DSAPrivateKeySpec.java
-ojluni/src/main/java/java/security/spec/DSAPublicKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/DSAPublicKeySpec.java
-ojluni/src/main/java/java/security/spec/ECField.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECField.java
-ojluni/src/main/java/java/security/spec/ECFieldF2m.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECFieldF2m.java
-ojluni/src/main/java/java/security/spec/ECFieldFp.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECFieldFp.java
+ojluni/src/main/java/java/security/spec/AlgorithmParameterSpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/AlgorithmParameterSpec.java
+ojluni/src/main/java/java/security/spec/DSAParameterSpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/DSAParameterSpec.java
+ojluni/src/main/java/java/security/spec/DSAPrivateKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/DSAPrivateKeySpec.java
+ojluni/src/main/java/java/security/spec/DSAPublicKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/DSAPublicKeySpec.java
+ojluni/src/main/java/java/security/spec/ECField.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECField.java
+ojluni/src/main/java/java/security/spec/ECFieldF2m.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECFieldF2m.java
+ojluni/src/main/java/java/security/spec/ECFieldFp.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECFieldFp.java
ojluni/src/main/java/java/security/spec/ECGenParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECGenParameterSpec.java
-ojluni/src/main/java/java/security/spec/ECParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECParameterSpec.java
-ojluni/src/main/java/java/security/spec/ECPoint.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECPoint.java
-ojluni/src/main/java/java/security/spec/ECPrivateKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECPrivateKeySpec.java
-ojluni/src/main/java/java/security/spec/ECPublicKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/ECPublicKeySpec.java
-ojluni/src/main/java/java/security/spec/EllipticCurve.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/EllipticCurve.java
+ojluni/src/main/java/java/security/spec/ECParameterSpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECParameterSpec.java
+ojluni/src/main/java/java/security/spec/ECPoint.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECPoint.java
+ojluni/src/main/java/java/security/spec/ECPrivateKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECPrivateKeySpec.java
+ojluni/src/main/java/java/security/spec/ECPublicKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/ECPublicKeySpec.java
+ojluni/src/main/java/java/security/spec/EllipticCurve.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/EllipticCurve.java
ojluni/src/main/java/java/security/spec/EncodedKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/EncodedKeySpec.java
ojluni/src/main/java/java/security/spec/InvalidKeySpecException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/InvalidKeySpecException.java
-ojluni/src/main/java/java/security/spec/InvalidParameterSpecException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/InvalidParameterSpecException.java
-ojluni/src/main/java/java/security/spec/KeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/KeySpec.java
+ojluni/src/main/java/java/security/spec/InvalidParameterSpecException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/InvalidParameterSpecException.java
+ojluni/src/main/java/java/security/spec/KeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/security/spec/KeySpec.java
ojluni/src/main/java/java/security/spec/MGF1ParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/MGF1ParameterSpec.java
ojluni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
ojluni/src/main/java/java/security/spec/PSSParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/security/spec/PSSParameterSpec.java
@@ -669,7 +669,7 @@
ojluni/src/main/java/java/sql/BatchUpdateException.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/BatchUpdateException.java
ojluni/src/main/java/java/sql/Blob.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Blob.java
ojluni/src/main/java/java/sql/CallableStatement.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/CallableStatement.java
-ojluni/src/main/java/java/sql/ClientInfoStatus.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/ClientInfoStatus.java
+ojluni/src/main/java/java/sql/ClientInfoStatus.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/ClientInfoStatus.java
ojluni/src/main/java/java/sql/Clob.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Clob.java
ojluni/src/main/java/java/sql/Connection.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Connection.java
ojluni/src/main/java/java/sql/DataTruncation.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/DataTruncation.java
@@ -679,15 +679,15 @@
ojluni/src/main/java/java/sql/DriverManager.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/DriverManager.java
ojluni/src/main/java/java/sql/DriverPropertyInfo.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/DriverPropertyInfo.java
ojluni/src/main/java/java/sql/NClob.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/NClob.java
-ojluni/src/main/java/java/sql/ParameterMetaData.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/ParameterMetaData.java
+ojluni/src/main/java/java/sql/ParameterMetaData.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/ParameterMetaData.java
ojluni/src/main/java/java/sql/PreparedStatement.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/PreparedStatement.java
-ojluni/src/main/java/java/sql/Ref.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Ref.java
+ojluni/src/main/java/java/sql/Ref.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/Ref.java
ojluni/src/main/java/java/sql/ResultSet.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/ResultSet.java
ojluni/src/main/java/java/sql/ResultSetMetaData.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/ResultSetMetaData.java
-ojluni/src/main/java/java/sql/RowId.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/RowId.java
-ojluni/src/main/java/java/sql/RowIdLifetime.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/RowIdLifetime.java
+ojluni/src/main/java/java/sql/RowId.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/RowId.java
+ojluni/src/main/java/java/sql/RowIdLifetime.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/RowIdLifetime.java
ojluni/src/main/java/java/sql/SQLClientInfoException.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLClientInfoException.java
-ojluni/src/main/java/java/sql/SQLData.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLData.java
+ojluni/src/main/java/java/sql/SQLData.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/SQLData.java
ojluni/src/main/java/java/sql/SQLDataException.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLDataException.java
ojluni/src/main/java/java/sql/SQLException.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLException.java
ojluni/src/main/java/java/sql/SQLFeatureNotSupportedException.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java
@@ -706,21 +706,21 @@
ojluni/src/main/java/java/sql/SQLTransientException.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLTransientException.java
ojluni/src/main/java/java/sql/SQLWarning.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLWarning.java
ojluni/src/main/java/java/sql/SQLXML.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/SQLXML.java
-ojluni/src/main/java/java/sql/Savepoint.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Savepoint.java
+ojluni/src/main/java/java/sql/Savepoint.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/java/sql/Savepoint.java
ojluni/src/main/java/java/sql/Statement.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Statement.java
ojluni/src/main/java/java/sql/Struct.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Struct.java
ojluni/src/main/java/java/sql/Time.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Time.java
ojluni/src/main/java/java/sql/Timestamp.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Timestamp.java
ojluni/src/main/java/java/sql/Types.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Types.java
ojluni/src/main/java/java/sql/Wrapper.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/sql/Wrapper.java
-ojluni/src/main/java/java/text/Annotation.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/Annotation.java
-ojluni/src/main/java/java/text/AttributedCharacterIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/AttributedCharacterIterator.java
+ojluni/src/main/java/java/text/Annotation.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/Annotation.java
+ojluni/src/main/java/java/text/AttributedCharacterIterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/AttributedCharacterIterator.java
ojluni/src/main/java/java/text/AttributedString.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/AttributedString.java
ojluni/src/main/java/java/text/Bidi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/Bidi.java
ojluni/src/main/java/java/text/BreakIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/BreakIterator.java
ojluni/src/main/java/java/text/CalendarBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/CalendarBuilder.java
ojluni/src/main/java/java/text/CharacterIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/CharacterIterator.java
-ojluni/src/main/java/java/text/CharacterIteratorFieldDelegate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/CharacterIteratorFieldDelegate.java
+ojluni/src/main/java/java/text/CharacterIteratorFieldDelegate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
ojluni/src/main/java/java/text/ChoiceFormat.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/ChoiceFormat.java
ojluni/src/main/java/java/text/CollationElementIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/CollationElementIterator.java
ojluni/src/main/java/java/text/CollationKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/CollationKey.java
@@ -729,10 +729,10 @@
ojluni/src/main/java/java/text/DateFormatSymbols.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/DateFormatSymbols.java
ojluni/src/main/java/java/text/DecimalFormat.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/DecimalFormat.java
ojluni/src/main/java/java/text/DecimalFormatSymbols.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/DecimalFormatSymbols.java
-ojluni/src/main/java/java/text/DontCareFieldPosition.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/DontCareFieldPosition.java
-ojluni/src/main/java/java/text/EntryPair.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/EntryPair.java
-ojluni/src/main/java/java/text/FieldPosition.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/text/FieldPosition.java
-ojluni/src/main/java/java/text/Format.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/text/Format.java
+ojluni/src/main/java/java/text/DontCareFieldPosition.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/DontCareFieldPosition.java
+ojluni/src/main/java/java/text/EntryPair.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/EntryPair.java
+ojluni/src/main/java/java/text/FieldPosition.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/FieldPosition.java
+ojluni/src/main/java/java/text/Format.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/text/Format.java
# java.text.IcuIteratorWrapper doesn't come from the upstream OpenJDK.
ojluni/src/main/java/java/text/MergeCollation.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/MergeCollation.java
ojluni/src/main/java/java/text/MessageFormat.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/MessageFormat.java
@@ -745,34 +745,34 @@
ojluni/src/main/java/java/text/SimpleDateFormat.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/SimpleDateFormat.java
ojluni/src/main/java/java/text/StringCharacterIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/text/StringCharacterIterator.java
ojluni/src/main/java/java/time/Clock.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/Clock.java
-ojluni/src/main/java/java/time/DateTimeException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/DateTimeException.java
+ojluni/src/main/java/java/time/DateTimeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/DateTimeException.java
ojluni/src/main/java/java/time/DayOfWeek.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/DayOfWeek.java
-ojluni/src/main/java/java/time/Duration.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/Duration.java
+ojluni/src/main/java/java/time/Duration.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/Duration.java
ojluni/src/main/java/java/time/Instant.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/Instant.java
ojluni/src/main/java/java/time/LocalDate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/LocalDate.java
ojluni/src/main/java/java/time/LocalDateTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/LocalDateTime.java
-ojluni/src/main/java/java/time/LocalTime.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/LocalTime.java
-ojluni/src/main/java/java/time/Month.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/Month.java
+ojluni/src/main/java/java/time/LocalTime.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/LocalTime.java
+ojluni/src/main/java/java/time/Month.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/Month.java
ojluni/src/main/java/java/time/MonthDay.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/MonthDay.java
ojluni/src/main/java/java/time/OffsetDateTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/OffsetDateTime.java
ojluni/src/main/java/java/time/OffsetTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/OffsetTime.java
ojluni/src/main/java/java/time/Period.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/Period.java
-ojluni/src/main/java/java/time/Ser.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/Ser.java
+ojluni/src/main/java/java/time/Ser.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/Ser.java
ojluni/src/main/java/java/time/Year.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/Year.java
ojluni/src/main/java/java/time/YearMonth.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/YearMonth.java
ojluni/src/main/java/java/time/ZoneId.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/ZoneId.java
ojluni/src/main/java/java/time/ZoneOffset.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/ZoneOffset.java
-ojluni/src/main/java/java/time/ZoneRegion.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/ZoneRegion.java
+ojluni/src/main/java/java/time/ZoneRegion.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/ZoneRegion.java
ojluni/src/main/java/java/time/ZonedDateTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/ZonedDateTime.java
ojluni/src/main/java/java/time/chrono/AbstractChronology.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/AbstractChronology.java
ojluni/src/main/java/java/time/chrono/ChronoLocalDate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java
ojluni/src/main/java/java/time/chrono/ChronoLocalDateImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoLocalDateImpl.java
ojluni/src/main/java/java/time/chrono/ChronoLocalDateTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java
-ojluni/src/main/java/java/time/chrono/ChronoLocalDateTimeImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
-ojluni/src/main/java/java/time/chrono/ChronoPeriod.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoPeriod.java
+ojluni/src/main/java/java/time/chrono/ChronoLocalDateTimeImpl.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
+ojluni/src/main/java/java/time/chrono/ChronoPeriod.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/chrono/ChronoPeriod.java
ojluni/src/main/java/java/time/chrono/ChronoPeriodImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java
ojluni/src/main/java/java/time/chrono/ChronoZonedDateTime.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java
-ojluni/src/main/java/java/time/chrono/ChronoZonedDateTimeImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
+ojluni/src/main/java/java/time/chrono/ChronoZonedDateTimeImpl.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
ojluni/src/main/java/java/time/chrono/Chronology.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/Chronology.java
ojluni/src/main/java/java/time/chrono/Era.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/Era.java
ojluni/src/main/java/java/time/chrono/HijrahChronology.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/HijrahChronology.java
@@ -786,7 +786,7 @@
ojluni/src/main/java/java/time/chrono/MinguoChronology.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/MinguoChronology.java
ojluni/src/main/java/java/time/chrono/MinguoDate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/MinguoDate.java
ojluni/src/main/java/java/time/chrono/MinguoEra.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/MinguoEra.java
-ojluni/src/main/java/java/time/chrono/Ser.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/Ser.java
+ojluni/src/main/java/java/time/chrono/Ser.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/chrono/Ser.java
ojluni/src/main/java/java/time/chrono/ThaiBuddhistChronology.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java
ojluni/src/main/java/java/time/chrono/ThaiBuddhistDate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java
ojluni/src/main/java/java/time/chrono/ThaiBuddhistEra.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java
@@ -794,306 +794,306 @@
ojluni/src/main/java/java/time/format/DateTimeFormatter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DateTimeFormatter.java
ojluni/src/main/java/java/time/format/DateTimeFormatterBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
ojluni/src/main/java/java/time/format/DateTimeParseContext.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DateTimeParseContext.java
-ojluni/src/main/java/java/time/format/DateTimeParseException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DateTimeParseException.java
+ojluni/src/main/java/java/time/format/DateTimeParseException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/format/DateTimeParseException.java
ojluni/src/main/java/java/time/format/DateTimePrintContext.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DateTimePrintContext.java
ojluni/src/main/java/java/time/format/DateTimeTextProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DateTimeTextProvider.java
ojluni/src/main/java/java/time/format/DecimalStyle.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/DecimalStyle.java
-ojluni/src/main/java/java/time/format/FormatStyle.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/FormatStyle.java
+ojluni/src/main/java/java/time/format/FormatStyle.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/format/FormatStyle.java
ojluni/src/main/java/java/time/format/Parsed.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/Parsed.java
-ojluni/src/main/java/java/time/format/ResolverStyle.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/ResolverStyle.java
-ojluni/src/main/java/java/time/format/SignStyle.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/SignStyle.java
-ojluni/src/main/java/java/time/format/TextStyle.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/format/TextStyle.java
+ojluni/src/main/java/java/time/format/ResolverStyle.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/format/ResolverStyle.java
+ojluni/src/main/java/java/time/format/SignStyle.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/format/SignStyle.java
+ojluni/src/main/java/java/time/format/TextStyle.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/format/TextStyle.java
ojluni/src/main/java/java/time/format/ZoneName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/ZoneName.java
ojluni/src/main/java/java/time/format/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/format/package-info.java
ojluni/src/main/java/java/time/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/package-info.java
ojluni/src/main/java/java/time/temporal/ChronoField.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/ChronoField.java
-ojluni/src/main/java/java/time/temporal/ChronoUnit.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/ChronoUnit.java
+ojluni/src/main/java/java/time/temporal/ChronoUnit.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/ChronoUnit.java
ojluni/src/main/java/java/time/temporal/IsoFields.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/IsoFields.java
-ojluni/src/main/java/java/time/temporal/JulianFields.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/JulianFields.java
-ojluni/src/main/java/java/time/temporal/Temporal.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/Temporal.java
-ojluni/src/main/java/java/time/temporal/TemporalAccessor.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/TemporalAccessor.java
-ojluni/src/main/java/java/time/temporal/TemporalAdjuster.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java
-ojluni/src/main/java/java/time/temporal/TemporalAdjusters.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java
-ojluni/src/main/java/java/time/temporal/TemporalAmount.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/TemporalAmount.java
-ojluni/src/main/java/java/time/temporal/TemporalField.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/TemporalField.java
+ojluni/src/main/java/java/time/temporal/JulianFields.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/JulianFields.java
+ojluni/src/main/java/java/time/temporal/Temporal.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/Temporal.java
+ojluni/src/main/java/java/time/temporal/TemporalAccessor.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalAccessor.java
+ojluni/src/main/java/java/time/temporal/TemporalAdjuster.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalAdjuster.java
+ojluni/src/main/java/java/time/temporal/TemporalAdjusters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalAdjusters.java
+ojluni/src/main/java/java/time/temporal/TemporalAmount.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalAmount.java
+ojluni/src/main/java/java/time/temporal/TemporalField.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalField.java
ojluni/src/main/java/java/time/temporal/TemporalQueries.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/TemporalQueries.java
-ojluni/src/main/java/java/time/temporal/TemporalQuery.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/TemporalQuery.java
-ojluni/src/main/java/java/time/temporal/TemporalUnit.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/TemporalUnit.java
-ojluni/src/main/java/java/time/temporal/UnsupportedTemporalTypeException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java
-ojluni/src/main/java/java/time/temporal/ValueRange.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/ValueRange.java
+ojluni/src/main/java/java/time/temporal/TemporalQuery.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalQuery.java
+ojluni/src/main/java/java/time/temporal/TemporalUnit.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/TemporalUnit.java
+ojluni/src/main/java/java/time/temporal/UnsupportedTemporalTypeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java
+ojluni/src/main/java/java/time/temporal/ValueRange.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/ValueRange.java
ojluni/src/main/java/java/time/temporal/WeekFields.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/temporal/WeekFields.java
-ojluni/src/main/java/java/time/temporal/package-info.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/temporal/package-info.java
+ojluni/src/main/java/java/time/temporal/package-info.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/temporal/package-info.java
# java.time.zone.IcuZoneRulesProvider doesn't come from the upstream OpenJDK.
ojluni/src/main/java/java/time/zone/Ser.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/time/zone/Ser.java
ojluni/src/main/java/java/time/zone/ZoneOffsetTransition.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/zone/ZoneOffsetTransition.java
ojluni/src/main/java/java/time/zone/ZoneOffsetTransitionRule.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
ojluni/src/main/java/java/time/zone/ZoneRules.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/zone/ZoneRules.java
-ojluni/src/main/java/java/time/zone/ZoneRulesException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/zone/ZoneRulesException.java
+ojluni/src/main/java/java/time/zone/ZoneRulesException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/time/zone/ZoneRulesException.java
ojluni/src/main/java/java/time/zone/ZoneRulesProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/zone/ZoneRulesProvider.java
ojluni/src/main/java/java/time/zone/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/time/zone/package-info.java
-ojluni/src/main/java/java/util/AbstractCollection.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/AbstractCollection.java
-ojluni/src/main/java/java/util/AbstractList.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/AbstractList.java
-ojluni/src/main/java/java/util/AbstractMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/AbstractMap.java
-ojluni/src/main/java/java/util/AbstractQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/AbstractQueue.java
-ojluni/src/main/java/java/util/AbstractSequentialList.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/AbstractSequentialList.java
-ojluni/src/main/java/java/util/AbstractSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/AbstractSet.java
+ojluni/src/main/java/java/util/AbstractCollection.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/AbstractCollection.java
+ojluni/src/main/java/java/util/AbstractList.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/AbstractList.java
+ojluni/src/main/java/java/util/AbstractMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/AbstractMap.java
+ojluni/src/main/java/java/util/AbstractQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/AbstractQueue.java
+ojluni/src/main/java/java/util/AbstractSequentialList.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/AbstractSequentialList.java
+ojluni/src/main/java/java/util/AbstractSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/AbstractSet.java
ojluni/src/main/java/java/util/ArrayDeque.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/ArrayDeque.java
ojluni/src/main/java/java/util/ArrayList.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/ArrayList.java
-ojluni/src/main/java/java/util/ArrayPrefixHelpers.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ArrayPrefixHelpers.java
-ojluni/src/main/java/java/util/Arrays.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Arrays.java
-ojluni/src/main/java/java/util/ArraysParallelSortHelpers.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java
+ojluni/src/main/java/java/util/ArrayPrefixHelpers.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ArrayPrefixHelpers.java
+ojluni/src/main/java/java/util/Arrays.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Arrays.java
+ojluni/src/main/java/java/util/ArraysParallelSortHelpers.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java
ojluni/src/main/java/java/util/Base64.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Base64.java
-ojluni/src/main/java/java/util/BitSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/BitSet.java
+ojluni/src/main/java/java/util/BitSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/BitSet.java
ojluni/src/main/java/java/util/Calendar.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Calendar.java
-ojluni/src/main/java/java/util/Collection.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Collection.java
+ojluni/src/main/java/java/util/Collection.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Collection.java
ojluni/src/main/java/java/util/Collections.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Collections.java
-ojluni/src/main/java/java/util/ComparableTimSort.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ComparableTimSort.java
-ojluni/src/main/java/java/util/Comparator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Comparator.java
-ojluni/src/main/java/java/util/Comparators.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Comparators.java
-ojluni/src/main/java/java/util/ConcurrentModificationException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/ConcurrentModificationException.java
+ojluni/src/main/java/java/util/ComparableTimSort.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ComparableTimSort.java
+ojluni/src/main/java/java/util/Comparator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Comparator.java
+ojluni/src/main/java/java/util/Comparators.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Comparators.java
+ojluni/src/main/java/java/util/ConcurrentModificationException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ConcurrentModificationException.java
ojluni/src/main/java/java/util/Currency.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Currency.java
-ojluni/src/main/java/java/util/Date.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Date.java
-ojluni/src/main/java/java/util/Deque.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Deque.java
-ojluni/src/main/java/java/util/Dictionary.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Dictionary.java
+ojluni/src/main/java/java/util/Date.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Date.java
+ojluni/src/main/java/java/util/Deque.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Deque.java
+ojluni/src/main/java/java/util/Dictionary.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Dictionary.java
ojluni/src/main/java/java/util/DoubleSummaryStatistics.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/DoubleSummaryStatistics.java
-ojluni/src/main/java/java/util/DualPivotQuicksort.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/DualPivotQuicksort.java
-ojluni/src/main/java/java/util/DuplicateFormatFlagsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
-ojluni/src/main/java/java/util/EmptyStackException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/EmptyStackException.java
-ojluni/src/main/java/java/util/EnumMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/EnumMap.java
+ojluni/src/main/java/java/util/DualPivotQuicksort.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/DualPivotQuicksort.java
+ojluni/src/main/java/java/util/DuplicateFormatFlagsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
+ojluni/src/main/java/java/util/EmptyStackException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/EmptyStackException.java
+ojluni/src/main/java/java/util/EnumMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/EnumMap.java
ojluni/src/main/java/java/util/EnumSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/EnumSet.java
-ojluni/src/main/java/java/util/Enumeration.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Enumeration.java
-ojluni/src/main/java/java/util/EventListener.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/EventListener.java
-ojluni/src/main/java/java/util/EventListenerProxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/EventListenerProxy.java
-ojluni/src/main/java/java/util/EventObject.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/EventObject.java
-ojluni/src/main/java/java/util/FormatFlagsConversionMismatchException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
-ojluni/src/main/java/java/util/Formattable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Formattable.java
-ojluni/src/main/java/java/util/FormattableFlags.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/FormattableFlags.java
+ojluni/src/main/java/java/util/Enumeration.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Enumeration.java
+ojluni/src/main/java/java/util/EventListener.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/EventListener.java
+ojluni/src/main/java/java/util/EventListenerProxy.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/EventListenerProxy.java
+ojluni/src/main/java/java/util/EventObject.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/EventObject.java
+ojluni/src/main/java/java/util/FormatFlagsConversionMismatchException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
+ojluni/src/main/java/java/util/Formattable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Formattable.java
+ojluni/src/main/java/java/util/FormattableFlags.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/FormattableFlags.java
ojluni/src/main/java/java/util/Formatter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Formatter.java
-ojluni/src/main/java/java/util/FormatterClosedException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/FormatterClosedException.java
-ojluni/src/main/java/java/util/GregorianCalendar.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/GregorianCalendar.java
+ojluni/src/main/java/java/util/FormatterClosedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/FormatterClosedException.java
+ojluni/src/main/java/java/util/GregorianCalendar.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/GregorianCalendar.java
ojluni/src/main/java/java/util/HashMap.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/HashMap.java
ojluni/src/main/java/java/util/HashSet.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/HashSet.java
ojluni/src/main/java/java/util/Hashtable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Hashtable.java
ojluni/src/main/java/java/util/IdentityHashMap.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/IdentityHashMap.java
-ojluni/src/main/java/java/util/IllegalFormatCodePointException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
-ojluni/src/main/java/java/util/IllegalFormatConversionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/IllegalFormatConversionException.java
-ojluni/src/main/java/java/util/IllegalFormatException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/IllegalFormatException.java
-ojluni/src/main/java/java/util/IllegalFormatFlagsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
-ojluni/src/main/java/java/util/IllegalFormatPrecisionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
-ojluni/src/main/java/java/util/IllegalFormatWidthException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/IllegalFormatWidthException.java
-ojluni/src/main/java/java/util/IllformedLocaleException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/IllformedLocaleException.java
+ojluni/src/main/java/java/util/IllegalFormatCodePointException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
+ojluni/src/main/java/java/util/IllegalFormatConversionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllegalFormatConversionException.java
+ojluni/src/main/java/java/util/IllegalFormatException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllegalFormatException.java
+ojluni/src/main/java/java/util/IllegalFormatFlagsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
+ojluni/src/main/java/java/util/IllegalFormatPrecisionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
+ojluni/src/main/java/java/util/IllegalFormatWidthException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllegalFormatWidthException.java
+ojluni/src/main/java/java/util/IllformedLocaleException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IllformedLocaleException.java
ojluni/src/main/java/java/util/ImmutableCollections.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ImmutableCollections.java
-ojluni/src/main/java/java/util/InputMismatchException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/InputMismatchException.java
-ojluni/src/main/java/java/util/IntSummaryStatistics.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/IntSummaryStatistics.java
-ojluni/src/main/java/java/util/InvalidPropertiesFormatException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
-ojluni/src/main/java/java/util/Iterator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Iterator.java
+ojluni/src/main/java/java/util/InputMismatchException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/InputMismatchException.java
+ojluni/src/main/java/java/util/IntSummaryStatistics.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/IntSummaryStatistics.java
+ojluni/src/main/java/java/util/InvalidPropertiesFormatException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
+ojluni/src/main/java/java/util/Iterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Iterator.java
ojluni/src/main/java/java/util/JapaneseImperialCalendar.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
-ojluni/src/main/java/java/util/JumboEnumSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/JumboEnumSet.java
-ojluni/src/main/java/java/util/KeyValueHolder.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/KeyValueHolder.java
-ojluni/src/main/java/java/util/LinkedHashMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/LinkedHashMap.java
-ojluni/src/main/java/java/util/LinkedHashSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/LinkedHashSet.java
-ojluni/src/main/java/java/util/LinkedList.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/LinkedList.java
-ojluni/src/main/java/java/util/List.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/List.java
-ojluni/src/main/java/java/util/ListIterator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ListIterator.java
-ojluni/src/main/java/java/util/ListResourceBundle.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ListResourceBundle.java
+ojluni/src/main/java/java/util/JumboEnumSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/JumboEnumSet.java
+ojluni/src/main/java/java/util/KeyValueHolder.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/KeyValueHolder.java
+ojluni/src/main/java/java/util/LinkedHashMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/LinkedHashMap.java
+ojluni/src/main/java/java/util/LinkedHashSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/LinkedHashSet.java
+ojluni/src/main/java/java/util/LinkedList.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/LinkedList.java
+ojluni/src/main/java/java/util/List.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/List.java
+ojluni/src/main/java/java/util/ListIterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ListIterator.java
+ojluni/src/main/java/java/util/ListResourceBundle.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ListResourceBundle.java
ojluni/src/main/java/java/util/Locale.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Locale.java
-ojluni/src/main/java/java/util/LongSummaryStatistics.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/LongSummaryStatistics.java
-ojluni/src/main/java/java/util/Map.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Map.java
-ojluni/src/main/java/java/util/MissingFormatArgumentException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/MissingFormatArgumentException.java
-ojluni/src/main/java/java/util/MissingFormatWidthException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/MissingFormatWidthException.java
-ojluni/src/main/java/java/util/MissingResourceException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/MissingResourceException.java
+ojluni/src/main/java/java/util/LongSummaryStatistics.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/LongSummaryStatistics.java
+ojluni/src/main/java/java/util/Map.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Map.java
+ojluni/src/main/java/java/util/MissingFormatArgumentException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/MissingFormatArgumentException.java
+ojluni/src/main/java/java/util/MissingFormatWidthException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/MissingFormatWidthException.java
+ojluni/src/main/java/java/util/MissingResourceException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/MissingResourceException.java
ojluni/src/main/java/java/util/NavigableMap.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/NavigableMap.java
ojluni/src/main/java/java/util/NavigableSet.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/NavigableSet.java
-ojluni/src/main/java/java/util/NoSuchElementException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/NoSuchElementException.java
-ojluni/src/main/java/java/util/Objects.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Objects.java
-ojluni/src/main/java/java/util/Observable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Observable.java
-ojluni/src/main/java/java/util/Observer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Observer.java
-ojluni/src/main/java/java/util/Optional.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Optional.java
-ojluni/src/main/java/java/util/OptionalDouble.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/OptionalDouble.java
-ojluni/src/main/java/java/util/OptionalInt.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/OptionalInt.java
-ojluni/src/main/java/java/util/OptionalLong.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/OptionalLong.java
-ojluni/src/main/java/java/util/PrimitiveIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/PrimitiveIterator.java
+ojluni/src/main/java/java/util/NoSuchElementException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/NoSuchElementException.java
+ojluni/src/main/java/java/util/Objects.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Objects.java
+ojluni/src/main/java/java/util/Observable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Observable.java
+ojluni/src/main/java/java/util/Observer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Observer.java
+ojluni/src/main/java/java/util/Optional.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Optional.java
+ojluni/src/main/java/java/util/OptionalDouble.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/OptionalDouble.java
+ojluni/src/main/java/java/util/OptionalInt.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/OptionalInt.java
+ojluni/src/main/java/java/util/OptionalLong.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/OptionalLong.java
+ojluni/src/main/java/java/util/PrimitiveIterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/PrimitiveIterator.java
ojluni/src/main/java/java/util/PriorityQueue.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/PriorityQueue.java
ojluni/src/main/java/java/util/Properties.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Properties.java
ojluni/src/main/java/java/util/PropertyPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/PropertyPermission.java
ojluni/src/main/java/java/util/PropertyResourceBundle.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/PropertyResourceBundle.java
-ojluni/src/main/java/java/util/Queue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Queue.java
+ojluni/src/main/java/java/util/Queue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Queue.java
ojluni/src/main/java/java/util/Random.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Random.java
-ojluni/src/main/java/java/util/RandomAccess.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/RandomAccess.java
-ojluni/src/main/java/java/util/RegularEnumSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/RegularEnumSet.java
+ojluni/src/main/java/java/util/RandomAccess.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/RandomAccess.java
+ojluni/src/main/java/java/util/RegularEnumSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/RegularEnumSet.java
ojluni/src/main/java/java/util/ResourceBundle.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/ResourceBundle.java
ojluni/src/main/java/java/util/Scanner.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Scanner.java
-ojluni/src/main/java/java/util/ServiceConfigurationError.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/ServiceConfigurationError.java
+ojluni/src/main/java/java/util/ServiceConfigurationError.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/ServiceConfigurationError.java
ojluni/src/main/java/java/util/ServiceLoader.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/ServiceLoader.java
ojluni/src/main/java/java/util/Set.java,jdk9/jdk-9+181,jdk/src/java.base/share/classes/java/util/Set.java
-ojluni/src/main/java/java/util/SimpleTimeZone.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/SimpleTimeZone.java
-ojluni/src/main/java/java/util/SortedMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/SortedMap.java
-ojluni/src/main/java/java/util/SortedSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/SortedSet.java
-ojluni/src/main/java/java/util/Spliterator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Spliterator.java
-ojluni/src/main/java/java/util/Spliterators.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Spliterators.java
-ojluni/src/main/java/java/util/SplittableRandom.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/SplittableRandom.java
-ojluni/src/main/java/java/util/Stack.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Stack.java
+ojluni/src/main/java/java/util/SimpleTimeZone.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/SimpleTimeZone.java
+ojluni/src/main/java/java/util/SortedMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/SortedMap.java
+ojluni/src/main/java/java/util/SortedSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/SortedSet.java
+ojluni/src/main/java/java/util/Spliterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Spliterator.java
+ojluni/src/main/java/java/util/Spliterators.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Spliterators.java
+ojluni/src/main/java/java/util/SplittableRandom.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/SplittableRandom.java
+ojluni/src/main/java/java/util/Stack.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Stack.java
ojluni/src/main/java/java/util/StringJoiner.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/StringJoiner.java
-ojluni/src/main/java/java/util/StringTokenizer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/StringTokenizer.java
-ojluni/src/main/java/java/util/TimSort.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/TimSort.java
-ojluni/src/main/java/java/util/TimeZone.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/TimeZone.java
-ojluni/src/main/java/java/util/Timer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/Timer.java
-ojluni/src/main/java/java/util/TimerTask.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/TimerTask.java
-ojluni/src/main/java/java/util/TooManyListenersException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/TooManyListenersException.java
-ojluni/src/main/java/java/util/TreeMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/TreeMap.java
-ojluni/src/main/java/java/util/TreeSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/TreeSet.java
-ojluni/src/main/java/java/util/Tripwire.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Tripwire.java
+ojluni/src/main/java/java/util/StringTokenizer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/StringTokenizer.java
+ojluni/src/main/java/java/util/TimSort.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/TimSort.java
+ojluni/src/main/java/java/util/TimeZone.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/TimeZone.java
+ojluni/src/main/java/java/util/Timer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Timer.java
+ojluni/src/main/java/java/util/TimerTask.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/TimerTask.java
+ojluni/src/main/java/java/util/TooManyListenersException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/TooManyListenersException.java
+ojluni/src/main/java/java/util/TreeMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/TreeMap.java
+ojluni/src/main/java/java/util/TreeSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/TreeSet.java
+ojluni/src/main/java/java/util/Tripwire.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/Tripwire.java
ojluni/src/main/java/java/util/UUID.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/UUID.java
-ojluni/src/main/java/java/util/UnknownFormatConversionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/UnknownFormatConversionException.java
-ojluni/src/main/java/java/util/UnknownFormatFlagsException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
+ojluni/src/main/java/java/util/UnknownFormatConversionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/UnknownFormatConversionException.java
+ojluni/src/main/java/java/util/UnknownFormatFlagsException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
ojluni/src/main/java/java/util/Vector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/Vector.java
-ojluni/src/main/java/java/util/WeakHashMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/WeakHashMap.java
+ojluni/src/main/java/java/util/WeakHashMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/WeakHashMap.java
ojluni/src/main/java/java/util/XMLUtils.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/java/util/XMLUtils.java
-ojluni/src/main/java/java/util/concurrent/AbstractExecutorService.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
-ojluni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
-ojluni/src/main/java/java/util/concurrent/BlockingDeque.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/BlockingDeque.java
-ojluni/src/main/java/java/util/concurrent/BlockingQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/BlockingQueue.java
-ojluni/src/main/java/java/util/concurrent/BrokenBarrierException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java
-ojluni/src/main/java/java/util/concurrent/Callable.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Callable.java
-ojluni/src/main/java/java/util/concurrent/CancellationException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CancellationException.java
-ojluni/src/main/java/java/util/concurrent/CompletableFuture.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
-ojluni/src/main/java/java/util/concurrent/CompletionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CompletionException.java
-ojluni/src/main/java/java/util/concurrent/CompletionService.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CompletionService.java
-ojluni/src/main/java/java/util/concurrent/CompletionStage.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CompletionStage.java
-ojluni/src/main/java/java/util/concurrent/ConcurrentHashMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
-ojluni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
-ojluni/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
-ojluni/src/main/java/java/util/concurrent/ConcurrentMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java
-ojluni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java
+ojluni/src/main/java/java/util/concurrent/AbstractExecutorService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
+ojluni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
+ojluni/src/main/java/java/util/concurrent/BlockingDeque.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/BlockingDeque.java
+ojluni/src/main/java/java/util/concurrent/BlockingQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/BlockingQueue.java
+ojluni/src/main/java/java/util/concurrent/BrokenBarrierException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/BrokenBarrierException.java
+ojluni/src/main/java/java/util/concurrent/Callable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Callable.java
+ojluni/src/main/java/java/util/concurrent/CancellationException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CancellationException.java
+ojluni/src/main/java/java/util/concurrent/CompletableFuture.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
+ojluni/src/main/java/java/util/concurrent/CompletionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CompletionException.java
+ojluni/src/main/java/java/util/concurrent/CompletionService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CompletionService.java
+ojluni/src/main/java/java/util/concurrent/CompletionStage.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CompletionStage.java
+ojluni/src/main/java/java/util/concurrent/ConcurrentHashMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
+ojluni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
+ojluni/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
+ojluni/src/main/java/java/util/concurrent/ConcurrentMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java
+ojluni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ConcurrentNavigableMap.java
ojluni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
-ojluni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
+ojluni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
ojluni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
-ojluni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
-ojluni/src/main/java/java/util/concurrent/CountDownLatch.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
-ojluni/src/main/java/java/util/concurrent/CountedCompleter.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
-ojluni/src/main/java/java/util/concurrent/CyclicBarrier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
-ojluni/src/main/java/java/util/concurrent/DelayQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/DelayQueue.java
-ojluni/src/main/java/java/util/concurrent/Delayed.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Delayed.java
-ojluni/src/main/java/java/util/concurrent/Exchanger.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Exchanger.java
-ojluni/src/main/java/java/util/concurrent/ExecutionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ExecutionException.java
-ojluni/src/main/java/java/util/concurrent/Executor.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Executor.java
-ojluni/src/main/java/java/util/concurrent/ExecutorCompletionService.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
-ojluni/src/main/java/java/util/concurrent/ExecutorService.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ExecutorService.java
-ojluni/src/main/java/java/util/concurrent/Executors.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Executors.java
-ojluni/src/main/java/java/util/concurrent/Flow.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Flow.java
-ojluni/src/main/java/java/util/concurrent/ForkJoinPool.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
-ojluni/src/main/java/java/util/concurrent/ForkJoinTask.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
+ojluni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
+ojluni/src/main/java/java/util/concurrent/CountDownLatch.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CountDownLatch.java
+ojluni/src/main/java/java/util/concurrent/CountedCompleter.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
+ojluni/src/main/java/java/util/concurrent/CyclicBarrier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java
+ojluni/src/main/java/java/util/concurrent/DelayQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/DelayQueue.java
+ojluni/src/main/java/java/util/concurrent/Delayed.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Delayed.java
+ojluni/src/main/java/java/util/concurrent/Exchanger.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Exchanger.java
+ojluni/src/main/java/java/util/concurrent/ExecutionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ExecutionException.java
+ojluni/src/main/java/java/util/concurrent/Executor.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Executor.java
+ojluni/src/main/java/java/util/concurrent/ExecutorCompletionService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ExecutorCompletionService.java
+ojluni/src/main/java/java/util/concurrent/ExecutorService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ExecutorService.java
+ojluni/src/main/java/java/util/concurrent/Executors.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Executors.java
+ojluni/src/main/java/java/util/concurrent/Flow.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Flow.java
+ojluni/src/main/java/java/util/concurrent/ForkJoinPool.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+ojluni/src/main/java/java/util/concurrent/ForkJoinTask.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
ojluni/src/main/java/java/util/concurrent/ForkJoinWorkerThread.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
-ojluni/src/main/java/java/util/concurrent/Future.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Future.java
-ojluni/src/main/java/java/util/concurrent/FutureTask.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/FutureTask.java
-ojluni/src/main/java/java/util/concurrent/Helpers.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Helpers.java
-ojluni/src/main/java/java/util/concurrent/LinkedBlockingDeque.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
-ojluni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java
-ojluni/src/main/java/java/util/concurrent/LinkedTransferQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
-ojluni/src/main/java/java/util/concurrent/Phaser.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Phaser.java
+ojluni/src/main/java/java/util/concurrent/Future.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Future.java
+ojluni/src/main/java/java/util/concurrent/FutureTask.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/FutureTask.java
+ojluni/src/main/java/java/util/concurrent/Helpers.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Helpers.java
+ojluni/src/main/java/java/util/concurrent/LinkedBlockingDeque.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
+ojluni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java
+ojluni/src/main/java/java/util/concurrent/LinkedTransferQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
+ojluni/src/main/java/java/util/concurrent/Phaser.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Phaser.java
ojluni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
-ojluni/src/main/java/java/util/concurrent/RecursiveAction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/RecursiveAction.java
-ojluni/src/main/java/java/util/concurrent/RecursiveTask.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/RecursiveTask.java
-ojluni/src/main/java/java/util/concurrent/RejectedExecutionException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java
-ojluni/src/main/java/java/util/concurrent/RejectedExecutionHandler.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java
-ojluni/src/main/java/java/util/concurrent/RunnableFuture.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/RunnableFuture.java
-ojluni/src/main/java/java/util/concurrent/RunnableScheduledFuture.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java
-ojluni/src/main/java/java/util/concurrent/ScheduledExecutorService.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java
-ojluni/src/main/java/java/util/concurrent/ScheduledFuture.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java
-ojluni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
-ojluni/src/main/java/java/util/concurrent/Semaphore.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/Semaphore.java
-ojluni/src/main/java/java/util/concurrent/SynchronousQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
-ojluni/src/main/java/java/util/concurrent/ThreadFactory.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ThreadFactory.java
-ojluni/src/main/java/java/util/concurrent/ThreadLocalRandom.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+ojluni/src/main/java/java/util/concurrent/RecursiveAction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/RecursiveAction.java
+ojluni/src/main/java/java/util/concurrent/RecursiveTask.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/RecursiveTask.java
+ojluni/src/main/java/java/util/concurrent/RejectedExecutionException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/RejectedExecutionException.java
+ojluni/src/main/java/java/util/concurrent/RejectedExecutionHandler.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/RejectedExecutionHandler.java
+ojluni/src/main/java/java/util/concurrent/RunnableFuture.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/RunnableFuture.java
+ojluni/src/main/java/java/util/concurrent/RunnableScheduledFuture.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/RunnableScheduledFuture.java
+ojluni/src/main/java/java/util/concurrent/ScheduledExecutorService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ScheduledExecutorService.java
+ojluni/src/main/java/java/util/concurrent/ScheduledFuture.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ScheduledFuture.java
+ojluni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
+ojluni/src/main/java/java/util/concurrent/Semaphore.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/Semaphore.java
+ojluni/src/main/java/java/util/concurrent/SynchronousQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
+ojluni/src/main/java/java/util/concurrent/ThreadFactory.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ThreadFactory.java
+ojluni/src/main/java/java/util/concurrent/ThreadLocalRandom.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
ojluni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java
-ojluni/src/main/java/java/util/concurrent/TimeUnit.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/TimeUnit.java
-ojluni/src/main/java/java/util/concurrent/TimeoutException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/TimeoutException.java
-ojluni/src/main/java/java/util/concurrent/TransferQueue.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/TransferQueue.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicInteger.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicLong.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicReference.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
-ojluni/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
+ojluni/src/main/java/java/util/concurrent/TimeUnit.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/TimeUnit.java
+ojluni/src/main/java/java/util/concurrent/TimeoutException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/TimeoutException.java
+ojluni/src/main/java/java/util/concurrent/TransferQueue.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/TransferQueue.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicInteger.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicLong.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicReference.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+ojluni/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
ojluni/src/main/java/java/util/concurrent/atomic/DoubleAccumulator.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
ojluni/src/main/java/java/util/concurrent/atomic/DoubleAdder.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/concurrent/atomic/DoubleAdder.java
ojluni/src/main/java/java/util/concurrent/atomic/LongAccumulator.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAccumulator.java
ojluni/src/main/java/java/util/concurrent/atomic/LongAdder.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/concurrent/atomic/LongAdder.java
ojluni/src/main/java/java/util/concurrent/atomic/Striped64.java,jdk9/jdk-9+113,jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
-ojluni/src/main/java/java/util/concurrent/atomic/package-info.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
-ojluni/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
-ojluni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
-ojluni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
-ojluni/src/main/java/java/util/concurrent/locks/Condition.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/Condition.java
-ojluni/src/main/java/java/util/concurrent/locks/Lock.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/Lock.java
-ojluni/src/main/java/java/util/concurrent/locks/LockSupport.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
-ojluni/src/main/java/java/util/concurrent/locks/ReadWriteLock.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java
-ojluni/src/main/java/java/util/concurrent/locks/ReentrantLock.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
-ojluni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
-ojluni/src/main/java/java/util/concurrent/locks/StampedLock.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
-ojluni/src/main/java/java/util/function/BiConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/BiConsumer.java
-ojluni/src/main/java/java/util/function/BiFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/BiFunction.java
-ojluni/src/main/java/java/util/function/BiPredicate.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/BiPredicate.java
-ojluni/src/main/java/java/util/function/BinaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/BinaryOperator.java
-ojluni/src/main/java/java/util/function/BooleanSupplier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/BooleanSupplier.java
-ojluni/src/main/java/java/util/function/Consumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/Consumer.java
-ojluni/src/main/java/java/util/function/DoubleBinaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java
-ojluni/src/main/java/java/util/function/DoubleConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleConsumer.java
-ojluni/src/main/java/java/util/function/DoubleFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleFunction.java
-ojluni/src/main/java/java/util/function/DoublePredicate.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoublePredicate.java
-ojluni/src/main/java/java/util/function/DoubleSupplier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleSupplier.java
-ojluni/src/main/java/java/util/function/DoubleToIntFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleToIntFunction.java
-ojluni/src/main/java/java/util/function/DoubleToLongFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleToLongFunction.java
-ojluni/src/main/java/java/util/function/DoubleUnaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java
-ojluni/src/main/java/java/util/function/Function.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/Function.java
-ojluni/src/main/java/java/util/function/IntBinaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntBinaryOperator.java
-ojluni/src/main/java/java/util/function/IntConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntConsumer.java
-ojluni/src/main/java/java/util/function/IntFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntFunction.java
-ojluni/src/main/java/java/util/function/IntPredicate.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntPredicate.java
-ojluni/src/main/java/java/util/function/IntSupplier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntSupplier.java
-ojluni/src/main/java/java/util/function/IntToDoubleFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntToDoubleFunction.java
-ojluni/src/main/java/java/util/function/IntToLongFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntToLongFunction.java
-ojluni/src/main/java/java/util/function/IntUnaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/IntUnaryOperator.java
-ojluni/src/main/java/java/util/function/LongBinaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongBinaryOperator.java
-ojluni/src/main/java/java/util/function/LongConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongConsumer.java
-ojluni/src/main/java/java/util/function/LongFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongFunction.java
-ojluni/src/main/java/java/util/function/LongPredicate.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongPredicate.java
-ojluni/src/main/java/java/util/function/LongSupplier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongSupplier.java
-ojluni/src/main/java/java/util/function/LongToDoubleFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongToDoubleFunction.java
-ojluni/src/main/java/java/util/function/LongToIntFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongToIntFunction.java
-ojluni/src/main/java/java/util/function/LongUnaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/LongUnaryOperator.java
-ojluni/src/main/java/java/util/function/ObjDoubleConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java
-ojluni/src/main/java/java/util/function/ObjIntConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ObjIntConsumer.java
-ojluni/src/main/java/java/util/function/ObjLongConsumer.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ObjLongConsumer.java
-ojluni/src/main/java/java/util/function/Predicate.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/Predicate.java
-ojluni/src/main/java/java/util/function/Supplier.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/Supplier.java
-ojluni/src/main/java/java/util/function/ToDoubleBiFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java
-ojluni/src/main/java/java/util/function/ToDoubleFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ToDoubleFunction.java
-ojluni/src/main/java/java/util/function/ToIntBiFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ToIntBiFunction.java
-ojluni/src/main/java/java/util/function/ToIntFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ToIntFunction.java
-ojluni/src/main/java/java/util/function/ToLongBiFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ToLongBiFunction.java
-ojluni/src/main/java/java/util/function/ToLongFunction.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/ToLongFunction.java
-ojluni/src/main/java/java/util/function/UnaryOperator.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/UnaryOperator.java
-ojluni/src/main/java/java/util/function/package-info.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/function/package-info.java
+ojluni/src/main/java/java/util/concurrent/atomic/package-info.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/atomic/package-info.java
+ojluni/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
+ojluni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+ojluni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+ojluni/src/main/java/java/util/concurrent/locks/Condition.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/Condition.java
+ojluni/src/main/java/java/util/concurrent/locks/Lock.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/Lock.java
+ojluni/src/main/java/java/util/concurrent/locks/LockSupport.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
+ojluni/src/main/java/java/util/concurrent/locks/ReadWriteLock.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/ReadWriteLock.java
+ojluni/src/main/java/java/util/concurrent/locks/ReentrantLock.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/ReentrantLock.java
+ojluni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
+ojluni/src/main/java/java/util/concurrent/locks/StampedLock.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
+ojluni/src/main/java/java/util/function/BiConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/BiConsumer.java
+ojluni/src/main/java/java/util/function/BiFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/BiFunction.java
+ojluni/src/main/java/java/util/function/BiPredicate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/BiPredicate.java
+ojluni/src/main/java/java/util/function/BinaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/BinaryOperator.java
+ojluni/src/main/java/java/util/function/BooleanSupplier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/BooleanSupplier.java
+ojluni/src/main/java/java/util/function/Consumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/Consumer.java
+ojluni/src/main/java/java/util/function/DoubleBinaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleBinaryOperator.java
+ojluni/src/main/java/java/util/function/DoubleConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleConsumer.java
+ojluni/src/main/java/java/util/function/DoubleFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleFunction.java
+ojluni/src/main/java/java/util/function/DoublePredicate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoublePredicate.java
+ojluni/src/main/java/java/util/function/DoubleSupplier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleSupplier.java
+ojluni/src/main/java/java/util/function/DoubleToIntFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleToIntFunction.java
+ojluni/src/main/java/java/util/function/DoubleToLongFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleToLongFunction.java
+ojluni/src/main/java/java/util/function/DoubleUnaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/DoubleUnaryOperator.java
+ojluni/src/main/java/java/util/function/Function.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/Function.java
+ojluni/src/main/java/java/util/function/IntBinaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntBinaryOperator.java
+ojluni/src/main/java/java/util/function/IntConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntConsumer.java
+ojluni/src/main/java/java/util/function/IntFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntFunction.java
+ojluni/src/main/java/java/util/function/IntPredicate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntPredicate.java
+ojluni/src/main/java/java/util/function/IntSupplier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntSupplier.java
+ojluni/src/main/java/java/util/function/IntToDoubleFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntToDoubleFunction.java
+ojluni/src/main/java/java/util/function/IntToLongFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntToLongFunction.java
+ojluni/src/main/java/java/util/function/IntUnaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/IntUnaryOperator.java
+ojluni/src/main/java/java/util/function/LongBinaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongBinaryOperator.java
+ojluni/src/main/java/java/util/function/LongConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongConsumer.java
+ojluni/src/main/java/java/util/function/LongFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongFunction.java
+ojluni/src/main/java/java/util/function/LongPredicate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongPredicate.java
+ojluni/src/main/java/java/util/function/LongSupplier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongSupplier.java
+ojluni/src/main/java/java/util/function/LongToDoubleFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongToDoubleFunction.java
+ojluni/src/main/java/java/util/function/LongToIntFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongToIntFunction.java
+ojluni/src/main/java/java/util/function/LongUnaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/LongUnaryOperator.java
+ojluni/src/main/java/java/util/function/ObjDoubleConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ObjDoubleConsumer.java
+ojluni/src/main/java/java/util/function/ObjIntConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ObjIntConsumer.java
+ojluni/src/main/java/java/util/function/ObjLongConsumer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ObjLongConsumer.java
+ojluni/src/main/java/java/util/function/Predicate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/Predicate.java
+ojluni/src/main/java/java/util/function/Supplier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/Supplier.java
+ojluni/src/main/java/java/util/function/ToDoubleBiFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ToDoubleBiFunction.java
+ojluni/src/main/java/java/util/function/ToDoubleFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ToDoubleFunction.java
+ojluni/src/main/java/java/util/function/ToIntBiFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ToIntBiFunction.java
+ojluni/src/main/java/java/util/function/ToIntFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ToIntFunction.java
+ojluni/src/main/java/java/util/function/ToLongBiFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ToLongBiFunction.java
+ojluni/src/main/java/java/util/function/ToLongFunction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/ToLongFunction.java
+ojluni/src/main/java/java/util/function/UnaryOperator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/UnaryOperator.java
+ojluni/src/main/java/java/util/function/package-info.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/function/package-info.java
ojluni/src/main/java/java/util/jar/Attributes.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/Attributes.java
-ojluni/src/main/java/java/util/jar/JarEntry.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/jar/JarEntry.java
-ojluni/src/main/java/java/util/jar/JarException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/jar/JarException.java
+ojluni/src/main/java/java/util/jar/JarEntry.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/jar/JarEntry.java
+ojluni/src/main/java/java/util/jar/JarException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/jar/JarException.java
ojluni/src/main/java/java/util/jar/JarFile.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/JarFile.java
ojluni/src/main/java/java/util/jar/JarInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/JarInputStream.java
-ojluni/src/main/java/java/util/jar/JarOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/JarOutputStream.java
+ojluni/src/main/java/java/util/jar/JarOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/jar/JarOutputStream.java
ojluni/src/main/java/java/util/jar/JarVerifier.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/JarVerifier.java
ojluni/src/main/java/java/util/jar/Manifest.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/Manifest.java
ojluni/src/main/java/java/util/jar/Pack200.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/jar/Pack200.java
ojluni/src/main/java/java/util/logging/ConsoleHandler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/ConsoleHandler.java
-ojluni/src/main/java/java/util/logging/ErrorManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/ErrorManager.java
+ojluni/src/main/java/java/util/logging/ErrorManager.java,jdk11u/jdk-11.0.13-ga,src/java.logging/share/classes/java/util/logging/ErrorManager.java
ojluni/src/main/java/java/util/logging/FileHandler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/FileHandler.java
-ojluni/src/main/java/java/util/logging/Filter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/Filter.java
+ojluni/src/main/java/java/util/logging/Filter.java,jdk11u/jdk-11.0.13-ga,src/java.logging/share/classes/java/util/logging/Filter.java
ojluni/src/main/java/java/util/logging/Formatter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/Formatter.java
ojluni/src/main/java/java/util/logging/Handler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/Handler.java
ojluni/src/main/java/java/util/logging/Level.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/Level.java
@@ -1102,7 +1102,7 @@
ojluni/src/main/java/java/util/logging/Logger.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/Logger.java
ojluni/src/main/java/java/util/logging/Logging.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/Logging.java
ojluni/src/main/java/java/util/logging/LoggingMXBean.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/LoggingMXBean.java
-ojluni/src/main/java/java/util/logging/LoggingPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/LoggingPermission.java
+ojluni/src/main/java/java/util/logging/LoggingPermission.java,jdk11u/jdk-11.0.13-ga,src/java.logging/share/classes/java/util/logging/LoggingPermission.java
ojluni/src/main/java/java/util/logging/LoggingProxyImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java
ojluni/src/main/java/java/util/logging/MemoryHandler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/MemoryHandler.java
ojluni/src/main/java/java/util/logging/SimpleFormatter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/SimpleFormatter.java
@@ -1110,30 +1110,30 @@
ojluni/src/main/java/java/util/logging/StreamHandler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/StreamHandler.java
ojluni/src/main/java/java/util/logging/XMLFormatter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/logging/XMLFormatter.java
ojluni/src/main/java/java/util/prefs/AbstractPreferences.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/AbstractPreferences.java
-ojluni/src/main/java/java/util/prefs/BackingStoreException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/BackingStoreException.java
+ojluni/src/main/java/java/util/prefs/BackingStoreException.java,jdk11u/jdk-11.0.13-ga,src/java.prefs/share/classes/java/util/prefs/BackingStoreException.java
ojluni/src/main/java/java/util/prefs/Base64.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/Base64.java
ojluni/src/main/java/java/util/prefs/FileSystemPreferences.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
ojluni/src/main/java/java/util/prefs/FileSystemPreferencesFactory.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java
-ojluni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java
+ojluni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java,jdk11u/jdk-11.0.13-ga,src/java.prefs/share/classes/java/util/prefs/InvalidPreferencesFormatException.java
ojluni/src/main/java/java/util/prefs/NodeChangeEvent.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/NodeChangeEvent.java
-ojluni/src/main/java/java/util/prefs/NodeChangeListener.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/NodeChangeListener.java
+ojluni/src/main/java/java/util/prefs/NodeChangeListener.java,jdk11u/jdk-11.0.13-ga,src/java.prefs/share/classes/java/util/prefs/NodeChangeListener.java
ojluni/src/main/java/java/util/prefs/PreferenceChangeEvent.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/PreferenceChangeEvent.java
ojluni/src/main/java/java/util/prefs/PreferenceChangeListener.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/PreferenceChangeListener.java
ojluni/src/main/java/java/util/prefs/Preferences.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/Preferences.java
ojluni/src/main/java/java/util/prefs/PreferencesFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/PreferencesFactory.java
ojluni/src/main/java/java/util/prefs/XmlSupport.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/prefs/XmlSupport.java
-ojluni/src/main/java/java/util/regex/MatchResult.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/regex/MatchResult.java
+ojluni/src/main/java/java/util/regex/MatchResult.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/regex/MatchResult.java
ojluni/src/main/java/java/util/regex/Matcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/regex/Matcher.java
ojluni/src/main/java/java/util/regex/Pattern.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/regex/Pattern.java
-ojluni/src/main/java/java/util/regex/PatternSyntaxException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
+ojluni/src/main/java/java/util/regex/PatternSyntaxException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
ojluni/src/main/java/java/util/stream/AbstractPipeline.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/AbstractPipeline.java
-ojluni/src/main/java/java/util/stream/AbstractShortCircuitTask.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/AbstractShortCircuitTask.java
-ojluni/src/main/java/java/util/stream/AbstractSpinedBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/AbstractSpinedBuffer.java
+ojluni/src/main/java/java/util/stream/AbstractShortCircuitTask.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/AbstractShortCircuitTask.java
+ojluni/src/main/java/java/util/stream/AbstractSpinedBuffer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/AbstractSpinedBuffer.java
ojluni/src/main/java/java/util/stream/AbstractTask.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/AbstractTask.java
-ojluni/src/main/java/java/util/stream/BaseStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/stream/BaseStream.java
+ojluni/src/main/java/java/util/stream/BaseStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/BaseStream.java
ojluni/src/main/java/java/util/stream/Collector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Collector.java
ojluni/src/main/java/java/util/stream/Collectors.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Collectors.java
-ojluni/src/main/java/java/util/stream/DistinctOps.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/DistinctOps.java
+ojluni/src/main/java/java/util/stream/DistinctOps.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/DistinctOps.java
ojluni/src/main/java/java/util/stream/DoublePipeline.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/DoublePipeline.java
ojluni/src/main/java/java/util/stream/DoubleStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/DoubleStream.java
ojluni/src/main/java/java/util/stream/FindOps.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/FindOps.java
@@ -1142,145 +1142,145 @@
ojluni/src/main/java/java/util/stream/IntStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/IntStream.java
ojluni/src/main/java/java/util/stream/LongPipeline.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/LongPipeline.java
ojluni/src/main/java/java/util/stream/LongStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/LongStream.java
-ojluni/src/main/java/java/util/stream/MatchOps.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/stream/MatchOps.java
+ojluni/src/main/java/java/util/stream/MatchOps.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/MatchOps.java
ojluni/src/main/java/java/util/stream/Node.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Node.java
ojluni/src/main/java/java/util/stream/Nodes.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Nodes.java
ojluni/src/main/java/java/util/stream/PipelineHelper.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/PipelineHelper.java
ojluni/src/main/java/java/util/stream/ReduceOps.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/ReduceOps.java
ojluni/src/main/java/java/util/stream/ReferencePipeline.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/ReferencePipeline.java
-ojluni/src/main/java/java/util/stream/Sink.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/stream/Sink.java
+ojluni/src/main/java/java/util/stream/Sink.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/Sink.java
ojluni/src/main/java/java/util/stream/SliceOps.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/SliceOps.java
ojluni/src/main/java/java/util/stream/SortedOps.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/SortedOps.java
-ojluni/src/main/java/java/util/stream/SpinedBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/SpinedBuffer.java
+ojluni/src/main/java/java/util/stream/SpinedBuffer.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/SpinedBuffer.java
ojluni/src/main/java/java/util/stream/Stream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Stream.java
-ojluni/src/main/java/java/util/stream/StreamOpFlag.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/stream/StreamOpFlag.java
-ojluni/src/main/java/java/util/stream/StreamShape.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/StreamShape.java
+ojluni/src/main/java/java/util/stream/StreamOpFlag.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/StreamOpFlag.java
+ojluni/src/main/java/java/util/stream/StreamShape.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/StreamShape.java
ojluni/src/main/java/java/util/stream/StreamSpliterators.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/StreamSpliterators.java
-ojluni/src/main/java/java/util/stream/StreamSupport.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/StreamSupport.java
+ojluni/src/main/java/java/util/stream/StreamSupport.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/StreamSupport.java
ojluni/src/main/java/java/util/stream/Streams.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Streams.java
-ojluni/src/main/java/java/util/stream/TerminalOp.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/TerminalOp.java
-ojluni/src/main/java/java/util/stream/TerminalSink.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/TerminalSink.java
-ojluni/src/main/java/java/util/stream/Tripwire.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/Tripwire.java
+ojluni/src/main/java/java/util/stream/TerminalOp.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/TerminalOp.java
+ojluni/src/main/java/java/util/stream/TerminalSink.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/TerminalSink.java
+ojluni/src/main/java/java/util/stream/Tripwire.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/stream/Tripwire.java
ojluni/src/main/java/java/util/stream/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/stream/package-info.java
ojluni/src/main/java/java/util/zip/Adler32.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/Adler32.java
ojluni/src/main/java/java/util/zip/CRC32.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/CRC32.java
-ojluni/src/main/java/java/util/zip/CheckedInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/CheckedInputStream.java
-ojluni/src/main/java/java/util/zip/CheckedOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/CheckedOutputStream.java
+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,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/Checksum.java
-ojluni/src/main/java/java/util/zip/DataFormatException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/DataFormatException.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/Deflater.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/Deflater.java
-ojluni/src/main/java/java/util/zip/DeflaterInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/DeflaterInputStream.java
-ojluni/src/main/java/java/util/zip/DeflaterOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java
-ojluni/src/main/java/java/util/zip/GZIPInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/GZIPInputStream.java
-ojluni/src/main/java/java/util/zip/GZIPOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/GZIPOutputStream.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
+ojluni/src/main/java/java/util/zip/GZIPInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/GZIPInputStream.java
+ojluni/src/main/java/java/util/zip/GZIPOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
ojluni/src/main/java/java/util/zip/Inflater.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/Inflater.java
-ojluni/src/main/java/java/util/zip/InflaterInputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/InflaterInputStream.java
-ojluni/src/main/java/java/util/zip/InflaterOutputStream.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/InflaterOutputStream.java
+ojluni/src/main/java/java/util/zip/InflaterInputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/InflaterInputStream.java
+ojluni/src/main/java/java/util/zip/InflaterOutputStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/java/util/zip/InflaterOutputStream.java
ojluni/src/main/java/java/util/zip/ZStreamRef.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/ZStreamRef.java
ojluni/src/main/java/java/util/zip/ZipCoder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/ZipCoder.java
-ojluni/src/main/java/java/util/zip/ZipConstants.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/ZipConstants.java
-ojluni/src/main/java/java/util/zip/ZipConstants64.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/ZipConstants64.java
+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+28,src/java.base/share/classes/java/util/zip/ZipError.java
-ojluni/src/main/java/java/util/zip/ZipException.java,jdk11u/jdk-11+28,src/java.base/share/classes/java/util/zip/ZipException.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/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
ojluni/src/main/java/java/util/zip/ZipUtils.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/java/util/zip/ZipUtils.java
-ojluni/src/main/java/javax/crypto/AEADBadTagException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/AEADBadTagException.java
-ojluni/src/main/java/javax/crypto/BadPaddingException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/BadPaddingException.java
+ojluni/src/main/java/javax/crypto/AEADBadTagException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/AEADBadTagException.java
+ojluni/src/main/java/javax/crypto/BadPaddingException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/BadPaddingException.java
ojluni/src/main/java/javax/crypto/Cipher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/Cipher.java
ojluni/src/main/java/javax/crypto/CipherInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CipherInputStream.java
ojluni/src/main/java/javax/crypto/CipherOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CipherOutputStream.java
ojluni/src/main/java/javax/crypto/CipherSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CipherSpi.java
-ojluni/src/main/java/javax/crypto/CryptoAllPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CryptoAllPermission.java
+ojluni/src/main/java/javax/crypto/CryptoAllPermission.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/CryptoAllPermission.java
ojluni/src/main/java/javax/crypto/CryptoPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CryptoPermission.java
ojluni/src/main/java/javax/crypto/CryptoPermissions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CryptoPermissions.java
ojluni/src/main/java/javax/crypto/CryptoPolicyParser.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java
ojluni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
ojluni/src/main/java/javax/crypto/ExemptionMechanism.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/ExemptionMechanism.java
-ojluni/src/main/java/javax/crypto/ExemptionMechanismException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/ExemptionMechanismException.java
-ojluni/src/main/java/javax/crypto/ExemptionMechanismSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/ExemptionMechanismSpi.java
-ojluni/src/main/java/javax/crypto/IllegalBlockSizeException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/IllegalBlockSizeException.java
+ojluni/src/main/java/javax/crypto/ExemptionMechanismException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/ExemptionMechanismException.java
+ojluni/src/main/java/javax/crypto/ExemptionMechanismSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java
+ojluni/src/main/java/javax/crypto/IllegalBlockSizeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/IllegalBlockSizeException.java
ojluni/src/main/java/javax/crypto/JarVerifier.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/JarVerifier.java
ojluni/src/main/java/javax/crypto/JceSecurity.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/JceSecurity.java
ojluni/src/main/java/javax/crypto/JceSecurityManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/JceSecurityManager.java
ojluni/src/main/java/javax/crypto/KeyAgreement.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/KeyAgreement.java
-ojluni/src/main/java/javax/crypto/KeyAgreementSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/KeyAgreementSpi.java
+ojluni/src/main/java/javax/crypto/KeyAgreementSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java
ojluni/src/main/java/javax/crypto/KeyGenerator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/KeyGenerator.java
ojluni/src/main/java/javax/crypto/KeyGeneratorSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/KeyGeneratorSpi.java
ojluni/src/main/java/javax/crypto/Mac.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/Mac.java
-ojluni/src/main/java/javax/crypto/MacSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/MacSpi.java
-ojluni/src/main/java/javax/crypto/NoSuchPaddingException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/NoSuchPaddingException.java
-ojluni/src/main/java/javax/crypto/NullCipher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/NullCipher.java
-ojluni/src/main/java/javax/crypto/NullCipherSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/NullCipherSpi.java
+ojluni/src/main/java/javax/crypto/MacSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/MacSpi.java
+ojluni/src/main/java/javax/crypto/NoSuchPaddingException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/NoSuchPaddingException.java
+ojluni/src/main/java/javax/crypto/NullCipher.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/NullCipher.java
+ojluni/src/main/java/javax/crypto/NullCipherSpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/NullCipherSpi.java
ojluni/src/main/java/javax/crypto/SealedObject.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/SealedObject.java
-ojluni/src/main/java/javax/crypto/SecretKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/SecretKey.java
+ojluni/src/main/java/javax/crypto/SecretKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/SecretKey.java
ojluni/src/main/java/javax/crypto/SecretKeyFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/SecretKeyFactory.java
-ojluni/src/main/java/javax/crypto/SecretKeyFactorySpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/SecretKeyFactorySpi.java
-ojluni/src/main/java/javax/crypto/ShortBufferException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/ShortBufferException.java
-ojluni/src/main/java/javax/crypto/interfaces/DHKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/interfaces/DHKey.java
-ojluni/src/main/java/javax/crypto/interfaces/DHPrivateKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/interfaces/DHPrivateKey.java
-ojluni/src/main/java/javax/crypto/interfaces/DHPublicKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/interfaces/DHPublicKey.java
-ojluni/src/main/java/javax/crypto/interfaces/PBEKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/interfaces/PBEKey.java
-ojluni/src/main/java/javax/crypto/spec/DESKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/DESKeySpec.java
-ojluni/src/main/java/javax/crypto/spec/DESedeKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/DESedeKeySpec.java
-ojluni/src/main/java/javax/crypto/spec/DHGenParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/DHGenParameterSpec.java
-ojluni/src/main/java/javax/crypto/spec/DHParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/DHParameterSpec.java
-ojluni/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java
-ojluni/src/main/java/javax/crypto/spec/DHPublicKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java
+ojluni/src/main/java/javax/crypto/SecretKeyFactorySpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java
+ojluni/src/main/java/javax/crypto/ShortBufferException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/ShortBufferException.java
+ojluni/src/main/java/javax/crypto/interfaces/DHKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/interfaces/DHKey.java
+ojluni/src/main/java/javax/crypto/interfaces/DHPrivateKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
+ojluni/src/main/java/javax/crypto/interfaces/DHPublicKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
+ojluni/src/main/java/javax/crypto/interfaces/PBEKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/interfaces/PBEKey.java
+ojluni/src/main/java/javax/crypto/spec/DESKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/DESKeySpec.java
+ojluni/src/main/java/javax/crypto/spec/DESedeKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/DESedeKeySpec.java
+ojluni/src/main/java/javax/crypto/spec/DHGenParameterSpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/DHGenParameterSpec.java
+ojluni/src/main/java/javax/crypto/spec/DHParameterSpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/DHParameterSpec.java
+ojluni/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/DHPrivateKeySpec.java
+ojluni/src/main/java/javax/crypto/spec/DHPublicKeySpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/DHPublicKeySpec.java
ojluni/src/main/java/javax/crypto/spec/GCMParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/GCMParameterSpec.java
ojluni/src/main/java/javax/crypto/spec/IvParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java
ojluni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java
ojluni/src/main/java/javax/crypto/spec/PBEKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/PBEKeySpec.java
-ojluni/src/main/java/javax/crypto/spec/PBEParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/PBEParameterSpec.java
+ojluni/src/main/java/javax/crypto/spec/PBEParameterSpec.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/crypto/spec/PBEParameterSpec.java
ojluni/src/main/java/javax/crypto/spec/PSource.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/PSource.java
ojluni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java
ojluni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
ojluni/src/main/java/javax/crypto/spec/SecretKeySpec.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java
-ojluni/src/main/java/javax/net/ServerSocketFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ServerSocketFactory.java
-ojluni/src/main/java/javax/net/SocketFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/SocketFactory.java
-ojluni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
+ojluni/src/main/java/javax/net/ServerSocketFactory.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ServerSocketFactory.java
+ojluni/src/main/java/javax/net/SocketFactory.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/SocketFactory.java
+ojluni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
ojluni/src/main/java/javax/net/ssl/ExtendedSSLSession.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
ojluni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
-ojluni/src/main/java/javax/net/ssl/HandshakeCompletedListener.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java
-ojluni/src/main/java/javax/net/ssl/HostnameVerifier.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/HostnameVerifier.java
+ojluni/src/main/java/javax/net/ssl/HandshakeCompletedListener.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/HandshakeCompletedListener.java
+ojluni/src/main/java/javax/net/ssl/HostnameVerifier.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/HostnameVerifier.java
ojluni/src/main/java/javax/net/ssl/HttpsURLConnection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
-ojluni/src/main/java/javax/net/ssl/KeyManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/KeyManager.java
+ojluni/src/main/java/javax/net/ssl/KeyManager.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/KeyManager.java
ojluni/src/main/java/javax/net/ssl/KeyManagerFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/KeyManagerFactory.java
-ojluni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
-ojluni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
-ojluni/src/main/java/javax/net/ssl/ManagerFactoryParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java
+ojluni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
+ojluni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
+ojluni/src/main/java/javax/net/ssl/ManagerFactoryParameters.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/ManagerFactoryParameters.java
ojluni/src/main/java/javax/net/ssl/SNIHostName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SNIHostName.java
-ojluni/src/main/java/javax/net/ssl/SNIMatcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SNIMatcher.java
+ojluni/src/main/java/javax/net/ssl/SNIMatcher.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SNIMatcher.java
ojluni/src/main/java/javax/net/ssl/SNIServerName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SNIServerName.java
ojluni/src/main/java/javax/net/ssl/SSLContext.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLContext.java
ojluni/src/main/java/javax/net/ssl/SSLContextSpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLContextSpi.java
ojluni/src/main/java/javax/net/ssl/SSLEngine.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLEngine.java
ojluni/src/main/java/javax/net/ssl/SSLEngineResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
ojluni/src/main/java/javax/net/ssl/SSLException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLException.java
-ojluni/src/main/java/javax/net/ssl/SSLHandshakeException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLHandshakeException.java
-ojluni/src/main/java/javax/net/ssl/SSLKeyException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLKeyException.java
+ojluni/src/main/java/javax/net/ssl/SSLHandshakeException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SSLHandshakeException.java
+ojluni/src/main/java/javax/net/ssl/SSLKeyException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SSLKeyException.java
ojluni/src/main/java/javax/net/ssl/SSLParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLParameters.java
-ojluni/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
+ojluni/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
ojluni/src/main/java/javax/net/ssl/SSLPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLPermission.java
-ojluni/src/main/java/javax/net/ssl/SSLProtocolException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLProtocolException.java
+ojluni/src/main/java/javax/net/ssl/SSLProtocolException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SSLProtocolException.java
ojluni/src/main/java/javax/net/ssl/SSLServerSocket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
ojluni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
ojluni/src/main/java/javax/net/ssl/SSLSession.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLSession.java
-ojluni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
-ojluni/src/main/java/javax/net/ssl/SSLSessionBindingListener.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java
+ojluni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
+ojluni/src/main/java/javax/net/ssl/SSLSessionBindingListener.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/SSLSessionBindingListener.java
ojluni/src/main/java/javax/net/ssl/SSLSessionContext.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
ojluni/src/main/java/javax/net/ssl/SSLSocket.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLSocket.java
ojluni/src/main/java/javax/net/ssl/SSLSocketFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
-ojluni/src/main/java/javax/net/ssl/StandardConstants.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/StandardConstants.java
-ojluni/src/main/java/javax/net/ssl/TrustManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/TrustManager.java
+ojluni/src/main/java/javax/net/ssl/StandardConstants.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/StandardConstants.java
+ojluni/src/main/java/javax/net/ssl/TrustManager.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/TrustManager.java
ojluni/src/main/java/javax/net/ssl/TrustManagerFactory.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/TrustManagerFactory.java
-ojluni/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
-ojluni/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
+ojluni/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
+ojluni/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
ojluni/src/main/java/javax/net/ssl/X509ExtendedTrustManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
ojluni/src/main/java/javax/net/ssl/X509KeyManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/X509KeyManager.java
-ojluni/src/main/java/javax/net/ssl/X509TrustManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/net/ssl/X509TrustManager.java
+ojluni/src/main/java/javax/net/ssl/X509TrustManager.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/javax/net/ssl/X509TrustManager.java
ojluni/src/main/java/javax/security/auth/AuthPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/security/auth/AuthPermission.java
ojluni/src/main/java/javax/security/auth/DestroyFailedException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/security/auth/DestroyFailedException.java
ojluni/src/main/java/javax/security/auth/Destroyable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/security/auth/Destroyable.java
@@ -1306,37 +1306,37 @@
ojluni/src/main/java/javax/security/cert/X509Certificate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/security/cert/X509Certificate.java
ojluni/src/main/java/javax/security/cert/package-info.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/javax/security/cert/package-info.java
ojluni/src/main/java/javax/sql/CommonDataSource.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/CommonDataSource.java
-ojluni/src/main/java/javax/sql/ConnectionEvent.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/ConnectionEvent.java
-ojluni/src/main/java/javax/sql/ConnectionEventListener.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/ConnectionEventListener.java
+ojluni/src/main/java/javax/sql/ConnectionEvent.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/ConnectionEvent.java
+ojluni/src/main/java/javax/sql/ConnectionEventListener.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/ConnectionEventListener.java
ojluni/src/main/java/javax/sql/ConnectionPoolDataSource.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java
ojluni/src/main/java/javax/sql/DataSource.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/DataSource.java
ojluni/src/main/java/javax/sql/PooledConnection.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/PooledConnection.java
ojluni/src/main/java/javax/sql/RowSet.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSet.java
-ojluni/src/main/java/javax/sql/RowSetEvent.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSetEvent.java
-ojluni/src/main/java/javax/sql/RowSetInternal.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSetInternal.java
-ojluni/src/main/java/javax/sql/RowSetListener.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSetListener.java
-ojluni/src/main/java/javax/sql/RowSetMetaData.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSetMetaData.java
-ojluni/src/main/java/javax/sql/RowSetReader.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSetReader.java
-ojluni/src/main/java/javax/sql/RowSetWriter.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/RowSetWriter.java
+ojluni/src/main/java/javax/sql/RowSetEvent.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/RowSetEvent.java
+ojluni/src/main/java/javax/sql/RowSetInternal.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/RowSetInternal.java
+ojluni/src/main/java/javax/sql/RowSetListener.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/RowSetListener.java
+ojluni/src/main/java/javax/sql/RowSetMetaData.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/RowSetMetaData.java
+ojluni/src/main/java/javax/sql/RowSetReader.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/RowSetReader.java
+ojluni/src/main/java/javax/sql/RowSetWriter.java,jdk11u/jdk-11.0.13-ga,src/java.sql/share/classes/javax/sql/RowSetWriter.java
ojluni/src/main/java/javax/sql/StatementEvent.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/StatementEvent.java
ojluni/src/main/java/javax/sql/StatementEventListener.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/javax/sql/StatementEventListener.java
-ojluni/src/main/java/jdk/internal/HotSpotIntrinsicCandidate.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java
-ojluni/src/main/java/jdk/internal/math/DoubleConsts.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/math/DoubleConsts.java
-ojluni/src/main/java/jdk/internal/math/FDBigInteger.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/math/FDBigInteger.java
-ojluni/src/main/java/jdk/internal/math/FloatConsts.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/math/FloatConsts.java
-ojluni/src/main/java/jdk/internal/math/FloatingDecimal.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java
-ojluni/src/main/java/jdk/internal/math/FormattedFloatingDecimal.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/math/FormattedFloatingDecimal.java
-ojluni/src/main/java/jdk/internal/misc/JavaIOFileDescriptorAccess.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java
-ojluni/src/main/java/jdk/internal/misc/JavaObjectInputStreamAccess.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java
+ojluni/src/main/java/jdk/internal/HotSpotIntrinsicCandidate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java
+ojluni/src/main/java/jdk/internal/math/DoubleConsts.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/math/DoubleConsts.java
+ojluni/src/main/java/jdk/internal/math/FDBigInteger.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/math/FDBigInteger.java
+ojluni/src/main/java/jdk/internal/math/FloatConsts.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/math/FloatConsts.java
+ojluni/src/main/java/jdk/internal/math/FloatingDecimal.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/math/FloatingDecimal.java
+ojluni/src/main/java/jdk/internal/math/FormattedFloatingDecimal.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/math/FormattedFloatingDecimal.java
+ojluni/src/main/java/jdk/internal/misc/JavaIOFileDescriptorAccess.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/misc/JavaIOFileDescriptorAccess.java
+ojluni/src/main/java/jdk/internal/misc/JavaObjectInputStreamAccess.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/misc/JavaObjectInputStreamAccess.java
ojluni/src/main/java/jdk/internal/misc/SharedSecrets.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
ojluni/src/main/java/jdk/internal/misc/Unsafe.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/misc/Unsafe.java
ojluni/src/main/java/jdk/internal/misc/VM.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/misc/VM.java
-ojluni/src/main/java/jdk/internal/reflect/CallerSensitive.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/reflect/CallerSensitive.java
-ojluni/src/main/java/jdk/internal/reflect/Reflection.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/reflect/Reflection.java
+ojluni/src/main/java/jdk/internal/reflect/CallerSensitive.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/reflect/CallerSensitive.java
+ojluni/src/main/java/jdk/internal/reflect/Reflection.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/reflect/Reflection.java
ojluni/src/main/java/jdk/internal/util/Preconditions.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/util/Preconditions.java
-ojluni/src/main/java/jdk/internal/vm/annotation/Contended.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/vm/annotation/Contended.java
-ojluni/src/main/java/jdk/internal/vm/annotation/ReservedStackAccess.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/vm/annotation/ReservedStackAccess.java
-ojluni/src/main/java/jdk/internal/vm/annotation/Stable.java,jdk11u/jdk-11+28,src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java
+ojluni/src/main/java/jdk/internal/vm/annotation/Contended.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/vm/annotation/Contended.java
+ojluni/src/main/java/jdk/internal/vm/annotation/ReservedStackAccess.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/vm/annotation/ReservedStackAccess.java
+ojluni/src/main/java/jdk/internal/vm/annotation/Stable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java
ojluni/src/main/java/jdk/net/ExtendedSocketOptions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/jdk/net/ExtendedSocketOptions.java
ojluni/src/main/java/jdk/net/NetworkPermission.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/jdk/net/NetworkPermission.java
ojluni/src/main/java/jdk/net/SocketFlow.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/jdk/net/SocketFlow.java
@@ -1372,35 +1372,35 @@
ojluni/src/main/java/sun/misc/Unsafe.java,jdk7u/jdk7u40-b60,jdk/src/share/classes/sun/misc/Unsafe.java
ojluni/src/main/java/sun/misc/VM.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/misc/VM.java
ojluni/src/main/java/sun/misc/Version.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/misc/Version.java.template
-ojluni/src/main/java/sun/net/ApplicationProxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ApplicationProxy.java
-ojluni/src/main/java/sun/net/ConnectionResetException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ConnectionResetException.java
+ojluni/src/main/java/sun/net/ApplicationProxy.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ApplicationProxy.java
+ojluni/src/main/java/sun/net/ConnectionResetException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ConnectionResetException.java
ojluni/src/main/java/sun/net/ExtendedOptionsImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ExtendedOptionsImpl.java
ojluni/src/main/java/sun/net/NetHooks.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/net/NetHooks.java
ojluni/src/main/java/sun/net/NetProperties.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/NetProperties.java
ojluni/src/main/java/sun/net/NetworkClient.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/NetworkClient.java
-ojluni/src/main/java/sun/net/ProgressEvent.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ProgressEvent.java
-ojluni/src/main/java/sun/net/ProgressListener.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ProgressListener.java
-ojluni/src/main/java/sun/net/ProgressMeteringPolicy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ProgressMeteringPolicy.java
+ojluni/src/main/java/sun/net/ProgressEvent.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ProgressEvent.java
+ojluni/src/main/java/sun/net/ProgressListener.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ProgressListener.java
+ojluni/src/main/java/sun/net/ProgressMeteringPolicy.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ProgressMeteringPolicy.java
ojluni/src/main/java/sun/net/ProgressMonitor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ProgressMonitor.java
-ojluni/src/main/java/sun/net/ProgressSource.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ProgressSource.java
+ojluni/src/main/java/sun/net/ProgressSource.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ProgressSource.java
ojluni/src/main/java/sun/net/ResourceManager.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ResourceManager.java
-ojluni/src/main/java/sun/net/SocksProxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/SocksProxy.java
+ojluni/src/main/java/sun/net/SocksProxy.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/SocksProxy.java
ojluni/src/main/java/sun/net/TelnetInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/TelnetInputStream.java
ojluni/src/main/java/sun/net/TelnetOutputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/TelnetOutputStream.java
-ojluni/src/main/java/sun/net/TelnetProtocolException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/TelnetProtocolException.java
+ojluni/src/main/java/sun/net/TelnetProtocolException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/TelnetProtocolException.java
ojluni/src/main/java/sun/net/ftp/FtpClient.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpClient.java
ojluni/src/main/java/sun/net/ftp/FtpClientProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java
-ojluni/src/main/java/sun/net/ftp/FtpDirEntry.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpDirEntry.java
-ojluni/src/main/java/sun/net/ftp/FtpDirParser.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpDirParser.java
-ojluni/src/main/java/sun/net/ftp/FtpLoginException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpLoginException.java
-ojluni/src/main/java/sun/net/ftp/FtpProtocolException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java
-ojluni/src/main/java/sun/net/ftp/FtpReplyCode.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/FtpReplyCode.java
-ojluni/src/main/java/sun/net/ftp/impl/DefaultFtpClientProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java
+ojluni/src/main/java/sun/net/ftp/FtpDirEntry.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ftp/FtpDirEntry.java
+ojluni/src/main/java/sun/net/ftp/FtpDirParser.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ftp/FtpDirParser.java
+ojluni/src/main/java/sun/net/ftp/FtpLoginException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ftp/FtpLoginException.java
+ojluni/src/main/java/sun/net/ftp/FtpProtocolException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ftp/FtpProtocolException.java
+ojluni/src/main/java/sun/net/ftp/FtpReplyCode.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ftp/FtpReplyCode.java
+ojluni/src/main/java/sun/net/ftp/impl/DefaultFtpClientProvider.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java
ojluni/src/main/java/sun/net/ftp/impl/FtpClient.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java
ojluni/src/main/java/sun/net/spi/DefaultProxySelector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
ojluni/src/main/java/sun/net/spi/nameservice/NameService.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/spi/nameservice/NameService.java
ojluni/src/main/java/sun/net/util/IPAddressUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/util/IPAddressUtil.java
-ojluni/src/main/java/sun/net/util/URLUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/util/URLUtil.java
+ojluni/src/main/java/sun/net/util/URLUtil.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/util/URLUtil.java
ojluni/src/main/java/sun/net/www/MessageHeader.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/MessageHeader.java
ojluni/src/main/java/sun/net/www/MeteredStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/MeteredStream.java
ojluni/src/main/java/sun/net/www/ParseUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/ParseUtil.java
@@ -1408,7 +1408,7 @@
ojluni/src/main/java/sun/net/www/protocol/file/FileURLConnection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java
ojluni/src/main/java/sun/net/www/protocol/file/Handler.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/net/www/protocol/file/Handler.java
ojluni/src/main/java/sun/net/www/protocol/ftp/FtpURLConnection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
-ojluni/src/main/java/sun/net/www/protocol/ftp/Handler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/protocol/ftp/Handler.java
+ojluni/src/main/java/sun/net/www/protocol/ftp/Handler.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java
ojluni/src/main/java/sun/net/www/protocol/jar/Handler.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java
ojluni/src/main/java/sun/net/www/protocol/jar/JarFileFactory.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
ojluni/src/main/java/sun/net/www/protocol/jar/JarURLConnection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
@@ -1421,18 +1421,18 @@
ojluni/src/main/java/sun/nio/ch/AsynchronousFileChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
ojluni/src/main/java/sun/nio/ch/AsynchronousServerSocketChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
ojluni/src/main/java/sun/nio/ch/AsynchronousSocketChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
-ojluni/src/main/java/sun/nio/ch/Cancellable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/Cancellable.java
+ojluni/src/main/java/sun/nio/ch/Cancellable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/Cancellable.java
ojluni/src/main/java/sun/nio/ch/ChannelInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/ChannelInputStream.java
-ojluni/src/main/java/sun/nio/ch/CompletedFuture.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/CompletedFuture.java
+ojluni/src/main/java/sun/nio/ch/CompletedFuture.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/CompletedFuture.java
ojluni/src/main/java/sun/nio/ch/DatagramChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
-ojluni/src/main/java/sun/nio/ch/DatagramDispatcher.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java
+ojluni/src/main/java/sun/nio/ch/DatagramDispatcher.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java
ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
ojluni/src/main/java/sun/nio/ch/DefaultAsynchronousChannelProvider.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
ojluni/src/main/java/sun/nio/ch/DefaultSelectorProvider.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
ojluni/src/main/java/sun/nio/ch/DirectBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/DirectBuffer.java
ojluni/src/main/java/sun/nio/ch/EPoll.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/EPoll.java
ojluni/src/main/java/sun/nio/ch/EPollPort.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/EPollPort.java
-ojluni/src/main/java/sun/nio/ch/ExtendedSocketOption.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java
+ojluni/src/main/java/sun/nio/ch/ExtendedSocketOption.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/ExtendedSocketOption.java
ojluni/src/main/java/sun/nio/ch/FileChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java
# sun.nio.ch.FileDescriptorHolderSocketImpl doesn’t come from the upstream OpenJDK.
ojluni/src/main/java/sun/nio/ch/FileDispatcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/FileDispatcher.java
@@ -1440,34 +1440,34 @@
ojluni/src/main/java/sun/nio/ch/FileKey.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/FileKey.java
ojluni/src/main/java/sun/nio/ch/FileLockImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/FileLockImpl.java
ojluni/src/main/java/sun/nio/ch/FileLockTable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/FileLockTable.java
-ojluni/src/main/java/sun/nio/ch/Groupable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/Groupable.java
-ojluni/src/main/java/sun/nio/ch/IOStatus.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/IOStatus.java
+ojluni/src/main/java/sun/nio/ch/Groupable.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/Groupable.java
+ojluni/src/main/java/sun/nio/ch/IOStatus.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/IOStatus.java
ojluni/src/main/java/sun/nio/ch/IOUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/IOUtil.java
ojluni/src/main/java/sun/nio/ch/IOVecWrapper.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/IOVecWrapper.java
-ojluni/src/main/java/sun/nio/ch/Interruptible.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/Interruptible.java
+ojluni/src/main/java/sun/nio/ch/Interruptible.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/Interruptible.java
ojluni/src/main/java/sun/nio/ch/Invoker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/Invoker.java
-ojluni/src/main/java/sun/nio/ch/LinuxAsynchronousChannelProvider.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java
+ojluni/src/main/java/sun/nio/ch/LinuxAsynchronousChannelProvider.java,jdk11u/jdk-11.0.13-ga,src/java.base/linux/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java
ojluni/src/main/java/sun/nio/ch/MembershipKeyImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java
ojluni/src/main/java/sun/nio/ch/MembershipRegistry.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java
-ojluni/src/main/java/sun/nio/ch/NativeDispatcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/NativeDispatcher.java
+ojluni/src/main/java/sun/nio/ch/NativeDispatcher.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
ojluni/src/main/java/sun/nio/ch/NativeObject.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/NativeObject.java
-ojluni/src/main/java/sun/nio/ch/NativeThread.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/NativeThread.java
-ojluni/src/main/java/sun/nio/ch/NativeThreadSet.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java
+ojluni/src/main/java/sun/nio/ch/NativeThread.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/ch/NativeThread.java
+ojluni/src/main/java/sun/nio/ch/NativeThreadSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/NativeThreadSet.java
ojluni/src/main/java/sun/nio/ch/Net.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/Net.java
-ojluni/src/main/java/sun/nio/ch/OptionKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/OptionKey.java
+ojluni/src/main/java/sun/nio/ch/OptionKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/OptionKey.java
ojluni/src/main/java/sun/nio/ch/PendingFuture.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/PendingFuture.java
ojluni/src/main/java/sun/nio/ch/PipeImpl.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/PipeImpl.java
ojluni/src/main/java/sun/nio/ch/PollArrayWrapper.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java
ojluni/src/main/java/sun/nio/ch/PollSelectorImpl.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java
ojluni/src/main/java/sun/nio/ch/PollSelectorProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/PollSelectorProvider.java
-ojluni/src/main/java/sun/nio/ch/Port.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/Port.java
+ojluni/src/main/java/sun/nio/ch/Port.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/ch/Port.java
ojluni/src/main/java/sun/nio/ch/SelChImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SelChImpl.java
ojluni/src/main/java/sun/nio/ch/SelectionKeyImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java
ojluni/src/main/java/sun/nio/ch/SelectorImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
-ojluni/src/main/java/sun/nio/ch/SelectorProviderImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java
+ojluni/src/main/java/sun/nio/ch/SelectorProviderImpl.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/SelectorProviderImpl.java
ojluni/src/main/java/sun/nio/ch/ServerSocketAdaptor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
ojluni/src/main/java/sun/nio/ch/ServerSocketChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
-ojluni/src/main/java/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
+ojluni/src/main/java/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
ojluni/src/main/java/sun/nio/ch/SinkChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java
ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
ojluni/src/main/java/sun/nio/ch/SocketChannelImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -1482,25 +1482,25 @@
ojluni/src/main/java/sun/nio/ch/Util.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/ch/Util.java
ojluni/src/main/java/sun/nio/cs/ArrayDecoder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/cs/ArrayDecoder.java
ojluni/src/main/java/sun/nio/cs/ArrayEncoder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/cs/ArrayEncoder.java
-ojluni/src/main/java/sun/nio/cs/HistoricallyNamedCharset.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java
+ojluni/src/main/java/sun/nio/cs/HistoricallyNamedCharset.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/cs/HistoricallyNamedCharset.java
ojluni/src/main/java/sun/nio/cs/StreamDecoder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/cs/StreamDecoder.java
ojluni/src/main/java/sun/nio/cs/StreamEncoder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/cs/StreamEncoder.java
ojluni/src/main/java/sun/nio/cs/ThreadLocalCoders.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/cs/ThreadLocalCoders.java
-ojluni/src/main/java/sun/nio/fs/AbstractBasicFileAttributeView.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
+ojluni/src/main/java/sun/nio/fs/AbstractBasicFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
ojluni/src/main/java/sun/nio/fs/AbstractFileSystemProvider.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
ojluni/src/main/java/sun/nio/fs/AbstractFileTypeDetector.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
ojluni/src/main/java/sun/nio/fs/AbstractPath.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractPath.java
ojluni/src/main/java/sun/nio/fs/AbstractPoller.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractPoller.java
ojluni/src/main/java/sun/nio/fs/AbstractUserDefinedFileAttributeView.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
ojluni/src/main/java/sun/nio/fs/AbstractWatchKey.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java
-ojluni/src/main/java/sun/nio/fs/AbstractWatchService.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java
-ojluni/src/main/java/sun/nio/fs/BasicFileAttributesHolder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java
+ojluni/src/main/java/sun/nio/fs/AbstractWatchService.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/fs/AbstractWatchService.java
+ojluni/src/main/java/sun/nio/fs/BasicFileAttributesHolder.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/fs/BasicFileAttributesHolder.java
ojluni/src/main/java/sun/nio/fs/Cancellable.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/Cancellable.java
ojluni/src/main/java/sun/nio/fs/DefaultFileSystemProvider.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
-ojluni/src/main/java/sun/nio/fs/DefaultFileTypeDetector.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java
-ojluni/src/main/java/sun/nio/fs/DynamicFileAttributeView.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java
-ojluni/src/main/java/sun/nio/fs/FileOwnerAttributeViewImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
-ojluni/src/main/java/sun/nio/fs/Globs.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/Globs.java
+ojluni/src/main/java/sun/nio/fs/DefaultFileTypeDetector.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/DefaultFileTypeDetector.java
+ojluni/src/main/java/sun/nio/fs/DynamicFileAttributeView.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/fs/DynamicFileAttributeView.java
+ojluni/src/main/java/sun/nio/fs/FileOwnerAttributeViewImpl.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
+ojluni/src/main/java/sun/nio/fs/Globs.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/nio/fs/Globs.java
ojluni/src/main/java/sun/nio/fs/LinuxDosFileAttributeView.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java
ojluni/src/main/java/sun/nio/fs/LinuxFileStore.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java
ojluni/src/main/java/sun/nio/fs/LinuxFileSystem.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
@@ -1520,38 +1520,38 @@
ojluni/src/main/java/sun/nio/fs/UnixDirectoryStream.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java
ojluni/src/main/java/sun/nio/fs/UnixException.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixException.java
ojluni/src/main/java/sun/nio/fs/UnixFileAttributeViews.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java
-ojluni/src/main/java/sun/nio/fs/UnixFileAttributes.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java
-ojluni/src/main/java/sun/nio/fs/UnixFileKey.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileKey.java
-ojluni/src/main/java/sun/nio/fs/UnixFileModeAttribute.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java
+ojluni/src/main/java/sun/nio/fs/UnixFileAttributes.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixFileAttributes.java
+ojluni/src/main/java/sun/nio/fs/UnixFileKey.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
+ojluni/src/main/java/sun/nio/fs/UnixFileModeAttribute.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixFileModeAttribute.java
ojluni/src/main/java/sun/nio/fs/UnixFileStore.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java
-ojluni/src/main/java/sun/nio/fs/UnixFileStoreAttributes.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java
+ojluni/src/main/java/sun/nio/fs/UnixFileStoreAttributes.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixFileStoreAttributes.java
ojluni/src/main/java/sun/nio/fs/UnixFileSystem.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileSystem.java
ojluni/src/main/java/sun/nio/fs/UnixFileSystemProvider.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java
-ojluni/src/main/java/sun/nio/fs/UnixMountEntry.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixMountEntry.java
+ojluni/src/main/java/sun/nio/fs/UnixMountEntry.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixMountEntry.java
ojluni/src/main/java/sun/nio/fs/UnixNativeDispatcher.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java
ojluni/src/main/java/sun/nio/fs/UnixPath.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixPath.java
-ojluni/src/main/java/sun/nio/fs/UnixSecureDirectoryStream.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java
+ojluni/src/main/java/sun/nio/fs/UnixSecureDirectoryStream.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixSecureDirectoryStream.java
ojluni/src/main/java/sun/nio/fs/UnixUriUtils.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java
-ojluni/src/main/java/sun/nio/fs/UnixUserPrincipals.java,jdk8u/jdk8u121-b13,jdk/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java
+ojluni/src/main/java/sun/nio/fs/UnixUserPrincipals.java,jdk11u/jdk-11.0.13-ga,src/java.base/unix/classes/sun/nio/fs/UnixUserPrincipals.java
ojluni/src/main/java/sun/nio/fs/Util.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/nio/fs/Util.java
ojluni/src/main/java/sun/reflect/CallerSensitive.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/reflect/CallerSensitive.java
ojluni/src/main/java/sun/reflect/Reflection.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/reflect/Reflection.java
ojluni/src/main/java/sun/reflect/misc/ReflectUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
ojluni/src/main/java/sun/security/action/GetBooleanAction.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/action/GetBooleanAction.java
ojluni/src/main/java/sun/security/action/GetIntegerAction.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/action/GetIntegerAction.java
-ojluni/src/main/java/sun/security/action/GetPropertyAction.java,jdk11u/jdk-11+28,src/java.base/share/classes/sun/security/action/GetPropertyAction.java
+ojluni/src/main/java/sun/security/action/GetPropertyAction.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/action/GetPropertyAction.java
ojluni/src/main/java/sun/security/jca/GetInstance.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/jca/GetInstance.java
ojluni/src/main/java/sun/security/jca/JCAUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/jca/JCAUtil.java
ojluni/src/main/java/sun/security/jca/ProviderConfig.java,jdk8u/jdk8u60-b31,jdk/src/share/classes/sun/security/jca/ProviderConfig.java
ojluni/src/main/java/sun/security/jca/ProviderList.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/jca/ProviderList.java
ojluni/src/main/java/sun/security/jca/Providers.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/jca/Providers.java
-ojluni/src/main/java/sun/security/jca/ServiceId.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/jca/ServiceId.java
+ojluni/src/main/java/sun/security/jca/ServiceId.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/jca/ServiceId.java
ojluni/src/main/java/sun/security/pkcs/ContentInfo.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/ContentInfo.java
ojluni/src/main/java/sun/security/pkcs/PKCS7.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/PKCS7.java
ojluni/src/main/java/sun/security/pkcs/PKCS8Key.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
ojluni/src/main/java/sun/security/pkcs/PKCS9Attribute.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java
ojluni/src/main/java/sun/security/pkcs/PKCS9Attributes.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java
-ojluni/src/main/java/sun/security/pkcs/ParsingException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/ParsingException.java
+ojluni/src/main/java/sun/security/pkcs/ParsingException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/pkcs/ParsingException.java
ojluni/src/main/java/sun/security/pkcs/SignerInfo.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/SignerInfo.java
ojluni/src/main/java/sun/security/pkcs/SigningCertificateInfo.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
# CertPathProvider was introduced in bf0403930ae8d1e86b3914d18b9711eeeec0adb9. Apparently, it came from SunEntries in the upstream.
@@ -1567,28 +1567,28 @@
ojluni/src/main/java/sun/security/provider/certpath/CertId.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/CertId.java
ojluni/src/main/java/sun/security/provider/certpath/CertPathHelper.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
ojluni/src/main/java/sun/security/provider/certpath/CertStoreHelper.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
-ojluni/src/main/java/sun/security/provider/certpath/ConstraintsChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
+ojluni/src/main/java/sun/security/provider/certpath/ConstraintsChecker.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
ojluni/src/main/java/sun/security/provider/certpath/DistributionPointFetcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
-ojluni/src/main/java/sun/security/provider/certpath/ForwardBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
-ojluni/src/main/java/sun/security/provider/certpath/ForwardState.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
-ojluni/src/main/java/sun/security/provider/certpath/KeyChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/KeyChecker.java
+ojluni/src/main/java/sun/security/provider/certpath/ForwardBuilder.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
+ojluni/src/main/java/sun/security/provider/certpath/ForwardState.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java
+ojluni/src/main/java/sun/security/provider/certpath/KeyChecker.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/KeyChecker.java
ojluni/src/main/java/sun/security/provider/certpath/OCSP.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
ojluni/src/main/java/sun/security/provider/certpath/OCSPRequest.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
ojluni/src/main/java/sun/security/provider/certpath/OCSPResponse.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
ojluni/src/main/java/sun/security/provider/certpath/PKIX.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/PKIX.java
ojluni/src/main/java/sun/security/provider/certpath/PKIXCertPathValidator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
-ojluni/src/main/java/sun/security/provider/certpath/PKIXMasterCertPathValidator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
+ojluni/src/main/java/sun/security/provider/certpath/PKIXMasterCertPathValidator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
ojluni/src/main/java/sun/security/provider/certpath/PolicyChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java
ojluni/src/main/java/sun/security/provider/certpath/PolicyNodeImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
ojluni/src/main/java/sun/security/provider/certpath/RevocationChecker.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java
-ojluni/src/main/java/sun/security/provider/certpath/State.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/State.java
+ojluni/src/main/java/sun/security/provider/certpath/State.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/State.java
ojluni/src/main/java/sun/security/provider/certpath/SunCertPathBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
ojluni/src/main/java/sun/security/provider/certpath/SunCertPathBuilderException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
-ojluni/src/main/java/sun/security/provider/certpath/SunCertPathBuilderResult.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
+ojluni/src/main/java/sun/security/provider/certpath/SunCertPathBuilderResult.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
ojluni/src/main/java/sun/security/provider/certpath/URICertStore.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
ojluni/src/main/java/sun/security/provider/certpath/Vertex.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/Vertex.java
-ojluni/src/main/java/sun/security/provider/certpath/X509CertPath.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java
-ojluni/src/main/java/sun/security/provider/certpath/X509CertificatePair.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
+ojluni/src/main/java/sun/security/provider/certpath/X509CertPath.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/X509CertPath.java
+ojluni/src/main/java/sun/security/provider/certpath/X509CertificatePair.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/provider/certpath/X509CertificatePair.java
ojluni/src/main/java/sun/security/util/AbstractAlgorithmConstraints.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/AbstractAlgorithmConstraints.java
ojluni/src/main/java/sun/security/util/AlgorithmDecomposer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/AlgorithmDecomposer.java
ojluni/src/main/java/sun/security/util/AnchorCertificates.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/AnchorCertificates.java
@@ -1598,7 +1598,7 @@
ojluni/src/main/java/sun/security/util/Cache.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/Cache.java
ojluni/src/main/java/sun/security/util/CertConstraintParameters.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/CertConstraintParameters.java
ojluni/src/main/java/sun/security/util/Debug.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/Debug.java
-ojluni/src/main/java/sun/security/util/DerEncoder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/DerEncoder.java
+ojluni/src/main/java/sun/security/util/DerEncoder.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/util/DerEncoder.java
ojluni/src/main/java/sun/security/util/DerIndefLenConverter.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
ojluni/src/main/java/sun/security/util/DerInputBuffer.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/DerInputBuffer.java
ojluni/src/main/java/sun/security/util/DerInputStream.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/DerInputStream.java
@@ -1606,7 +1606,7 @@
ojluni/src/main/java/sun/security/util/DerValue.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/DerValue.java
ojluni/src/main/java/sun/security/util/DisabledAlgorithmConstraints.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
ojluni/src/main/java/sun/security/util/KeyUtil.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/KeyUtil.java
-ojluni/src/main/java/sun/security/util/Length.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/Length.java
+ojluni/src/main/java/sun/security/util/Length.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/util/Length.java
ojluni/src/main/java/sun/security/util/ManifestDigester.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/ManifestDigester.java
ojluni/src/main/java/sun/security/util/ManifestEntryVerifier.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
ojluni/src/main/java/sun/security/util/ObjectIdentifier.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/util/ObjectIdentifier.java
@@ -1618,7 +1618,7 @@
ojluni/src/main/java/sun/security/x509/AVA.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/AVA.java
ojluni/src/main/java/sun/security/x509/AccessDescription.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/AccessDescription.java
ojluni/src/main/java/sun/security/x509/AlgorithmId.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/AlgorithmId.java
-ojluni/src/main/java/sun/security/x509/AttributeNameEnumeration.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/AttributeNameEnumeration.java
+ojluni/src/main/java/sun/security/x509/AttributeNameEnumeration.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/AttributeNameEnumeration.java
ojluni/src/main/java/sun/security/x509/AuthorityInfoAccessExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
ojluni/src/main/java/sun/security/x509/AuthorityKeyIdentifierExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
ojluni/src/main/java/sun/security/x509/BasicConstraintsExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/BasicConstraintsExtension.java
@@ -1626,20 +1626,20 @@
ojluni/src/main/java/sun/security/x509/CRLExtensions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CRLExtensions.java
ojluni/src/main/java/sun/security/x509/CRLNumberExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CRLNumberExtension.java
ojluni/src/main/java/sun/security/x509/CRLReasonCodeExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java
-ojluni/src/main/java/sun/security/x509/CertAttrSet.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertAttrSet.java
-ojluni/src/main/java/sun/security/x509/CertificateAlgorithmId.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateAlgorithmId.java
+ojluni/src/main/java/sun/security/x509/CertAttrSet.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/CertAttrSet.java
+ojluni/src/main/java/sun/security/x509/CertificateAlgorithmId.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/CertificateAlgorithmId.java
ojluni/src/main/java/sun/security/x509/CertificateExtensions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateExtensions.java
ojluni/src/main/java/sun/security/x509/CertificateIssuerExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateIssuerExtension.java
-ojluni/src/main/java/sun/security/x509/CertificateIssuerName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateIssuerName.java
+ojluni/src/main/java/sun/security/x509/CertificateIssuerName.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/CertificateIssuerName.java
ojluni/src/main/java/sun/security/x509/CertificatePoliciesExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java
ojluni/src/main/java/sun/security/x509/CertificatePolicyId.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificatePolicyId.java
-ojluni/src/main/java/sun/security/x509/CertificatePolicyMap.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificatePolicyMap.java
+ojluni/src/main/java/sun/security/x509/CertificatePolicyMap.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/CertificatePolicyMap.java
ojluni/src/main/java/sun/security/x509/CertificatePolicySet.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificatePolicySet.java
ojluni/src/main/java/sun/security/x509/CertificateSerialNumber.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateSerialNumber.java
-ojluni/src/main/java/sun/security/x509/CertificateSubjectName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateSubjectName.java
+ojluni/src/main/java/sun/security/x509/CertificateSubjectName.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/CertificateSubjectName.java
ojluni/src/main/java/sun/security/x509/CertificateValidity.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateValidity.java
ojluni/src/main/java/sun/security/x509/CertificateVersion.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateVersion.java
-ojluni/src/main/java/sun/security/x509/CertificateX509Key.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/CertificateX509Key.java
+ojluni/src/main/java/sun/security/x509/CertificateX509Key.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/CertificateX509Key.java
ojluni/src/main/java/sun/security/x509/DNSName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/DNSName.java
ojluni/src/main/java/sun/security/x509/DeltaCRLIndicatorExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
ojluni/src/main/java/sun/security/x509/DistributionPoint.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/DistributionPoint.java
@@ -1659,7 +1659,7 @@
ojluni/src/main/java/sun/security/x509/IssuerAlternativeNameExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
ojluni/src/main/java/sun/security/x509/IssuingDistributionPointExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
ojluni/src/main/java/sun/security/x509/KeyIdentifier.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/KeyIdentifier.java
-ojluni/src/main/java/sun/security/x509/KeyUsageExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java
+ojluni/src/main/java/sun/security/x509/KeyUsageExtension.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/KeyUsageExtension.java
ojluni/src/main/java/sun/security/x509/NameConstraintsExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/NameConstraintsExtension.java
ojluni/src/main/java/sun/security/x509/NetscapeCertTypeExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
ojluni/src/main/java/sun/security/x509/OCSPNoCheckExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java
@@ -1675,42 +1675,42 @@
ojluni/src/main/java/sun/security/x509/RFC822Name.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/RFC822Name.java
ojluni/src/main/java/sun/security/x509/ReasonFlags.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/ReasonFlags.java
ojluni/src/main/java/sun/security/x509/SerialNumber.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/SerialNumber.java
-ojluni/src/main/java/sun/security/x509/SubjectAlternativeNameExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
+ojluni/src/main/java/sun/security/x509/SubjectAlternativeNameExtension.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
ojluni/src/main/java/sun/security/x509/SubjectInfoAccessExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
ojluni/src/main/java/sun/security/x509/SubjectKeyIdentifierExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
ojluni/src/main/java/sun/security/x509/URIName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/URIName.java
ojluni/src/main/java/sun/security/x509/UniqueIdentity.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/UniqueIdentity.java
ojluni/src/main/java/sun/security/x509/X400Address.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X400Address.java
ojluni/src/main/java/sun/security/x509/X500Name.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X500Name.java
-ojluni/src/main/java/sun/security/x509/X509AttributeName.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X509AttributeName.java
+ojluni/src/main/java/sun/security/x509/X509AttributeName.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/security/x509/X509AttributeName.java
ojluni/src/main/java/sun/security/x509/X509CRLEntryImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
ojluni/src/main/java/sun/security/x509/X509CRLImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
ojluni/src/main/java/sun/security/x509/X509CertImpl.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X509CertImpl.java
ojluni/src/main/java/sun/security/x509/X509CertInfo.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X509CertInfo.java
ojluni/src/main/java/sun/security/x509/X509Key.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/security/x509/X509Key.java
-ojluni/src/main/java/sun/util/ResourceBundleEnumeration.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/ResourceBundleEnumeration.java
+ojluni/src/main/java/sun/util/ResourceBundleEnumeration.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/ResourceBundleEnumeration.java
ojluni/src/main/java/sun/util/calendar/AbstractCalendar.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/AbstractCalendar.java
ojluni/src/main/java/sun/util/calendar/BaseCalendar.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/BaseCalendar.java
-ojluni/src/main/java/sun/util/calendar/CalendarDate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/CalendarDate.java
+ojluni/src/main/java/sun/util/calendar/CalendarDate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/calendar/CalendarDate.java
ojluni/src/main/java/sun/util/calendar/CalendarSystem.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/CalendarSystem.java
ojluni/src/main/java/sun/util/calendar/CalendarUtils.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/CalendarUtils.java
ojluni/src/main/java/sun/util/calendar/Era.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/Era.java
-ojluni/src/main/java/sun/util/calendar/Gregorian.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/Gregorian.java
-ojluni/src/main/java/sun/util/calendar/ImmutableGregorianDate.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java
-ojluni/src/main/java/sun/util/calendar/JulianCalendar.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/JulianCalendar.java
+ojluni/src/main/java/sun/util/calendar/Gregorian.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/calendar/Gregorian.java
+ojluni/src/main/java/sun/util/calendar/ImmutableGregorianDate.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/calendar/ImmutableGregorianDate.java
+ojluni/src/main/java/sun/util/calendar/JulianCalendar.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/calendar/JulianCalendar.java
ojluni/src/main/java/sun/util/calendar/LocalGregorianCalendar.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java
ojluni/src/main/java/sun/util/locale/BaseLocale.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/BaseLocale.java
-ojluni/src/main/java/sun/util/locale/Extension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/Extension.java
+ojluni/src/main/java/sun/util/locale/Extension.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/locale/Extension.java
ojluni/src/main/java/sun/util/locale/InternalLocaleBuilder.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java
ojluni/src/main/java/sun/util/locale/LanguageTag.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LanguageTag.java
ojluni/src/main/java/sun/util/locale/LocaleEquivalentMaps.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java
-ojluni/src/main/java/sun/util/locale/LocaleExtensions.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LocaleExtensions.java
+ojluni/src/main/java/sun/util/locale/LocaleExtensions.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/locale/LocaleExtensions.java
ojluni/src/main/java/sun/util/locale/LocaleMatcher.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LocaleMatcher.java
ojluni/src/main/java/sun/util/locale/LocaleObjectCache.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java
-ojluni/src/main/java/sun/util/locale/LocaleSyntaxException.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LocaleSyntaxException.java
+ojluni/src/main/java/sun/util/locale/LocaleSyntaxException.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/locale/LocaleSyntaxException.java
ojluni/src/main/java/sun/util/locale/LocaleUtils.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/LocaleUtils.java
-ojluni/src/main/java/sun/util/locale/ParseStatus.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/ParseStatus.java
-ojluni/src/main/java/sun/util/locale/StringTokenIterator.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/StringTokenIterator.java
+ojluni/src/main/java/sun/util/locale/ParseStatus.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/locale/ParseStatus.java
+ojluni/src/main/java/sun/util/locale/StringTokenIterator.java,jdk11u/jdk-11.0.13-ga,src/java.base/share/classes/sun/util/locale/StringTokenIterator.java
ojluni/src/main/java/sun/util/locale/UnicodeLocaleExtension.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java
ojluni/src/main/java/sun/util/locale/provider/CalendarDataUtility.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/locale/provider/CalendarDataUtility.java
ojluni/src/main/java/sun/util/logging/LoggingProxy.java,jdk8u/jdk8u121-b13,jdk/src/share/classes/sun/util/logging/LoggingProxy.java
@@ -1776,43 +1776,43 @@
ojluni/src/main/native/net_util_md.c,jdk7u/jdk7u40-b60,jdk/src/solaris/native/java/net/net_util_md.c
# socket_tagger_util.cpp doesn’t come from the upstream OpenJDK.
ojluni/src/main/native/zip_util.c,jdk8u/jdk8u121-b13,jdk/src/share/native/java/util/zip/zip_util.c
-ojluni/src/test/java/io/Reader/NullReader.java,jdk11u/jdk-11+28,test/jdk/java/io/Reader/NullReader.java
+ojluni/src/test/java/io/Reader/NullReader.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/io/Reader/NullReader.java
ojluni/src/test/java/io/Reader/TransferTo.java,jdk11u/jdk-11+28,test/jdk/java/io/Reader/TransferTo.java
-ojluni/src/test/java/io/Writer/NullWriter.java,jdk11u/jdk-11+28,test/jdk/java/io/Writer/NullWriter.java
+ojluni/src/test/java/io/Writer/NullWriter.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/io/Writer/NullWriter.java
ojluni/src/test/java/math/BigDecimal/AddTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/AddTests.java
-ojluni/src/test/java/math/BigDecimal/CompareToTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/CompareToTests.java
+ojluni/src/test/java/math/BigDecimal/CompareToTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/CompareToTests.java
ojluni/src/test/java/math/BigDecimal/Constructor.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/Constructor.java
-ojluni/src/test/java/math/BigDecimal/DivideMcTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/DivideMcTests.java
-ojluni/src/test/java/math/BigDecimal/DivideTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/DivideTests.java
-ojluni/src/test/java/math/BigDecimal/EqualsTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/EqualsTests.java
-ojluni/src/test/java/math/BigDecimal/FloatDoubleValueTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java
-ojluni/src/test/java/math/BigDecimal/IntegralDivisionTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/IntegralDivisionTests.java
-ojluni/src/test/java/math/BigDecimal/LongValueExactTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/LongValueExactTests.java
-ojluni/src/test/java/math/BigDecimal/MultiplyTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/MultiplyTests.java
-ojluni/src/test/java/math/BigDecimal/NegateTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/NegateTests.java
-ojluni/src/test/java/math/BigDecimal/PowTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/PowTests.java
-ojluni/src/test/java/math/BigDecimal/PrecisionTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/PrecisionTests.java
-ojluni/src/test/java/math/BigDecimal/RangeTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/RangeTests.java
-ojluni/src/test/java/math/BigDecimal/RoundingTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/RoundingTests.java
-ojluni/src/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/ScaleByPowerOfTenTests.java
-ojluni/src/test/java/math/BigDecimal/SerializationTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/SerializationTests.java
+ojluni/src/test/java/math/BigDecimal/DivideMcTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/DivideMcTests.java
+ojluni/src/test/java/math/BigDecimal/DivideTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/DivideTests.java
+ojluni/src/test/java/math/BigDecimal/EqualsTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/EqualsTests.java
+ojluni/src/test/java/math/BigDecimal/FloatDoubleValueTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/FloatDoubleValueTests.java
+ojluni/src/test/java/math/BigDecimal/IntegralDivisionTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/IntegralDivisionTests.java
+ojluni/src/test/java/math/BigDecimal/LongValueExactTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/LongValueExactTests.java
+ojluni/src/test/java/math/BigDecimal/MultiplyTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/MultiplyTests.java
+ojluni/src/test/java/math/BigDecimal/NegateTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/NegateTests.java
+ojluni/src/test/java/math/BigDecimal/PowTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/PowTests.java
+ojluni/src/test/java/math/BigDecimal/PrecisionTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/PrecisionTests.java
+ojluni/src/test/java/math/BigDecimal/RangeTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/RangeTests.java
+ojluni/src/test/java/math/BigDecimal/RoundingTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/RoundingTests.java
+ojluni/src/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/ScaleByPowerOfTenTests.java
+ojluni/src/test/java/math/BigDecimal/SerializationTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/SerializationTests.java
ojluni/src/test/java/math/BigDecimal/SquareRootTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/SquareRootTests.java
-ojluni/src/test/java/math/BigDecimal/StringConstructor.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/StringConstructor.java
-ojluni/src/test/java/math/BigDecimal/StrippingZerosTest.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/StrippingZerosTest.java
-ojluni/src/test/java/math/BigDecimal/ToPlainStringTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/ToPlainStringTests.java
-ojluni/src/test/java/math/BigDecimal/ZeroScalingTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigDecimal/ZeroScalingTests.java
-ojluni/src/test/java/math/BigInteger/BigIntegerTest.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/BigIntegerTest.java
-ojluni/src/test/java/math/BigInteger/CompareToTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/CompareToTests.java
-ojluni/src/test/java/math/BigInteger/ModPow.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/ModPow.java
-ojluni/src/test/java/math/BigInteger/OperatorNpeTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/OperatorNpeTests.java
-ojluni/src/test/java/math/BigInteger/PrimeTest.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/PrimeTest.java
+ojluni/src/test/java/math/BigDecimal/StringConstructor.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/StringConstructor.java
+ojluni/src/test/java/math/BigDecimal/StrippingZerosTest.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/StrippingZerosTest.java
+ojluni/src/test/java/math/BigDecimal/ToPlainStringTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/ToPlainStringTests.java
+ojluni/src/test/java/math/BigDecimal/ZeroScalingTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigDecimal/ZeroScalingTests.java
+ojluni/src/test/java/math/BigInteger/BigIntegerTest.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/BigIntegerTest.java
+ojluni/src/test/java/math/BigInteger/CompareToTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/CompareToTests.java
+ojluni/src/test/java/math/BigInteger/ModPow.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/ModPow.java
+ojluni/src/test/java/math/BigInteger/OperatorNpeTests.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/OperatorNpeTests.java
+ojluni/src/test/java/math/BigInteger/PrimeTest.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/PrimeTest.java
ojluni/src/test/java/math/BigInteger/PrimitiveConversionTests.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/PrimitiveConversionTests.java
-ojluni/src/test/java/math/BigInteger/ProbablePrime.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/ProbablePrime.java
-ojluni/src/test/java/math/BigInteger/StringConstructor.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/StringConstructor.java
-ojluni/src/test/java/math/BigInteger/TestValueExact.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/TestValueExact.java
-ojluni/src/test/java/math/BigInteger/UnicodeConstructor.java,jdk11u/jdk-11+28,test/jdk/java/math/BigInteger/UnicodeConstructor.java
-ojluni/src/test/java/nio/channels/SelectionKey/AtomicUpdates.java,jdk11u/jdk-11+28,test/jdk/java/nio/channels/SelectionKey/AtomicUpdates.java
-ojluni/src/test/java/nio/channels/Selector/ByteServer.java,jdk11u/jdk-11+28,test/jdk/java/nio/channels/Selector/ByteServer.java
-ojluni/src/test/java/nio/channels/Selector/SelectAfterRead.java,jdk11u/jdk-11+28,test/jdk/java/nio/channels/Selector/SelectAfterRead.java
+ojluni/src/test/java/math/BigInteger/ProbablePrime.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/ProbablePrime.java
+ojluni/src/test/java/math/BigInteger/StringConstructor.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/StringConstructor.java
+ojluni/src/test/java/math/BigInteger/TestValueExact.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/TestValueExact.java
+ojluni/src/test/java/math/BigInteger/UnicodeConstructor.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/math/BigInteger/UnicodeConstructor.java
+ojluni/src/test/java/nio/channels/SelectionKey/AtomicUpdates.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/nio/channels/SelectionKey/AtomicUpdates.java
+ojluni/src/test/java/nio/channels/Selector/ByteServer.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/nio/channels/Selector/ByteServer.java
+ojluni/src/test/java/nio/channels/Selector/SelectAfterRead.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/nio/channels/Selector/SelectAfterRead.java
ojluni/src/test/java/nio/channels/Selector/SelectWithConsumer.java,jdk11u/jdk-11+28,test/jdk/java/nio/channels/Selector/SelectWithConsumer.java
ojluni/src/test/java/security/cert/URICertStoreParameters/TestBasic.java,jdk11u/jdk-11.0.13-ga,test/jdk/java/security/cert/URICertStoreParameters/TestBasic.java
diff --git a/api/current.txt b/api/current.txt
index 04547af..7c6254d 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -3823,6 +3823,7 @@
method public int offsetByCodePoints(int, int);
method public boolean regionMatches(int, @NonNull String, int, int);
method public boolean regionMatches(boolean, int, @NonNull String, int, int);
+ method @NonNull public String repeat(int);
method @NonNull public String replace(char, char);
method @NonNull public String replace(@NonNull CharSequence, @NonNull CharSequence);
method @NonNull public String replaceAll(@NonNull String, @NonNull String);
@@ -6188,8 +6189,10 @@
method public static java.io.OutputStream newOutputStream(java.nio.channels.AsynchronousByteChannel);
method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.nio.charset.CharsetDecoder, int);
method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, String);
+ method public static java.io.Reader newReader(java.nio.channels.ReadableByteChannel, java.nio.charset.Charset);
method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, java.nio.charset.CharsetEncoder, int);
method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, String);
+ method public static java.io.Writer newWriter(java.nio.channels.WritableByteChannel, java.nio.charset.Charset);
}
public class ClosedByInterruptException extends java.nio.channels.AsynchronousCloseException {
diff --git a/benchmarks/src_androidx/libcore/benchmark/StringTest.java b/benchmarks/src_androidx/libcore/benchmark/StringTest.java
new file mode 100644
index 0000000..082db01
--- /dev/null
+++ b/benchmarks/src_androidx/libcore/benchmark/StringTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package libcore.benchmark;
+
+import androidx.benchmark.BenchmarkState;
+import androidx.benchmark.junit4.BenchmarkRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class StringTest {
+ @Rule
+ public BenchmarkRule benchmarkRule = new BenchmarkRule();
+
+ @Test
+ public void stringRepeat_art_x10() {
+ final BenchmarkState state = benchmarkRule.getState();
+ while (state.keepRunning()) {
+ "hello, world!".repeat(10);
+ }
+ }
+
+ @Test
+ public void timeStringRepeat_art_x100k() {
+ final BenchmarkState state = benchmarkRule.getState();
+ while (state.keepRunning()) {
+ "hello, world!".repeat(100_000);
+ }
+ }
+
+ @Test
+ public void timeStringRepeat_java_x10() {
+ final BenchmarkState state = benchmarkRule.getState();
+ while (state.keepRunning()) {
+ repeatStringBuilder("hello, world!", 10);
+ }
+ }
+
+ @Test
+ public void timeStringRepeat_java_x100k() {
+ final BenchmarkState state = benchmarkRule.getState();
+ while (state.keepRunning()) {
+ repeatStringBuilder("hello, world!", 100_000);
+ }
+ }
+
+ @Test
+ public void stringRepeat_art_x1m_singleChar() {
+ final BenchmarkState state = benchmarkRule.getState();
+ while (state.keepRunning()) {
+ "h".repeat(1_000_000);
+ }
+ }
+
+ @Test
+ public void stringRepeat_java_x1m_singleChar() {
+ final BenchmarkState state = benchmarkRule.getState();
+ while (state.keepRunning()) {
+ repeatStringBuilder("h", 1_000_000);
+ }
+ }
+
+ private static String repeatStringBuilder(String s, int count) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < count; i++) {
+ builder.append(s);
+ }
+ return builder.toString();
+ }
+}
diff --git a/ojluni/annotations/sdk/nullability/java/lang/String.annotated.java b/ojluni/annotations/sdk/nullability/java/lang/String.annotated.java
index a8cf1de..fdb1845 100644
--- a/ojluni/annotations/sdk/nullability/java/lang/String.annotated.java
+++ b/ojluni/annotations/sdk/nullability/java/lang/String.annotated.java
@@ -203,6 +203,8 @@
@libcore.util.NonNull public native java.lang.String intern();
+@libcore.util.NonNull public java.lang.String repeat(int count) { throw new RuntimeException("Stub!"); }
+
public static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;
static { CASE_INSENSITIVE_ORDER = null; }
}
diff --git a/ojluni/src/main/java/java/lang/String.java b/ojluni/src/main/java/java/lang/String.java
index 75583cc..935ba57 100644
--- a/ojluni/src/main/java/java/lang/String.java
+++ b/ojluni/src/main/java/java/lang/String.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2014 The Android Open Source Project
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2018, 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
@@ -38,6 +38,7 @@
import java.util.StringJoiner;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import jdk.internal.HotSpotIntrinsicCandidate;
import libcore.util.CharsetUtils;
@@ -75,16 +76,10 @@
* <p>
* The Java language provides special support for the string
* concatenation operator ( + ), and for conversion of
- * other objects to strings. String concatenation is implemented
- * through the {@code StringBuilder}(or {@code StringBuffer})
- * class and its {@code append} method.
- * String conversions are implemented through the method
- * {@code toString}, defined by {@code Object} and
- * inherited by all classes in Java. For additional information on
- * string concatenation and conversion, see Gosling, Joy, and Steele,
- * <i>The Java Language Specification</i>.
+ * other objects to strings. For additional information on string
+ * concatenation and conversion, see <i>The Java™ Language Specification</i>.
*
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
+ * <p> Unless otherwise noted, passing a {@code null} argument to a constructor
* or method in this class will cause a {@link NullPointerException} to be
* thrown.
*
@@ -99,6 +94,18 @@
* Unicode code points (i.e., characters), in addition to those for
* dealing with Unicode code units (i.e., {@code char} values).
*
+ * <p>Unless otherwise noted, methods for comparing Strings do not take locale
+ * into account. The {@link java.text.Collator} class provides methods for
+ * finer-grain, locale-sensitive String comparison.
+ *
+ * @implNote The implementation of the string concatenation operator is left to
+ * the discretion of a Java compiler, as long as the compiler ultimately conforms
+ * to <i>The Java™ Language Specification</i>. For example, the {@code javac} compiler
+ * may implement the operator with {@code StringBuffer}, {@code StringBuilder},
+ * or {@code java.lang.invoke.StringConcatFactory} depending on the JDK version. The
+ * implementation of string conversion is typically through the method {@code toString},
+ * defined by {@code Object} and inherited by all classes in Java.
+ *
* @author Lee Boynton
* @author Arthur van Hoff
* @author Martin Buchholz
@@ -107,7 +114,8 @@
* @see java.lang.StringBuffer
* @see java.lang.StringBuilder
* @see java.nio.charset.Charset
- * @since JDK1.0
+ * @since 1.0
+ * @jls 15.18.1 String Concatenation Operator +
*/
public final class String
@@ -126,8 +134,19 @@
If STRING_COMPRESSION_ENABLED, count stores the length shifted one bit to the left with the
lowest bit used to indicate whether or not the bytes are compressed (see GetFlaggedCount in
the native code).
- /** The value is used for character storage. *
- private final char value[];
+ /**
+ * The value is used for character storage.
+ *
+ * @implNote This field is trusted by the VM, and is a subject to
+ * constant folding if String instance is constant. Overwriting this
+ * field after construction will cause problems.
+ *
+ * Additionally, it is marked with {@link Stable} to trust the contents
+ * of the array. No other facility in JDK provides this functionality (yet).
+ * {@link Stable} is safe here, because value is never null.
+ *
+ @Stable
+ private final byte[] value;
*/
private final int count;
// END Android-changed: The character data is managed by the runtime.
@@ -145,7 +164,7 @@
* Class String is special cased within the Serialization Stream Protocol.
*
* A String instance is written into an ObjectOutputStream according to
- * <a href="{@docRoot}/../platform/serialization/spec/output.html">
+ * <a href="{@docRoot}/../specs/serialization/protocol.html#stream-elements">
* Object Serialization Specification, Section 6.2, "Stream Elements"</a>
*/
private static final ObjectStreamField[] serialPersistentFields =
@@ -157,9 +176,13 @@
* unnecessary since Strings are immutable.
*/
public String() {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this.value = "".value;
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this.value = "".value;
+ this.coder = "".coder;
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -172,11 +195,16 @@
* @param original
* A {@code String}
*/
+ @HotSpotIntrinsicCandidate
public String(String original) {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this.value = original.value;
- // this.hash = original.hash;
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this.value = original.value;
+ this.coder = original.coder;
+ this.hash = original.hash;
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -189,9 +217,12 @@
* The initial value of the string
*/
public String(char value[]) {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this.value = Arrays.copyOf(value, value.length);
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this(value, 0, value.length, null);
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -212,30 +243,19 @@
* The length
*
* @throws IndexOutOfBoundsException
- * If the {@code offset} and {@code count} arguments index
- * characters outside the bounds of the {@code value} array
+ * If {@code offset} is negative, {@code count} is negative, or
+ * {@code offset} is greater than {@code value.length - count}
*/
public String(char value[], int offset, int count) {
// BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
/*
- if (offset < 0) {
- throw new StringIndexOutOfBoundsException(offset);
- }
- if (count <= 0) {
- if (count < 0) {
- throw new StringIndexOutOfBoundsException(count);
- }
- if (offset <= value.length) {
- this.value = "".value;
- return;
- }
- }
- // Note: offset or count might be near -1>>>1.
- if (offset > value.length - count) {
- throw new StringIndexOutOfBoundsException(offset + count);
- }
- this.value = Arrays.copyOfRange(value, offset, offset+count);
- */
+ this(value, offset, count, rangeCheck(value, offset, count));
+ }
+
+ private static Void rangeCheck(char[] value, int offset, int count) {
+ checkBoundsOffCount(offset, count, value.length);
+ return null;
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
// END Android-changed: Implemented as compiler and runtime intrinsics.
}
@@ -263,56 +283,30 @@
* codePoints}
*
* @throws IndexOutOfBoundsException
- * If the {@code offset} and {@code count} arguments index
- * characters outside the bounds of the {@code codePoints} array
+ * If {@code offset} is negative, {@code count} is negative, or
+ * {@code offset} is greater than {@code codePoints.length - count}
*
* @since 1.5
*/
public String(int[] codePoints, int offset, int count) {
// BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
/*
- if (offset < 0) {
- throw new StringIndexOutOfBoundsException(offset);
+ checkBoundsOffCount(offset, count, codePoints.length);
+ if (count == 0) {
+ this.value = "".value;
+ this.coder = "".coder;
+ return;
}
- if (count <= 0) {
- if (count < 0) {
- throw new StringIndexOutOfBoundsException(count);
- }
- if (offset <= codePoints.length) {
- this.value = "".value;
+ if (COMPACT_STRINGS) {
+ byte[] val = StringLatin1.toBytes(codePoints, offset, count);
+ if (val != null) {
+ this.coder = LATIN1;
+ this.value = val;
return;
}
}
- // Note: offset or count might be near -1>>>1.
- if (offset > codePoints.length - count) {
- throw new StringIndexOutOfBoundsException(offset + count);
- }
-
- final int end = offset + count;
-
- // Pass 1: Compute precise size of char[]
- int n = count;
- for (int i = offset; i < end; i++) {
- int c = codePoints[i];
- if (Character.isBmpCodePoint(c))
- continue;
- else if (Character.isValidCodePoint(c))
- n++;
- else throw new IllegalArgumentException(Integer.toString(c));
- }
-
- // Pass 2: Allocate and fill in char[]
- final char[] v = new char[n];
-
- for (int i = offset, j = 0; i < end; i++, j++) {
- int c = codePoints[i];
- if (Character.isBmpCodePoint(c))
- v[j] = (char)c;
- else
- Character.toSurrogates(c, v, j++);
- }
-
- this.value = v;
+ this.coder = UTF16;
+ this.value = StringUTF16.toBytes(codePoints, offset, count);
*/
throw new UnsupportedOperationException("Use StringFactory instead.");
// END Android-changed: Implemented as compiler and runtime intrinsics.
@@ -327,7 +321,7 @@
* subarray.
*
* <p> Each {@code byte} in the subarray is converted to a {@code char} as
- * specified in the method above.
+ * specified in the {@link #String(byte[],int) String(byte[],int)} constructor.
*
* @deprecated This method does not properly convert bytes into characters.
* As of JDK 1.1, the preferred way to do this is via the
@@ -347,7 +341,8 @@
* The length
*
* @throws IndexOutOfBoundsException
- * If the {@code offset} or {@code count} argument is invalid
+ * If {@code offset} is negative, {@code count} is negative, or
+ * {@code offset} is greater than {@code ascii.length - count}
*
* @see #String(byte[], int)
* @see #String(byte[], int, int, java.lang.String)
@@ -357,24 +352,28 @@
* @see #String(byte[], java.nio.charset.Charset)
* @see #String(byte[])
*/
- @Deprecated
+ @Deprecated(since="1.1")
public String(byte ascii[], int hibyte, int offset, int count) {
// BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
/*
- checkBounds(ascii, offset, count);
- char value[] = new char[count];
-
- if (hibyte == 0) {
- for (int i = count; i-- > 0;) {
- value[i] = (char)(ascii[i + offset] & 0xff);
- }
+ checkBoundsOffCount(offset, count, ascii.length);
+ if (count == 0) {
+ this.value = "".value;
+ this.coder = "".coder;
+ return;
+ }
+ if (COMPACT_STRINGS && (byte)hibyte == 0) {
+ this.value = Arrays.copyOfRange(ascii, offset, offset + count);
+ this.coder = LATIN1;
} else {
hibyte <<= 8;
- for (int i = count; i-- > 0;) {
- value[i] = (char)(hibyte | (ascii[i + offset] & 0xff));
+ byte[] val = StringUTF16.newBytesFor(count);
+ for (int i = 0; i < count; i++) {
+ StringUTF16.putChar(val, i, hibyte | (ascii[offset++] & 0xff));
}
+ this.value = val;
+ this.coder = UTF16;
}
- this.value = value;
*/
throw new UnsupportedOperationException("Use StringFactory instead.");
// END Android-changed: Implemented as compiler and runtime intrinsics.
@@ -382,7 +381,7 @@
/**
* Allocates a new {@code String} containing characters constructed from
- * an array of 8-bit integer values. Each character <i>c</i>in the
+ * an array of 8-bit integer values. Each character <i>c</i> in the
* resulting string is constructed from the corresponding component
* <i>b</i> in the byte array such that:
*
@@ -410,7 +409,7 @@
* @see #String(byte[], java.nio.charset.Charset)
* @see #String(byte[])
*/
- @Deprecated
+ @Deprecated(since="1.1")
public String(byte ascii[], int hibyte) {
// BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
/*
@@ -463,10 +462,10 @@
* If the named charset is not supported
*
* @throws IndexOutOfBoundsException
- * If the {@code offset} and {@code length} arguments index
- * characters outside the bounds of the {@code bytes} array
+ * If {@code offset} is negative, {@code length} is negative, or
+ * {@code offset} is greater than {@code bytes.length - length}
*
- * @since JDK1.1
+ * @since 1.1
*/
public String(byte bytes[], int offset, int length, String charsetName)
throws UnsupportedEncodingException {
@@ -474,8 +473,11 @@
/*
if (charsetName == null)
throw new NullPointerException("charsetName");
- checkBounds(bytes, offset, length);
- this.value = StringCoding.decode(charsetName, bytes, offset, length);
+ checkBoundsOffCount(offset, length, bytes.length);
+ StringCoding.Result ret =
+ StringCoding.decode(charsetName, bytes, offset, length);
+ this.value = ret.value;
+ this.coder = ret.coder;
*/
throw new UnsupportedOperationException("Use StringFactory instead.");
// END Android-changed: Implemented as compiler and runtime intrinsics.
@@ -506,8 +508,8 @@
* decode the {@code bytes}
*
* @throws IndexOutOfBoundsException
- * If the {@code offset} and {@code length} arguments index
- * characters outside the bounds of the {@code bytes} array
+ * If {@code offset} is negative, {@code length} is negative, or
+ * {@code offset} is greater than {@code bytes.length - length}
*
* @since 1.6
*/
@@ -516,8 +518,11 @@
/*
if (charset == null)
throw new NullPointerException("charset");
- checkBounds(bytes, offset, length);
- this.value = StringCoding.decode(charset, bytes, offset, length);
+ checkBoundsOffCount(offset, length, bytes.length);
+ StringCoding.Result ret =
+ StringCoding.decode(charset, bytes, offset, length);
+ this.value = ret.value;
+ this.coder = ret.coder;
*/
throw new UnsupportedOperationException("Use StringFactory instead.");
// END Android-changed: Implemented as compiler and runtime intrinsics.
@@ -544,13 +549,16 @@
* @throws UnsupportedEncodingException
* If the named charset is not supported
*
- * @since JDK1.1
+ * @since 1.1
*/
public String(byte bytes[], String charsetName)
throws UnsupportedEncodingException {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this(bytes, 0, bytes.length, charsetName);
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this(bytes, 0, bytes.length, charsetName);
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -574,9 +582,12 @@
* @since 1.6
*/
public String(byte bytes[], Charset charset) {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this(bytes, 0, bytes.length, charset);
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this(bytes, 0, bytes.length, charset);
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -600,16 +611,21 @@
* The number of bytes to decode
*
* @throws IndexOutOfBoundsException
- * If the {@code offset} and the {@code length} arguments index
- * characters outside the bounds of the {@code bytes} array
+ * If {@code offset} is negative, {@code length} is negative, or
+ * {@code offset} is greater than {@code bytes.length - length}
*
- * @since JDK1.1
+ * @since 1.1
*/
public String(byte bytes[], int offset, int length) {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // checkBounds(bytes, offset, length);
- // this.value = StringCoding.decode(bytes, offset, length);
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ checkBoundsOffCount(offset, length, bytes.length);
+ StringCoding.Result ret = StringCoding.decode(bytes, offset, length);
+ this.value = ret.value;
+ this.coder = ret.coder;
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -626,12 +642,15 @@
* @param bytes
* The bytes to be decoded into characters
*
- * @since JDK1.1
+ * @since 1.1
*/
- public String(byte bytes[]) {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this(bytes, 0, bytes.length);
+ public String(byte[] bytes) {
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this(bytes, 0, bytes.length);
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
/**
@@ -646,10 +665,8 @@
public String(StringBuffer buffer) {
// BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
/*
- synchronized(buffer) {
- this.value = Arrays.copyOf(buffer.getValue(), buffer.length());
- }
- */
+ this(buffer.toString());
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
// END Android-changed: Implemented as compiler and runtime intrinsics.
}
@@ -670,9 +687,12 @@
* @since 1.5
*/
public String(StringBuilder builder) {
- // Android-changed: Implemented as compiler and runtime intrinsics.
- // this.value = Arrays.copyOf(builder.getValue(), builder.length());
+ // BEGIN Android-changed: Implemented as compiler and runtime intrinsics.
+ /*
+ this(builder, null);
+ */
throw new UnsupportedOperationException("Use StringFactory instead.");
+ // END Android-changed: Implemented as compiler and runtime intrinsics.
}
// BEGIN Android-removed: Unused package-private constructor String(char[] value, boolean share).
@@ -714,7 +734,7 @@
public int length() {
// BEGIN Android-changed: Get length from count field rather than value array (see above).
/*
- return value.length;
+ return value.length >> coder();
*/
final boolean STRING_COMPRESSION_ENABLED = true;
if (STRING_COMPRESSION_ENABLED) {
@@ -736,10 +756,13 @@
* @since 1.6
*/
public boolean isEmpty() {
- // Android-changed: Get length from count field rather than value array (see above).
+ // BEGIN Android-changed: Get length from count field rather than value array (see above).
// Empty string has {@code count == 0} with or without string compression enabled.
- // return value.length == 0;
+ /*
+ return value.length == 0;
+ */
return count == 0;
+ // END Android-changed: Get length from count field rather than value array (see above).
}
/**
@@ -763,10 +786,11 @@
// BEGIN Android-changed: Replace with implementation in runtime to access chars (see above).
/*
public char charAt(int index) {
- if ((index < 0) || (index >= value.length)) {
- throw new StringIndexOutOfBoundsException(index);
+ if (isLatin1()) {
+ return StringLatin1.charAt(value, index);
+ } else {
+ return StringUTF16.charAt(value, index);
}
- return value[index];
}
*/
@FastNative
@@ -796,10 +820,17 @@
* @since 1.5
*/
public int codePointAt(int index) {
- if ((index < 0) || (index >= length())) {
- throw new StringIndexOutOfBoundsException(index);
+ // BEGIN Android-changed: delegate codePointAt() to Character class.
+ /*
+ if (isLatin1()) {
+ checkIndex(index, value.length);
+ return value[index] & 0xff;
}
- // Android-changed: Skip codePointAtImpl optimization that needs access to java chars.
+ int length = value.length >> 1;
+ checkIndex(index, length);
+ return StringUTF16.codePointAt(value, index, length);
+ */
+ checkIndex(index, length());
return Character.codePointAt(this, index);
}
@@ -827,10 +858,16 @@
*/
public int codePointBefore(int index) {
int i = index - 1;
- if ((i < 0) || (i >= length())) {
+ if (i < 0 || i >= length()) {
throw new StringIndexOutOfBoundsException(index);
}
- // Android-changed: Skip codePointBeforeImpl optimization that needs access to java chars.
+ // BEGIN Android-changed: delegate codePointBefore to Character class.
+ /*
+ if (isLatin1()) {
+ return (value[i] & 0xff);
+ }
+ return StringUTF16.codePointBefore(value, index);
+ */
return Character.codePointBefore(this, index);
}
@@ -856,11 +893,19 @@
* @since 1.5
*/
public int codePointCount(int beginIndex, int endIndex) {
- if (beginIndex < 0 || endIndex > length() || beginIndex > endIndex) {
+ if (beginIndex < 0 || beginIndex > endIndex ||
+ endIndex > length()) {
throw new IndexOutOfBoundsException();
}
- // Android-changed: Skip codePointCountImpl optimization that needs access to java chars.
+ // BEGIN Android-changed: delegate codePointCount to Character class.
+ /*
+ if (isLatin1()) {
+ return endIndex - beginIndex;
+ }
+ return StringUTF16.codePointCount(value, beginIndex, endIndex);
+ */
return Character.codePointCount(this, beginIndex, endIndex);
+ // END Android-changed: delegate codePointCount to Character class.
}
/**
@@ -887,7 +932,6 @@
if (index < 0 || index > length()) {
throw new IndexOutOfBoundsException();
}
- // Android-changed: Skip offsetByCodePointsImpl optimization that needs access to java chars
return Character.offsetByCodePoints(this, index, codePointOffset);
}
@@ -934,16 +978,13 @@
public void getChars(int srcBegin, int srcEnd, char dst[], int dstBegin) {
// BEGIN Android-changed: Implement in terms of length() and native getCharsNoCheck method.
/*
- if (srcBegin < 0) {
- throw new StringIndexOutOfBoundsException(srcBegin);
+ checkBoundsBeginEnd(srcBegin, srcEnd, length());
+ checkBoundsOffCount(dstBegin, srcEnd - srcBegin, dst.length);
+ if (isLatin1()) {
+ StringLatin1.getChars(value, srcBegin, srcEnd, dst, dstBegin);
+ } else {
+ StringUTF16.getChars(value, srcBegin, srcEnd, dst, dstBegin);
}
- if (srcEnd > value.length) {
- throw new StringIndexOutOfBoundsException(srcEnd);
- }
- if (srcBegin > srcEnd) {
- throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
- }
- System.arraycopy(value, srcBegin, dst, dstBegin, srcEnd - srcBegin);
*/
if (dst == null) {
throw new NullPointerException("dst == null");
@@ -1033,7 +1074,7 @@
* dst.length}
* </ul>
*/
- @Deprecated
+ @Deprecated(since="1.1")
public void getBytes(int srcBegin, int srcEnd, byte dst[], int dstBegin) {
if (srcBegin < 0) {
throw new StringIndexOutOfBoundsException(this, srcBegin);
@@ -1072,14 +1113,17 @@
* @throws UnsupportedEncodingException
* If the named charset is not supported
*
- * @since JDK1.1
+ * @since 1.1
*/
public byte[] getBytes(String charsetName)
throws UnsupportedEncodingException {
if (charsetName == null) throw new NullPointerException();
- // Android-changed: Skip StringCoding optimization that needs access to java chars.
- // return StringCoding.encode(charsetName, value, 0, value.length);
+ // BEGIN Android-changed: Skip StringCoding optimization that needs access to java chars.
+ /*
+ return StringCoding.encode(charsetName, coder(), value);
+ */
return getBytes(Charset.forNameUEE(charsetName));
+ // END Android-changed: Skip StringCoding optimization that needs access to java chars.
}
/**
@@ -1104,7 +1148,7 @@
// BEGIN Android-changed: Skip StringCoding optimization that needs access to java chars.
/*
if (charset == null) throw new NullPointerException();
- return StringCoding.encode(charset, value, 0, value.length);
+ return StringCoding.encode(charset, coder(), value);
*/
if (charset == null) {
throw new NullPointerException("charset == null");
@@ -1140,12 +1184,15 @@
*
* @return The resultant byte array
*
- * @since JDK1.1
+ * @since 1.1
*/
public byte[] getBytes() {
- // Android-changed: Skip StringCoding optimization that needs access to java chars.
- // return StringCoding.encode(value, 0, value.length);
+ // BEGIN Android-changed: Skip StringCoding optimization that needs access to java chars.
+ /*
+ return StringCoding.encode(coder(), value);
+ */
return getBytes(Charset.defaultCharset());
+ // END Android-changed: Skip StringCoding optimization that needs access to java chars.
}
/**
@@ -1154,6 +1201,9 @@
* String} object that represents the same sequence of characters as this
* object.
*
+ * <p>For finer-grained String comparison, refer to
+ * {@link java.text.Collator}.
+ *
* @param anObject
* The object to compare this {@code String} against
*
@@ -1189,6 +1239,9 @@
* sequence of characters as the specified {@code StringBuffer}. This method
* synchronizes on the {@code StringBuffer}.
*
+ * <p>For finer-grained String comparison, refer to
+ * {@link java.text.Collator}.
+ *
* @param sb
* The {@code StringBuffer} to compare this {@code String} against
*
@@ -1223,6 +1276,9 @@
* {@code CharSequence} is a {@code StringBuffer} then the method
* synchronizes on it.
*
+ * <p>For finer-grained String comparison, refer to
+ * {@link java.text.Collator}.
+ *
* @param cs
* The sequence to compare this {@code String} against
*
@@ -1271,14 +1327,14 @@
* <ul>
* <li> The two characters are the same (as compared by the
* {@code ==} operator)
- * <li> Applying the method {@link
- * java.lang.Character#toUpperCase(char)} to each character
- * produces the same result
- * <li> Applying the method {@link
- * java.lang.Character#toLowerCase(char)} to each character
- * produces the same result
+ * <li> Calling {@code Character.toLowerCase(Character.toUpperCase(char))}
+ * on each character produces the same result
* </ul>
*
+ * <p>Note that this method does <em>not</em> take locale into account, and
+ * will result in unsatisfactory results for certain locales. The
+ * {@link java.text.Collator} class provides locale-sensitive comparison.
+ *
* @param anotherString
* The {@code String} to compare this {@code String} against
*
@@ -1315,7 +1371,7 @@
* or both. If they have different characters at one or more index
* positions, let <i>k</i> be the smallest such index; then the string
* whose character at position <i>k</i> has the smaller value, as
- * determined by using the < operator, lexicographically precedes the
+ * determined by using the {@code <} operator, lexicographically precedes the
* other string. In this case, {@code compareTo} returns the
* difference of the two character values at position {@code k} in
* the two string -- that is, the value:
@@ -1330,6 +1386,9 @@
* this.length()-anotherString.length()
* </pre></blockquote>
*
+ * <p>For finer-grained String comparison, refer to
+ * {@link java.text.Collator}.
+ *
* @param anotherString the {@code String} to be compared.
* @return the value {@code 0} if the argument string is equal to
* this string; a value less than {@code 0} if this string
@@ -1340,23 +1399,15 @@
// BEGIN Android-changed: Replace with implementation in runtime to access chars (see above).
/*
public int compareTo(String anotherString) {
- int len1 = value.length;
- int len2 = anotherString.value.length;
- int lim = Math.min(len1, len2);
- char v1[] = value;
- char v2[] = anotherString.value;
-
- int k = 0;
- while (k < lim) {
- char c1 = v1[k];
- char c2 = v2[k];
- if (c1 != c2) {
- return c1 - c2;
- }
- k++;
+ byte v1[] = value;
+ byte v2[] = anotherString.value;
+ if (coder() == anotherString.coder()) {
+ return isLatin1() ? StringLatin1.compareTo(v1, v2)
+ : StringUTF16.compareTo(v1, v2);
}
- return len1 - len2;
- }
+ return isLatin1() ? StringLatin1.compareToUTF16(v1, v2)
+ : StringUTF16.compareToLatin1(v1, v2);
+ }
*/
@FastNative
public native int compareTo(String anotherString);
@@ -1368,10 +1419,9 @@
* <p>
* Note that this Comparator does <em>not</em> take locale into account,
* and will result in an unsatisfactory ordering for certain locales.
- * The java.text package provides <em>Collators</em> to allow
- * locale-sensitive ordering.
+ * The {@link java.text.Collator} class provides locale-sensitive comparison.
*
- * @see java.text.Collator#compare(String, String)
+ * @see java.text.Collator
* @since 1.2
*/
public static final Comparator<String> CASE_INSENSITIVE_ORDER
@@ -1418,14 +1468,13 @@
* <p>
* Note that this method does <em>not</em> take locale into account,
* and will result in an unsatisfactory ordering for certain locales.
- * The java.text package provides <em>collators</em> to allow
- * locale-sensitive ordering.
+ * The {@link java.text.Collator} class provides locale-sensitive comparison.
*
* @param str the {@code String} to be compared.
* @return a negative integer, zero, or a positive integer as the
* specified String is greater than, equal to, or less
* than this String, ignoring case considerations.
- * @see java.text.Collator#compare(String, String)
+ * @see java.text.Collator
* @since 1.2
*/
public int compareToIgnoreCase(String str) {
@@ -1455,6 +1504,9 @@
* <i>k</i>{@code )}
* </ul>
*
+ * <p>Note that this method does <em>not</em> take locale into account. The
+ * {@link java.text.Collator} class provides locale-sensitive comparison.
+ *
* @param toffset the starting offset of the subregion in this string.
* @param other the string argument.
* @param ooffset the starting offset of the subregion in the string
@@ -1508,16 +1560,16 @@
* <li>{@code ignoreCase} is {@code true} and there is some nonnegative
* integer <i>k</i> less than {@code len} such that:
* <blockquote><pre>
- * Character.toLowerCase(this.charAt(toffset+k)) !=
- Character.toLowerCase(other.charAt(ooffset+k))
- * </pre></blockquote>
- * and:
- * <blockquote><pre>
- * Character.toUpperCase(this.charAt(toffset+k)) !=
- * Character.toUpperCase(other.charAt(ooffset+k))
+ * Character.toLowerCase(Character.toUpperCase(this.charAt(toffset+k))) !=
+ Character.toLowerCase(Character.toUpperCase(other.charAt(ooffset+k)))
* </pre></blockquote>
* </ul>
*
+ * <p>Note that this method does <em>not</em> take locale into account,
+ * and will result in unsatisfactory results for certain locales when
+ * {@code ignoreCase} is {@code true}. The {@link java.text.Collator} class
+ * provides locale-sensitive comparison.
+ *
* @param ignoreCase if {@code true}, ignore case when comparing
* characters.
* @param toffset the starting offset of the subregion in this
@@ -1615,7 +1667,7 @@
* argument is an empty string or is equal to this
* {@code String} object as determined by the
* {@link #equals(Object)} method.
- * @since 1. 0
+ * @since 1.0
*/
public boolean startsWith(String prefix) {
return startsWith(prefix, 0);
@@ -1866,11 +1918,11 @@
* Returns the index within this string of the first occurrence of the
* specified substring.
*
- * <p>The returned index is the smallest value <i>k</i> for which:
- * <blockquote><pre>
- * this.startsWith(str, <i>k</i>)
- * </pre></blockquote>
- * If no such value of <i>k</i> exists, then {@code -1} is returned.
+ * <p>The returned index is the smallest value {@code k} for which:
+ * <pre>{@code
+ * this.startsWith(str, k)
+ * }</pre>
+ * If no such value of {@code k} exists, then {@code -1} is returned.
*
* @param str the substring to search for.
* @return the index of the first occurrence of the specified substring,
@@ -1884,11 +1936,12 @@
* Returns the index within this string of the first occurrence of the
* specified substring, starting at the specified index.
*
- * <p>The returned index is the smallest value <i>k</i> for which:
- * <blockquote><pre>
- * <i>k</i> >= fromIndex {@code &&} this.startsWith(str, <i>k</i>)
- * </pre></blockquote>
- * If no such value of <i>k</i> exists, then {@code -1} is returned.
+ * <p>The returned index is the smallest value {@code k} for which:
+ * <pre>{@code
+ * k >= Math.min(fromIndex, this.length()) &&
+ * this.startsWith(str, k)
+ * }</pre>
+ * If no such value of {@code k} exists, then {@code -1} is returned.
*
* @param str the substring to search for.
* @param fromIndex the index from which to start the search.
@@ -1897,10 +1950,12 @@
* or {@code -1} if there is no such occurrence.
*/
public int indexOf(String str, int fromIndex) {
- // Android-changed: Delegate to the static indexOf method below.
- // return indexOf(value, 0, value.length,
- // str.value, 0, str.value.length, fromIndex);
+ // BEGIN Android-changed: Delegate to the static indexOf method below.
+ /*
+ return indexOf(value, coder(), length(), str, fromIndex);
+ */
return indexOf(this, str, fromIndex);
+ // END Android-changed: Delegate to the static indexOf method below.
}
// BEGIN Android-added: Private static indexOf method that takes String parameters.
@@ -2025,11 +2080,11 @@
* specified substring. The last occurrence of the empty string ""
* is considered to occur at the index value {@code this.length()}.
*
- * <p>The returned index is the largest value <i>k</i> for which:
- * <blockquote><pre>
- * this.startsWith(str, <i>k</i>)
- * </pre></blockquote>
- * If no such value of <i>k</i> exists, then {@code -1} is returned.
+ * <p>The returned index is the largest value {@code k} for which:
+ * <pre>{@code
+ * this.startsWith(str, k)
+ * }</pre>
+ * If no such value of {@code k} exists, then {@code -1} is returned.
*
* @param str the substring to search for.
* @return the index of the last occurrence of the specified substring,
@@ -2043,11 +2098,12 @@
* Returns the index within this string of the last occurrence of the
* specified substring, searching backward starting at the specified index.
*
- * <p>The returned index is the largest value <i>k</i> for which:
- * <blockquote><pre>
- * <i>k</i> {@code <=} fromIndex {@code &&} this.startsWith(str, <i>k</i>)
- * </pre></blockquote>
- * If no such value of <i>k</i> exists, then {@code -1} is returned.
+ * <p>The returned index is the largest value {@code k} for which:
+ * <pre>{@code
+ * k <= Math.min(fromIndex, this.length()) &&
+ * this.startsWith(str, k)
+ * }</pre>
+ * If no such value of {@code k} exists, then {@code -1} is returned.
*
* @param str the substring to search for.
* @param fromIndex the index to start the search from.
@@ -2056,10 +2112,12 @@
* or {@code -1} if there is no such occurrence.
*/
public int lastIndexOf(String str, int fromIndex) {
- // Android-changed: Change parameters to static lastIndexOf to match new signature below.
- // return lastIndexOf(value, 0, value.length,
- // str.value, 0, str.value.length, fromIndex);
+ // BEGIN Android-changed: Change parameters to static lastIndexOf to match new signature below.
+ /*
+ return lastIndexOf(value, coder(), length(), str, fromIndex);
+ */
return lastIndexOf(this, str, fromIndex);
+ // END Android-changed: Change parameters to static lastIndexOf to match new signature below.
}
// BEGIN Android-added: Private static lastIndexOf method that takes String parameters.
@@ -2326,14 +2384,23 @@
// BEGIN Android-changed: Replace with implementation in runtime to access chars (see above).
/*
public String concat(String str) {
- int otherLen = str.length();
- if (otherLen == 0) {
+ if (str.isEmpty()) {
return this;
}
- int len = value.length;
- char buf[] = Arrays.copyOf(value, len + otherLen);
- str.getChars(buf, len);
- return new String(buf, true);
+ if (coder() == str.coder()) {
+ byte[] val = this.value;
+ byte[] oval = str.value;
+ int len = val.length + oval.length;
+ byte[] buf = Arrays.copyOf(val, len);
+ System.arraycopy(oval, 0, buf, val.length, oval.length);
+ return new String(buf, coder);
+ }
+ int len = length();
+ int olen = str.length();
+ byte[] buf = StringUTF16.newBytesFor(len + olen);
+ getBytes(buf, 0, UTF16);
+ str.getBytes(buf, len, UTF16);
+ return new String(buf, UTF16);
}
*/
@FastNative
@@ -2373,26 +2440,10 @@
// BEGIN Android-changed: Replace with implementation using native doReplace method.
if (oldChar != newChar) {
/*
- int len = value.length;
- int i = -1;
- char[] val = value; /* avoid getfield opcode *
-
- while (++i < len) {
- if (val[i] == oldChar) {
- break;
- }
- }
- if (i < len) {
- char buf[] = new char[len];
- for (int j = 0; j < i; j++) {
- buf[j] = val[j];
- }
- while (i < len) {
- char c = val[i];
- buf[i] = (c == oldChar) ? newChar : c;
- i++;
- }
- return new String(buf, true);
+ String ret = isLatin1() ? StringLatin1.replace(value, oldChar, newChar)
+ : StringUTF16.replace(value, oldChar, newChar);
+ if (ret != null) {
+ return ret;
}
*/
final int len = length();
@@ -2452,7 +2503,7 @@
* @since 1.5
*/
public boolean contains(CharSequence s) {
- return indexOf(s.toString()) > -1;
+ return indexOf(s.toString()) >= 0;
}
/**
@@ -2639,42 +2690,56 @@
*
* <p> The {@code limit} parameter controls the number of times the
* pattern is applied and therefore affects the length of the resulting
- * array. If the limit <i>n</i> is greater than zero then the pattern
- * will be applied at most <i>n</i> - 1 times, the array's
- * length will be no greater than <i>n</i>, and the array's last entry
- * will contain all input beyond the last matched delimiter. If <i>n</i>
- * is non-positive then the pattern will be applied as many times as
- * possible and the array can have any length. If <i>n</i> is zero then
- * the pattern will be applied as many times as possible, the array can
- * have any length, and trailing empty strings will be discarded.
+ * array.
+ * <ul>
+ * <li><p>
+ * If the <i>limit</i> is positive then the pattern will be applied
+ * at most <i>limit</i> - 1 times, the array's length will be
+ * no greater than <i>limit</i>, and the array's last entry will contain
+ * all input beyond the last matched delimiter.</p></li>
+ *
+ * <li><p>
+ * If the <i>limit</i> is zero then the pattern will be applied as
+ * many times as possible, the array can have any length, and trailing
+ * empty strings will be discarded.</p></li>
+ *
+ * <li><p>
+ * If the <i>limit</i> is negative then the pattern will be applied
+ * as many times as possible and the array can have any length.</p></li>
+ * </ul>
*
* <p> The string {@code "boo:and:foo"}, for example, yields the
* following results with these parameters:
*
- * <blockquote><table cellpadding=1 cellspacing=0 summary="Split example showing regex, limit, and result">
+ * <blockquote><table class="plain">
+ * <caption style="display:none">Split example showing regex, limit, and result</caption>
+ * <thead>
* <tr>
- * <th>Regex</th>
- * <th>Limit</th>
- * <th>Result</th>
+ * <th scope="col">Regex</th>
+ * <th scope="col">Limit</th>
+ * <th scope="col">Result</th>
* </tr>
- * <tr><td align=center>:</td>
- * <td align=center>2</td>
+ * </thead>
+ * <tbody>
+ * <tr><th scope="row" rowspan="3" style="font-weight:normal">:</th>
+ * <th scope="row" style="font-weight:normal; text-align:right; padding-right:1em">2</th>
* <td>{@code { "boo", "and:foo" }}</td></tr>
- * <tr><td align=center>:</td>
- * <td align=center>5</td>
+ * <tr><!-- : -->
+ * <th scope="row" style="font-weight:normal; text-align:right; padding-right:1em">5</th>
* <td>{@code { "boo", "and", "foo" }}</td></tr>
- * <tr><td align=center>:</td>
- * <td align=center>-2</td>
+ * <tr><!-- : -->
+ * <th scope="row" style="font-weight:normal; text-align:right; padding-right:1em">-2</th>
* <td>{@code { "boo", "and", "foo" }}</td></tr>
- * <tr><td align=center>o</td>
- * <td align=center>5</td>
+ * <tr><th scope="row" rowspan="3" style="font-weight:normal">o</th>
+ * <th scope="row" style="font-weight:normal; text-align:right; padding-right:1em">5</th>
* <td>{@code { "b", "", ":and:f", "", "" }}</td></tr>
- * <tr><td align=center>o</td>
- * <td align=center>-2</td>
+ * <tr><!-- o -->
+ * <th scope="row" style="font-weight:normal; text-align:right; padding-right:1em">-2</th>
* <td>{@code { "b", "", ":and:f", "", "" }}</td></tr>
- * <tr><td align=center>o</td>
- * <td align=center>0</td>
+ * <tr><!-- o -->
+ * <th scope="row" style="font-weight:normal; text-align:right; padding-right:1em">0</th>
* <td>{@code { "b", "", ":and:f" }}</td></tr>
+ * </tbody>
* </table></blockquote>
*
* <p> An invocation of this method of the form
@@ -2718,7 +2783,7 @@
the second is not the ascii digit or ascii letter.
*
char ch = 0;
- if (((regex.value.length == 1 &&
+ if (((regex.length() == 1 &&
".$|()[{^?*+\\".indexOf(ch = regex.charAt(0)) == -1) ||
(regex.length() == 2 &&
regex.charAt(0) == '\\' &&
@@ -2738,8 +2803,9 @@
off = next + 1;
} else { // last one
//assert (list.size() == limit - 1);
- list.add(substring(off, value.length));
- off = value.length;
+ int last = length();
+ list.add(substring(off, last));
+ off = last;
break;
}
}
@@ -2749,12 +2815,12 @@
// Add remaining segment
if (!limited || list.size() < limit)
- list.add(substring(off, value.length));
+ list.add(substring(off, length()));
// Construct result
int resultSize = list.size();
if (limit == 0) {
- while (resultSize > 0 && list.get(resultSize - 1).length() == 0) {
+ while (resultSize > 0 && list.get(resultSize - 1).isEmpty()) {
resultSize--;
}
}
@@ -2782,15 +2848,20 @@
* <p> The string {@code "boo:and:foo"}, for example, yields the following
* results with these expressions:
*
- * <blockquote><table cellpadding=1 cellspacing=0 summary="Split examples showing regex and result">
+ * <blockquote><table class="plain">
+ * <caption style="display:none">Split examples showing regex and result</caption>
+ * <thead>
* <tr>
- * <th>Regex</th>
- * <th>Result</th>
+ * <th scope="col">Regex</th>
+ * <th scope="col">Result</th>
* </tr>
- * <tr><td align=center>:</td>
+ * </thead>
+ * <tbody>
+ * <tr><th scope="row" style="text-weight:normal">:</th>
* <td>{@code { "boo", "and", "foo" }}</td></tr>
- * <tr><td align=center>o</td>
+ * <tr><th scope="row" style="text-weight:normal">o</th>
* <td>{@code { "b", "", ":and:f" }}</td></tr>
+ * </tbody>
* </table></blockquote>
*
*
@@ -2855,15 +2926,12 @@
*
* <blockquote>For example,
* <pre>{@code
- * List<String> strings = new LinkedList<>();
- * strings.add("Java");strings.add("is");
- * strings.add("cool");
+ * List<String> strings = List.of("Java", "is", "cool");
* String message = String.join(" ", strings);
* //message returned is: "Java is cool"
*
- * Set<String> strings = new LinkedHashSet<>();
- * strings.add("Java"); strings.add("is");
- * strings.add("very"); strings.add("cool");
+ * Set<String> strings =
+ * new LinkedHashSet<>(List.of("Java", "is", "very", "cool"));
* String message = String.join("-", strings);
* //message returned is: "Java-is-very-cool"
* }</pre></blockquote>
@@ -2904,41 +2972,43 @@
* {@code String} may be a different length than the original {@code String}.
* <p>
* Examples of lowercase mappings are in the following table:
- * <table border="1" summary="Lowercase mapping examples showing language code of locale, upper case, lower case, and description">
+ * <table class="plain">
+ * <caption style="display:none">Lowercase mapping examples showing language code of locale, upper case, lower case, and description</caption>
+ * <thead>
* <tr>
- * <th>Language Code of Locale</th>
- * <th>Upper Case</th>
- * <th>Lower Case</th>
- * <th>Description</th>
+ * <th scope="col">Language Code of Locale</th>
+ * <th scope="col">Upper Case</th>
+ * <th scope="col">Lower Case</th>
+ * <th scope="col">Description</th>
* </tr>
+ * </thead>
+ * <tbody>
* <tr>
* <td>tr (Turkish)</td>
- * <td>\u0130</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">\u0130</th>
* <td>\u0069</td>
* <td>capital letter I with dot above -> small letter i</td>
* </tr>
* <tr>
* <td>tr (Turkish)</td>
- * <td>\u0049</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">\u0049</th>
* <td>\u0131</td>
* <td>capital letter I -> small letter dotless i </td>
* </tr>
* <tr>
* <td>(all)</td>
- * <td>French Fries</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">French Fries</th>
* <td>french fries</td>
* <td>lowercased all chars in String</td>
* </tr>
* <tr>
* <td>(all)</td>
- * <td><img src="doc-files/capiota.gif" alt="capiota"><img src="doc-files/capchi.gif" alt="capchi">
- * <img src="doc-files/captheta.gif" alt="captheta"><img src="doc-files/capupsil.gif" alt="capupsil">
- * <img src="doc-files/capsigma.gif" alt="capsigma"></td>
- * <td><img src="doc-files/iota.gif" alt="iota"><img src="doc-files/chi.gif" alt="chi">
- * <img src="doc-files/theta.gif" alt="theta"><img src="doc-files/upsilon.gif" alt="upsilon">
- * <img src="doc-files/sigma1.gif" alt="sigma"></td>
+ * <th scope="row" style="font-weight:normal; text-align:left">
+ * ΙΧΘΥΣ</th>
+ * <td>ιχθυσ</td>
* <td>lowercased all chars in String</td>
* </tr>
+ * </tbody>
* </table>
*
* @param locale use the case transformation rules for this locale
@@ -2951,92 +3021,8 @@
public String toLowerCase(Locale locale) {
// BEGIN Android-changed: Replace custom code with call to new CaseMapper class.
/*
- if (locale == null) {
- throw new NullPointerException();
- }
-
- int firstUpper;
- final int len = value.length;
-
- /* Now check if there are any characters that need to be changed. *
- scan: {
- for (firstUpper = 0 ; firstUpper < len; ) {
- char c = value[firstUpper];
- if ((c >= Character.MIN_HIGH_SURROGATE)
- && (c <= Character.MAX_HIGH_SURROGATE)) {
- int supplChar = codePointAt(firstUpper);
- if (supplChar != Character.toLowerCase(supplChar)) {
- break scan;
- }
- firstUpper += Character.charCount(supplChar);
- } else {
- if (c != Character.toLowerCase(c)) {
- break scan;
- }
- firstUpper++;
- }
- }
- return this;
- }
-
- char[] result = new char[len];
- int resultOffset = 0; /* result may grow, so i+resultOffset
- * is the write location in result *
-
- /* Just copy the first few lowerCase characters. *
- System.arraycopy(value, 0, result, 0, firstUpper);
-
- String lang = locale.getLanguage();
- boolean localeDependent =
- (lang == "tr" || lang == "az" || lang == "lt");
- char[] lowerCharArray;
- int lowerChar;
- int srcChar;
- int srcCount;
- for (int i = firstUpper; i < len; i += srcCount) {
- srcChar = (int)value[i];
- if ((char)srcChar >= Character.MIN_HIGH_SURROGATE
- && (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
- srcChar = codePointAt(i);
- srcCount = Character.charCount(srcChar);
- } else {
- srcCount = 1;
- }
- if (localeDependent ||
- srcChar == '\u03A3' || // GREEK CAPITAL LETTER SIGMA
- srcChar == '\u0130') { // LATIN CAPITAL LETTER I WITH DOT ABOVE
- lowerChar = ConditionalSpecialCasing.toLowerCaseEx(this, i, locale);
- } else {
- lowerChar = Character.toLowerCase(srcChar);
- }
- if ((lowerChar == Character.ERROR)
- || (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
- if (lowerChar == Character.ERROR) {
- lowerCharArray =
- ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
- } else if (srcCount == 2) {
- resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
- continue;
- } else {
- lowerCharArray = Character.toChars(lowerChar);
- }
-
- /* Grow result if needed *
- int mapLen = lowerCharArray.length;
- if (mapLen > srcCount) {
- char[] result2 = new char[result.length + mapLen - srcCount];
- System.arraycopy(result, 0, result2, 0, i + resultOffset);
- result = result2;
- }
- for (int x = 0; x < mapLen; ++x) {
- result[i + resultOffset + x] = lowerCharArray[x];
- }
- resultOffset += (mapLen - srcCount);
- } else {
- result[i + resultOffset] = (char)lowerChar;
- }
- }
- return new String(result, 0, len + resultOffset);
+ return isLatin1() ? StringLatin1.toLowerCase(this, value, locale)
+ : StringUTF16.toLowerCase(this, value, locale);
*/
return CaseMapper.toLowerCase(locale, this);
// END Android-changed: Replace custom code with call to new CaseMapper class.
@@ -3057,7 +3043,7 @@
* LATIN SMALL LETTER DOTLESS I character.
* To obtain correct results for locale insensitive strings, use
* {@code toLowerCase(Locale.ROOT)}.
- * <p>
+ *
* @return the {@code String}, converted to lowercase.
* @see java.lang.String#toLowerCase(Locale)
*/
@@ -3074,37 +3060,42 @@
* <p>
* Examples of locale-sensitive and 1:M case mappings are in the following table.
*
- * <table border="1" summary="Examples of locale-sensitive and 1:M case mappings. Shows Language code of locale, lower case, upper case, and description.">
+ * <table class="plain">
+ * <caption style="display:none">Examples of locale-sensitive and 1:M case mappings. Shows Language code of locale, lower case, upper case, and description.</caption>
+ * <thead>
* <tr>
- * <th>Language Code of Locale</th>
- * <th>Lower Case</th>
- * <th>Upper Case</th>
- * <th>Description</th>
+ * <th scope="col">Language Code of Locale</th>
+ * <th scope="col">Lower Case</th>
+ * <th scope="col">Upper Case</th>
+ * <th scope="col">Description</th>
* </tr>
+ * </thead>
+ * <tbody>
* <tr>
* <td>tr (Turkish)</td>
- * <td>\u0069</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">\u0069</th>
* <td>\u0130</td>
* <td>small letter i -> capital letter I with dot above</td>
* </tr>
* <tr>
* <td>tr (Turkish)</td>
- * <td>\u0131</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">\u0131</th>
* <td>\u0049</td>
* <td>small letter dotless i -> capital letter I</td>
* </tr>
* <tr>
* <td>(all)</td>
- * <td>\u00df</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">\u00df</th>
* <td>\u0053 \u0053</td>
* <td>small letter sharp s -> two letters: SS</td>
* </tr>
* <tr>
* <td>(all)</td>
- * <td>Fahrvergnügen</td>
+ * <th scope="row" style="font-weight:normal; text-align:left">Fahrvergnügen</th>
* <td>FAHRVERGNÜGEN</td>
* <td></td>
* </tr>
+ * </tbody>
* </table>
* @param locale use the case transformation rules for this locale
* @return the {@code String}, converted to uppercase.
@@ -3116,95 +3107,8 @@
public String toUpperCase(Locale locale) {
// BEGIN Android-changed: Replace custom code with call to new CaseMapper class.
/*
- if (locale == null) {
- throw new NullPointerException();
- }
-
- int firstLower;
- final int len = value.length;
-
- /* Now check if there are any characters that need to be changed. *
- scan: {
- for (firstLower = 0 ; firstLower < len; ) {
- int c = (int)value[firstLower];
- int srcCount;
- if ((c >= Character.MIN_HIGH_SURROGATE)
- && (c <= Character.MAX_HIGH_SURROGATE)) {
- c = codePointAt(firstLower);
- srcCount = Character.charCount(c);
- } else {
- srcCount = 1;
- }
- int upperCaseChar = Character.toUpperCaseEx(c);
- if ((upperCaseChar == Character.ERROR)
- || (c != upperCaseChar)) {
- break scan;
- }
- firstLower += srcCount;
- }
- return this;
- }
-
- /* result may grow, so i+resultOffset is the write location in result *
- int resultOffset = 0;
- char[] result = new char[len]; /* may grow *
-
- /* Just copy the first few upperCase characters. *
- System.arraycopy(value, 0, result, 0, firstLower);
-
- String lang = locale.getLanguage();
- boolean localeDependent =
- (lang == "tr" || lang == "az" || lang == "lt");
- char[] upperCharArray;
- int upperChar;
- int srcChar;
- int srcCount;
- for (int i = firstLower; i < len; i += srcCount) {
- srcChar = (int)value[i];
- if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
- (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
- srcChar = codePointAt(i);
- srcCount = Character.charCount(srcChar);
- } else {
- srcCount = 1;
- }
- if (localeDependent) {
- upperChar = ConditionalSpecialCasing.toUpperCaseEx(this, i, locale);
- } else {
- upperChar = Character.toUpperCaseEx(srcChar);
- }
- if ((upperChar == Character.ERROR)
- || (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
- if (upperChar == Character.ERROR) {
- if (localeDependent) {
- upperCharArray =
- ConditionalSpecialCasing.toUpperCaseCharArray(this, i, locale);
- } else {
- upperCharArray = Character.toUpperCaseCharArray(srcChar);
- }
- } else if (srcCount == 2) {
- resultOffset += Character.toChars(upperChar, result, i + resultOffset) - srcCount;
- continue;
- } else {
- upperCharArray = Character.toChars(upperChar);
- }
-
- /* Grow result if needed *
- int mapLen = upperCharArray.length;
- if (mapLen > srcCount) {
- char[] result2 = new char[result.length + mapLen - srcCount];
- System.arraycopy(result, 0, result2, 0, i + resultOffset);
- result = result2;
- }
- for (int x = 0; x < mapLen; ++x) {
- result[i + resultOffset + x] = upperCharArray[x];
- }
- resultOffset += (mapLen - srcCount);
- } else {
- result[i + resultOffset] = (char)upperChar;
- }
- }
- return new String(result, 0, len + resultOffset);
+ return isLatin1() ? StringLatin1.toUpperCase(this, value, locale)
+ : StringUTF16.toUpperCase(this, value, locale);
*/
return CaseMapper.toUpperCase(locale, this, length());
// END Android-changed: Replace custom code with call to new CaseMapper class.
@@ -3225,7 +3129,7 @@
* LATIN CAPITAL LETTER I WITH DOT ABOVE character.
* To obtain correct results for locale insensitive strings, use
* {@code toUpperCase(Locale.ROOT)}.
- * <p>
+ *
* @return the {@code String}, converted to uppercase.
* @see java.lang.String#toUpperCase(Locale)
*/
@@ -3234,35 +3138,36 @@
}
/**
- * Returns a string whose value is this string, with any leading and trailing
- * whitespace removed.
+ * Returns a string whose value is this string, with all leading
+ * and trailing space removed, where space is defined
+ * as any character whose codepoint is less than or equal to
+ * {@code 'U+0020'} (the space character).
* <p>
* If this {@code String} object represents an empty character
* sequence, or the first and last characters of character sequence
* represented by this {@code String} object both have codes
- * greater than {@code '\u005Cu0020'} (the space character), then a
+ * that are not space (as defined above), then a
* reference to this {@code String} object is returned.
* <p>
- * Otherwise, if there is no character with a code greater than
- * {@code '\u005Cu0020'} in the string, then a
- * {@code String} object representing an empty string is
- * returned.
+ * Otherwise, if all characters in this string are space (as
+ * defined above), then a {@code String} object representing an
+ * empty string is returned.
* <p>
* Otherwise, let <i>k</i> be the index of the first character in the
- * string whose code is greater than {@code '\u005Cu0020'}, and let
+ * string whose code is not a space (as defined above) and let
* <i>m</i> be the index of the last character in the string whose code
- * is greater than {@code '\u005Cu0020'}. A {@code String}
+ * is not a space (as defined above). A {@code String}
* object is returned, representing the substring of this string that
* begins with the character at index <i>k</i> and ends with the
* character at index <i>m</i>-that is, the result of
* {@code this.substring(k, m + 1)}.
* <p>
- * This method may be used to trim whitespace (as defined above) from
+ * This method may be used to trim space (as defined above) from
* the beginning and end of a string.
*
- * @return A string whose value is this string, with any leading and trailing white
- * space removed, or this string if it has no leading or
- * trailing white space.
+ * @return a string whose value is this string, with all leading
+ * and trailing space removed, or this string if it
+ * has no leading or trailing space.
*/
public String trim() {
int len = length();
@@ -3296,10 +3201,8 @@
// BEGIN Android-changed: Replace with implementation in runtime to access chars (see above).
/*
public char[] toCharArray() {
- // Cannot use Arrays.copyOf because of class initialization order issues
- char result[] = new char[value.length];
- System.arraycopy(value, 0, result, 0, value.length);
- return result;
+ return isLatin1() ? StringLatin1.toChars(value)
+ : StringUTF16.toChars(value);
}
*/
@FastNative
@@ -3312,7 +3215,9 @@
* arguments.
*
* <p> The locale always used is the one returned by {@link
- * java.util.Locale#getDefault() Locale.getDefault()}.
+ * java.util.Locale#getDefault(java.util.Locale.Category)
+ * Locale.getDefault(Locale.Category)} with
+ * {@link java.util.Locale.Category#FORMAT FORMAT} category specified.
*
* @param format
* A <a href="../util/Formatter.html#syntax">format string</a>
@@ -3487,11 +3392,16 @@
* as its single character the argument {@code c}.
*/
public static String valueOf(char c) {
- // Android-changed: Replace constructor call with call to StringFactory class.
+ // BEGIN Android-changed: Replace constructor call with call to StringFactory class.
// There is currently no String(char[], boolean) on Android to call. http://b/79902155
- // char data[] = {c};
- // return new String(data, true);
+ /*
+ if (COMPACT_STRINGS && StringLatin1.canEncode(c)) {
+ return new String(StringLatin1.toBytes(c), LATIN1);
+ }
+ return new String(StringUTF16.toBytes(c), UTF16);
+ */
return StringFactory.newStringFromChars(0, 1, new char[] { c });
+ // END Android-changed: Replace constructor call with call to StringFactory class.
}
/**
@@ -3572,8 +3482,83 @@
*
* @return a string that has the same contents as this string, but is
* guaranteed to be from a pool of unique strings.
+ * @jls 3.10.5 String Literals
*/
// Android-added: Annotate native method as @FastNative.
@FastNative
public native String intern();
+
+ /**
+ * Returns a string whose value is the concatenation of this
+ * string repeated {@code count} times.
+ * <p>
+ * If this string is empty or count is zero then the empty
+ * string is returned.
+ *
+ * @param count number of times to repeat
+ *
+ * @return A string composed of this string repeated
+ * {@code count} times or the empty string if this
+ * string is empty or count is zero
+ *
+ * @throws IllegalArgumentException if the {@code count} is
+ * negative.
+ *
+ * @since 11
+ */
+ public String repeat(int count) {
+ if (count < 0) {
+ throw new IllegalArgumentException("count is negative: " + count);
+ }
+ if (count == 1) {
+ return this;
+ }
+ // Android-changed: Replace with implementation in runtime.
+ // final int len = value.length;
+ final int len = length();
+ if (len == 0 || count == 0) {
+ return "";
+ }
+ // BEGIN Android-changed: Replace with implementation in runtime.
+ /*
+ if (len == 1) {
+ final byte[] single = new byte[count];
+ Arrays.fill(single, value[0]);
+ return new String(single, coder);
+ }
+ */
+ // END Android-changed: Replace with implementation in runtime.
+ if (Integer.MAX_VALUE / count < len) {
+ throw new OutOfMemoryError("Repeating " + len + " bytes String " + count +
+ " times will produce a String exceeding maximum size.");
+ }
+ // BEGIN Android-changed: Replace with implementation in runtime.
+ /*
+ final int limit = len * count;
+ final byte[] multiple = new byte[limit];
+ System.arraycopy(value, 0, multiple, 0, len);
+ int copied = len;
+ for (; copied < limit - copied; copied <<= 1) {
+ System.arraycopy(multiple, 0, multiple, copied, copied);
+ }
+ System.arraycopy(multiple, 0, multiple, copied, limit - copied);
+ return new String(multiple, coder);
+ */
+ // END Android-changed: Replace with implementation in runtime.
+ return doRepeat(count);
+ }
+
+ @FastNative
+ private native String doRepeat(int count);
+
+ /*
+ * StringIndexOutOfBoundsException if {@code index} is
+ * negative or greater than or equal to {@code length}.
+ */
+ static void checkIndex(int index, int length) {
+ if (index < 0 || index >= length) {
+ throw new StringIndexOutOfBoundsException("index " + index +
+ ",length " + length);
+ }
+ }
}
diff --git a/ojluni/src/main/java/java/nio/channels/Channels.java b/ojluni/src/main/java/java/nio/channels/Channels.java
index 1d11262..b033a81 100644
--- a/ojluni/src/main/java/java/nio/channels/Channels.java
+++ b/ojluni/src/main/java/java/nio/channels/Channels.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2014 The Android Open Source Project
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -39,6 +39,7 @@
import java.nio.charset.CharsetEncoder;
import java.nio.charset.UnsupportedCharsetException;
import java.nio.channels.spi.AbstractInterruptibleChannel;
+import java.util.Objects;
import java.util.concurrent.ExecutionException;
import sun.nio.ch.ChannelInputStream;
import sun.nio.cs.StreamDecoder;
@@ -49,8 +50,8 @@
* Utility methods for channels and streams.
*
* <p> This class defines static methods that support the interoperation of the
- * stream classes of the <tt>{@link java.io}</tt> package with the channel
- * classes of this package. </p>
+ * stream classes of the {@link java.io} package with the channel classes
+ * of this package. </p>
*
*
* @author Mark Reinhold
@@ -61,12 +62,7 @@
public final class Channels {
- private Channels() { } // No instantiation
-
- private static void checkNotNull(Object o, String name) {
- if (o == null)
- throw new NullPointerException("\"" + name + "\" is null!");
- }
+ private Channels() { throw new Error("no instances"); }
/**
* Write all remaining bytes in buffer to the given channel.
@@ -92,7 +88,7 @@
throws IOException
{
if (ch instanceof SelectableChannel) {
- SelectableChannel sc = (SelectableChannel)ch;
+ SelectableChannel sc = (SelectableChannel) ch;
synchronized (sc.blockingLock()) {
if (!sc.isBlocking())
throw new IllegalBlockingModeException();
@@ -108,7 +104,7 @@
/**
* Constructs a stream that reads bytes from the given channel.
*
- * <p> The <tt>read</tt> methods of the resulting stream will throw an
+ * <p> The {@code read} methods of the resulting stream will throw an
* {@link IllegalBlockingModeException} if invoked while the underlying
* channel is in non-blocking mode. The stream will not be buffered, and
* it will not support the {@link InputStream#mark mark} or {@link
@@ -122,14 +118,14 @@
* @return A new input stream
*/
public static InputStream newInputStream(ReadableByteChannel ch) {
- checkNotNull(ch, "ch");
- return new sun.nio.ch.ChannelInputStream(ch);
+ Objects.requireNonNull(ch, "ch");
+ return new ChannelInputStream(ch);
}
/**
* Constructs a stream that writes bytes to the given channel.
*
- * <p> The <tt>write</tt> methods of the resulting stream will throw an
+ * <p> The {@code write} methods of the resulting stream will throw an
* {@link IllegalBlockingModeException} if invoked while the underlying
* channel is in non-blocking mode. The stream will not be buffered. The
* stream will be safe for access by multiple concurrent threads. Closing
@@ -140,46 +136,49 @@
*
* @return A new output stream
*/
- public static OutputStream newOutputStream(final WritableByteChannel ch) {
- checkNotNull(ch, "ch");
+ public static OutputStream newOutputStream(WritableByteChannel ch) {
+ Objects.requireNonNull(ch, "ch");
return new OutputStream() {
- private ByteBuffer bb = null;
- private byte[] bs = null; // Invoker's previous array
- private byte[] b1 = null;
+ private ByteBuffer bb;
+ private byte[] bs; // Invoker's previous array
+ private byte[] b1;
- public synchronized void write(int b) throws IOException {
- if (b1 == null)
- b1 = new byte[1];
- b1[0] = (byte)b;
- this.write(b1);
- }
+ @Override
+ public synchronized void write(int b) throws IOException {
+ if (b1 == null)
+ b1 = new byte[1];
+ b1[0] = (byte) b;
+ this.write(b1);
+ }
- public synchronized void write(byte[] bs, int off, int len)
+ @Override
+ public synchronized void write(byte[] bs, int off, int len)
throws IOException
- {
- if ((off < 0) || (off > bs.length) || (len < 0) ||
- ((off + len) > bs.length) || ((off + len) < 0)) {
- throw new IndexOutOfBoundsException();
- } else if (len == 0) {
- return;
- }
- ByteBuffer bb = ((this.bs == bs)
- ? this.bb
- : ByteBuffer.wrap(bs));
- bb.limit(Math.min(off + len, bb.capacity()));
- bb.position(off);
- this.bb = bb;
- this.bs = bs;
- Channels.writeFully(ch, bb);
+ {
+ if ((off < 0) || (off > bs.length) || (len < 0) ||
+ ((off + len) > bs.length) || ((off + len) < 0)) {
+ throw new IndexOutOfBoundsException();
+ } else if (len == 0) {
+ return;
}
+ ByteBuffer bb = ((this.bs == bs)
+ ? this.bb
+ : ByteBuffer.wrap(bs));
+ bb.limit(Math.min(off + len, bb.capacity()));
+ bb.position(off);
+ this.bb = bb;
+ this.bs = bs;
+ Channels.writeFully(ch, bb);
+ }
- public void close() throws IOException {
- ch.close();
- }
+ @Override
+ public void close() throws IOException {
+ ch.close();
+ }
- };
+ };
}
/**
@@ -197,13 +196,13 @@
*
* @since 1.7
*/
- public static InputStream newInputStream(final AsynchronousByteChannel ch) {
- checkNotNull(ch, "ch");
+ public static InputStream newInputStream(AsynchronousByteChannel ch) {
+ Objects.requireNonNull(ch, "ch");
return new InputStream() {
- private ByteBuffer bb = null;
- private byte[] bs = null; // Invoker's previous array
- private byte[] b1 = null;
+ private ByteBuffer bb;
+ private byte[] bs; // Invoker's previous array
+ private byte[] b1;
@Override
public synchronized int read() throws IOException {
@@ -217,13 +216,14 @@
@Override
public synchronized int read(byte[] bs, int off, int len)
- throws IOException
+ throws IOException
{
if ((off < 0) || (off > bs.length) || (len < 0) ||
((off + len) > bs.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
- } else if (len == 0)
+ } else if (len == 0) {
return 0;
+ }
ByteBuffer bb = ((this.bs == bs)
? this.bb
@@ -271,25 +271,25 @@
*
* @since 1.7
*/
- public static OutputStream newOutputStream(final AsynchronousByteChannel ch) {
- checkNotNull(ch, "ch");
+ public static OutputStream newOutputStream(AsynchronousByteChannel ch) {
+ Objects.requireNonNull(ch, "ch");
return new OutputStream() {
- private ByteBuffer bb = null;
- private byte[] bs = null; // Invoker's previous array
- private byte[] b1 = null;
+ private ByteBuffer bb;
+ private byte[] bs; // Invoker's previous array
+ private byte[] b1;
@Override
public synchronized void write(int b) throws IOException {
- if (b1 == null)
+ if (b1 == null)
b1 = new byte[1];
- b1[0] = (byte)b;
+ b1[0] = (byte) b;
this.write(b1);
}
@Override
public synchronized void write(byte[] bs, int off, int len)
- throws IOException
+ throws IOException
{
if ((off < 0) || (off > bs.length) || (len < 0) ||
((off + len) > bs.length) || ((off + len) < 0)) {
@@ -344,12 +344,11 @@
*
* @return A new readable byte channel
*/
- public static ReadableByteChannel newChannel(final InputStream in) {
- checkNotNull(in, "in");
+ public static ReadableByteChannel newChannel(InputStream in) {
+ Objects.requireNonNull(in, "in");
- if (in instanceof FileInputStream &&
- FileInputStream.class.equals(in.getClass())) {
- return ((FileInputStream)in).getChannel();
+ if (in.getClass() == FileInputStream.class) {
+ return ((FileInputStream) in).getChannel();
}
return new ReadableByteChannelImpl(in);
@@ -359,17 +358,21 @@
extends AbstractInterruptibleChannel // Not really interruptible
implements ReadableByteChannel
{
- InputStream in;
+ private final InputStream in;
private static final int TRANSFER_SIZE = 8192;
- private byte buf[] = new byte[0];
- private boolean open = true;
- private Object readLock = new Object();
+ private byte[] buf = new byte[0];
+ private final Object readLock = new Object();
ReadableByteChannelImpl(InputStream in) {
this.in = in;
}
+ @Override
public int read(ByteBuffer dst) throws IOException {
+ if (!isOpen()) {
+ throw new ClosedChannelException();
+ }
+
int len = dst.remaining();
int totalRead = 0;
int bytesRead = 0;
@@ -400,9 +403,9 @@
}
}
+ @Override
protected void implCloseChannel() throws IOException {
in.close();
- open = false;
}
}
@@ -420,7 +423,7 @@
* @return A new writable byte channel
*/
public static WritableByteChannel newChannel(final OutputStream out) {
- checkNotNull(out, "out");
+ Objects.requireNonNull(out, "out");
return new WritableByteChannelImpl(out);
}
@@ -428,17 +431,21 @@
extends AbstractInterruptibleChannel // Not really interruptible
implements WritableByteChannel
{
- OutputStream out;
+ private final OutputStream out;
private static final int TRANSFER_SIZE = 8192;
- private byte buf[] = new byte[0];
- private boolean open = true;
- private Object writeLock = new Object();
+ private byte[] buf = new byte[0];
+ private final Object writeLock = new Object();
WritableByteChannelImpl(OutputStream out) {
this.out = out;
}
+ @Override
public int write(ByteBuffer src) throws IOException {
+ if (!isOpen()) {
+ throw new ClosedChannelException();
+ }
+
int len = src.remaining();
int totalWritten = 0;
synchronized (writeLock) {
@@ -460,9 +467,9 @@
}
}
+ @Override
protected void implCloseChannel() throws IOException {
out.close();
- open = false;
}
}
@@ -474,7 +481,7 @@
* given decoder.
*
* <p> The resulting stream will contain an internal input buffer of at
- * least <tt>minBufferCap</tt> bytes. The stream's <tt>read</tt> methods
+ * least {@code minBufferCap} bytes. The stream's {@code read} methods
* will, as needed, fill the buffer by reading bytes from the underlying
* channel; if the channel is in non-blocking mode when bytes are to be
* read then an {@link IllegalBlockingModeException} will be thrown. The
@@ -490,7 +497,7 @@
*
* @param minBufferCap
* The minimum capacity of the internal byte buffer,
- * or <tt>-1</tt> if an implementation-dependent
+ * or {@code -1} if an implementation-dependent
* default capacity is to be used
*
* @return A new reader
@@ -499,7 +506,7 @@
CharsetDecoder dec,
int minBufferCap)
{
- checkNotNull(ch, "ch");
+ Objects.requireNonNull(ch, "ch");
return StreamDecoder.forDecoder(ch, dec.reset(), minBufferCap);
}
@@ -509,16 +516,15 @@
*
* <p> An invocation of this method of the form
*
- * <blockquote><pre>
- * Channels.newReader(ch, csname)</pre></blockquote>
+ * <pre> {@code
+ * Channels.newReader(ch, csname)
+ * } </pre>
*
* behaves in exactly the same way as the expression
*
- * <blockquote><pre>
- * Channels.newReader(ch,
- * Charset.forName(csName)
- * .newDecoder(),
- * -1);</pre></blockquote>
+ * <pre> {@code
+ * Channels.newReader(ch, Charset.forName(csName))
+ * } </pre>
*
* @param ch
* The channel from which bytes will be read
@@ -535,16 +541,48 @@
public static Reader newReader(ReadableByteChannel ch,
String csName)
{
- checkNotNull(csName, "csName");
+ Objects.requireNonNull(csName, "csName");
return newReader(ch, Charset.forName(csName).newDecoder(), -1);
}
/**
+ * Constructs a reader that decodes bytes from the given channel according
+ * to the given charset.
+ *
+ * <p> An invocation of this method of the form
+ *
+ * <pre> {@code
+ * Channels.newReader(ch, charset)
+ * } </pre>
+ *
+ * behaves in exactly the same way as the expression
+ *
+ * <pre> {@code
+ * Channels.newReader(ch, Charset.forName(csName).newDecoder(), -1)
+ * } </pre>
+ *
+ * <p> The reader's default action for malformed-input and unmappable-character
+ * errors is to {@linkplain java.nio.charset.CodingErrorAction#REPORT report}
+ * them. When more control over the error handling is required, the constructor
+ * that takes a {@linkplain java.nio.charset.CharsetDecoder} should be used.
+ *
+ * @param ch The channel from which bytes will be read
+ *
+ * @param charset The charset to be used
+ *
+ * @return A new reader
+ */
+ public static Reader newReader(ReadableByteChannel ch, Charset charset) {
+ Objects.requireNonNull(charset, "charset");
+ return newReader(ch, charset.newDecoder(), -1);
+ }
+
+ /**
* Constructs a writer that encodes characters using the given encoder and
* writes the resulting bytes to the given channel.
*
* <p> The resulting stream will contain an internal output buffer of at
- * least <tt>minBufferCap</tt> bytes. The stream's <tt>write</tt> methods
+ * least {@code minBufferCap} bytes. The stream's {@code write} methods
* will, as needed, flush the buffer by writing bytes to the underlying
* channel; if the channel is in non-blocking mode when bytes are to be
* written then an {@link IllegalBlockingModeException} will be thrown.
@@ -559,16 +597,16 @@
*
* @param minBufferCap
* The minimum capacity of the internal byte buffer,
- * or <tt>-1</tt> if an implementation-dependent
+ * or {@code -1} if an implementation-dependent
* default capacity is to be used
*
* @return A new writer
*/
- public static Writer newWriter(final WritableByteChannel ch,
- final CharsetEncoder enc,
- final int minBufferCap)
+ public static Writer newWriter(WritableByteChannel ch,
+ CharsetEncoder enc,
+ int minBufferCap)
{
- checkNotNull(ch, "ch");
+ Objects.requireNonNull(ch, "ch");
return StreamEncoder.forEncoder(ch, enc.reset(), minBufferCap);
}
@@ -578,16 +616,15 @@
*
* <p> An invocation of this method of the form
*
- * <blockquote><pre>
- * Channels.newWriter(ch, csname)</pre></blockquote>
+ * <pre> {@code
+ * Channels.newWriter(ch, csname)
+ * } </pre>
*
* behaves in exactly the same way as the expression
*
- * <blockquote><pre>
- * Channels.newWriter(ch,
- * Charset.forName(csName)
- * .newEncoder(),
- * -1);</pre></blockquote>
+ * <pre> {@code
+ * Channels.newWriter(ch, Charset.forName(csName))
+ * } </pre>
*
* @param ch
* The channel to which bytes will be written
@@ -604,7 +641,41 @@
public static Writer newWriter(WritableByteChannel ch,
String csName)
{
- checkNotNull(csName, "csName");
+ Objects.requireNonNull(csName, "csName");
return newWriter(ch, Charset.forName(csName).newEncoder(), -1);
}
+
+ /**
+ * Constructs a writer that encodes characters according to the given
+ * charset and writes the resulting bytes to the given channel.
+ *
+ * <p> An invocation of this method of the form
+ *
+ * <pre> {@code
+ * Channels.newWriter(ch, charset)
+ * } </pre>
+ *
+ * behaves in exactly the same way as the expression
+ *
+ * <pre> {@code
+ * Channels.newWriter(ch, Charset.forName(csName).newEncoder(), -1)
+ * } </pre>
+ *
+ * <p> The writer's default action for malformed-input and unmappable-character
+ * errors is to {@linkplain java.nio.charset.CodingErrorAction#REPORT report}
+ * them. When more control over the error handling is required, the constructor
+ * that takes a {@linkplain java.nio.charset.CharsetEncoder} should be used.
+ *
+ * @param ch
+ * The channel to which bytes will be written
+ *
+ * @param charset
+ * The charset to be used
+ *
+ * @return A new writer
+ */
+ public static Writer newWriter(WritableByteChannel ch, Charset charset) {
+ Objects.requireNonNull(charset, "charset");
+ return newWriter(ch, charset.newEncoder(), -1);
+}
}
diff --git a/ojluni/src/test/java/lang/String/StringRepeat.java b/ojluni/src/test/java/lang/String/StringRepeat.java
new file mode 100644
index 0000000..009969d
--- /dev/null
+++ b/ojluni/src/test/java/lang/String/StringRepeat.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary This exercises String#repeat patterns and limits.
+ * @run main/othervm -Xmx4G StringRepeat
+ */
+package test.java.lang.String;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class StringRepeat {
+ /*
+ * Varitions of repeat count.
+ */
+ static int[] REPEATS = {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 32, 64, 128, 256, 512, 1024, 64 * 1024, 1024 * 1024,
+ 16 * 1024 * 1024
+ };
+
+ /*
+ * Varitions of Strings.
+ */
+ static String[] STRINGS = new String[] {
+ "", "\0", " ", "a", "$", "\u2022",
+ "ab", "abc", "abcd", "abcde",
+ "The quick brown fox jumps over the lazy dog."
+ };
+
+ /*
+ * Repeat String function tests.
+ */
+ @Test
+ public void test1() {
+ for (int repeat : REPEATS) {
+ for (String string : STRINGS) {
+ long limit = (long)string.length() * (long)repeat;
+
+ // Android-changed: lowered max length limit
+ // if ((long)(Integer.MAX_VALUE >> 1) <= limit) {
+ if ((long)(Integer.MAX_VALUE >> 5) <= limit) {
+ break;
+ }
+
+ verify(string.repeat(repeat), string, repeat);
+ }
+ }
+ }
+
+ /*
+ * Repeat String exception tests.
+ */
+ @Test
+ public void test2() {
+ try {
+ "abc".repeat(-1);
+ throw new RuntimeException("No exception for negative repeat count");
+ } catch (IllegalArgumentException ex) {
+ // Correct
+ }
+
+ try {
+ "abc".repeat(Integer.MAX_VALUE - 1);
+ throw new RuntimeException("No exception for large repeat count");
+ } catch (OutOfMemoryError ex) {
+ // Correct
+ }
+ }
+
+ // Android-added: more tests
+ @Test
+ public void testEdgeCases() {
+ Assert.assertThrows(IllegalArgumentException.class, () -> "a".repeat(-1));
+ Assert.assertThrows(IllegalArgumentException.class, () -> "\u03B1".repeat(-1));
+ Assert.assertThrows(OutOfMemoryError.class, () -> "\u03B1\u03B2".repeat(Integer.MAX_VALUE));
+ }
+
+ @Test
+ public void testCompressed() {
+ Assert.assertEquals("a".repeat(0), "");
+ Assert.assertEquals("a".repeat(1), "a");
+ Assert.assertEquals("a".repeat(5), "aaaaa");
+
+ Assert.assertEquals("abc".repeat(0), "");
+ Assert.assertEquals("abc".repeat(1), "abc");
+ Assert.assertEquals("abc".repeat(5), "abcabcabcabcabc");
+ }
+
+ @Test
+ public void testUncompressed() {
+ Assert.assertEquals("\u2022".repeat(0), "");
+ Assert.assertEquals("\u2022".repeat(1), "\u2022");
+ Assert.assertEquals("\u2022".repeat(5), "\u2022\u2022\u2022\u2022\u2022");
+
+ Assert.assertEquals("\u03B1\u03B2\u03B3".repeat(0), "");
+ Assert.assertEquals("\u03B1\u03B2\u03B3".repeat(1), "αβγ");
+ Assert.assertEquals("\u03B1\u03B2\u03B3".repeat(5), "αβγαβγαβγαβγαβγ");
+ }
+
+ static String truncate(String string) {
+ if (string.length() < 80) {
+ return string;
+ }
+ return string.substring(0, 80) + "...";
+ }
+
+ /*
+ * Verify string repeat patterns.
+ */
+ static void verify(String result, String string, int repeat) {
+ if (string.isEmpty() || repeat == 0) {
+ if (!result.isEmpty()) {
+ String message = String.format("\"%s\".repeat(%d)%n", truncate(string), repeat) +
+ String.format("Result \"%s\"%n", truncate(result)) +
+ String.format("Result expected to be empty, found string of length %d%n", result.length());
+ Assert.fail(message);
+ }
+ } else {
+ int expected = 0;
+ int count = 0;
+ for (int offset = result.indexOf(string, expected);
+ 0 <= offset;
+ offset = result.indexOf(string, expected)) {
+ count++;
+ if (offset != expected) {
+ String message = String.format("\"%s\".repeat(%d)%n", truncate(string), repeat) +
+ String.format("Result \"%s\"%n", truncate(result)) +
+ String.format("Repeat expected at %d, found at = %d%n", expected, offset);
+ Assert.fail(message);
+ }
+ expected += string.length();
+ }
+ if (count != repeat) {
+ String message = String.format("\"%s\".repeat(%d)%n", truncate(string), repeat) +
+ String.format("Result \"%s\"%n", truncate(result)) +
+ String.format("Repeat count expected to be %d, found %d%n", repeat, count);
+ Assert.fail(message);
+ }
+ }
+ }
+}
diff --git a/ojluni/src/test/java/nio/channels/Channels/Basic.java b/ojluni/src/test/java/nio/channels/Channels/Basic.java
new file mode 100644
index 0000000..1b31be0
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/Basic.java
@@ -0,0 +1,417 @@
+/*
+ * Copyright (c) 2001, 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 4417152 4481572 6248930 6725399 6884800
+ * @summary Test Channels basic functionality
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.charset.*;
+import java.nio.channels.*;
+import org.testng.annotations.Test;
+
+
+public class Basic {
+
+ static String message;
+
+ static String encoding;
+
+ static File blah;
+
+ static int ITERATIONS = 500;
+
+ @Test
+ public void basicTest() throws Exception {
+ message = "ascii data for a test";
+ encoding = "ISO-8859-1";
+ test();
+ message = "\ucafe\ubabe\ucafe\ubabe\ucafe\ubabe";
+ encoding = "UTF-8";
+ test();
+ }
+
+ static void failNpeExpected() {
+ throw new RuntimeException("Did not get the expected NullPointerException.");
+ }
+
+ private static void test() throws Exception {
+ //Test if methods of Channels throw NPE with null argument(s)
+ try {
+ Channels.newInputStream((ReadableByteChannel)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newOutputStream((WritableByteChannel)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ ReadableByteChannel channel = Channels.newChannel((InputStream)null);
+ failNpeExpected();
+ } catch (NullPointerException ne) {} // OK. As expected.
+
+ try {
+ WritableByteChannel channel = Channels.newChannel((OutputStream)null);
+ failNpeExpected();
+ } catch (NullPointerException ne) {} // OK. As expected.
+
+ WritableByteChannel wbc = new WritableByteChannel() {
+ public int write(ByteBuffer src) { return 0; }
+ public void close() throws IOException { }
+ public boolean isOpen() { return true; }
+ };
+
+ ReadableByteChannel rbc = new ReadableByteChannel() {
+ public int read(ByteBuffer dst) { return 0; }
+ public void close() {}
+ public boolean isOpen() { return true; }
+ };
+
+ try {
+ Channels.newReader((ReadableByteChannel)null,
+ Charset.defaultCharset().newDecoder(),
+ -1);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newReader(rbc, (CharsetDecoder)null, -1);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newReader((ReadableByteChannel)null,
+ Charset.defaultCharset().name());
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newReader(rbc, (String)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+
+ try {
+ Channels.newReader(null, (String)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newReader(rbc, (Charset)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+
+ try {
+ Channels.newReader(null, (Charset)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter((WritableByteChannel)null,
+ Charset.defaultCharset().newEncoder(),
+ -1);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter(null, null, -1);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter(wbc, null, -1);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter((WritableByteChannel)null,
+ Charset.defaultCharset().name());
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter(wbc, (String)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter(null, (String)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter(wbc, (Charset)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ Channels.newWriter(null, (Charset)null);
+ failNpeExpected();
+ } catch (NullPointerException npe) {}
+
+ try {
+ blah = File.createTempFile("blah", null);
+
+ testNewOutputStream(blah);
+ readAndCheck(blah);
+ blah.delete();
+
+ writeOut(blah, ITERATIONS);
+ testNewInputStream(blah);
+ blah.delete();
+
+ testNewChannelOut(blah);
+ readAndCheck(blah);
+ blah.delete();
+
+ testNewChannelWriteAfterClose(blah);
+
+ testNewChannelReadAfterClose(blah);
+ blah.delete();
+
+ writeOut(blah, ITERATIONS);
+ testNewChannelIn(blah);
+ test4481572(blah);
+ blah.delete();
+
+ testNewWriter(blah);
+ readAndCheck(blah);
+ blah.delete();
+
+ writeOut(blah, ITERATIONS);
+ testNewReader(blah);
+
+ } finally {
+ blah.delete();
+ }
+ }
+
+ private static void readAndCheck(File blah) throws Exception {
+ FileInputStream fis = new FileInputStream(blah);
+ int messageSize = message.length() * ITERATIONS * 3 + 1;
+ byte bb[] = new byte[messageSize];
+ int bytesRead = 0;
+ int totalRead = 0;
+ while (bytesRead != -1) {
+ totalRead += bytesRead;
+ bytesRead = fis.read(bb, totalRead, messageSize - totalRead);
+ }
+ String result = new String(bb, 0, totalRead, encoding);
+ int len = message.length();
+ for (int i=0; i<ITERATIONS; i++) {
+ String segment = result.substring(i++ * len, i * len);
+ if (!segment.equals(message))
+ throw new RuntimeException("Test failed");
+ }
+ fis.close();
+ }
+
+ private static void writeOut(File blah, int limit) throws Exception {
+ FileOutputStream fos = new FileOutputStream(blah);
+ for (int i=0; i<limit; i++)
+ fos.write(message.getBytes(encoding));
+ fos.close();
+ }
+
+ private static void testNewOutputStream(File blah) throws Exception {
+ FileOutputStream fos = new FileOutputStream(blah);
+ FileChannel fc = fos.getChannel();
+ WritableByteChannel wbc = (WritableByteChannel)fc;
+ OutputStream os = Channels.newOutputStream(wbc);
+ for (int i=0; i<ITERATIONS; i++)
+ os.write(message.getBytes(encoding));
+ os.close();
+ fos.close();
+ }
+
+ private static void testNewInputStream(File blah) throws Exception {
+ FileInputStream fis = new FileInputStream(blah);
+ FileChannel fc = fis.getChannel();
+ InputStream is = Channels.newInputStream(fc);
+ int messageSize = message.length() * ITERATIONS * 3 + 1;
+ byte bb[] = new byte[messageSize];
+
+ int bytesRead = 0;
+ int totalRead = 0;
+ while (bytesRead != -1) {
+ totalRead += bytesRead;
+ long rem = Math.min(fc.size() - totalRead, (long)Integer.MAX_VALUE);
+ if (is.available() != (int)rem)
+ throw new RuntimeException("available not useful or not maximally useful");
+ bytesRead = is.read(bb, totalRead, messageSize - totalRead);
+ }
+ if (is.available() != 0)
+ throw new RuntimeException("available() should return 0 at EOF");
+
+ String result = new String(bb, 0, totalRead, encoding);
+ int len = message.length();
+ for (int i=0; i<ITERATIONS; i++) {
+ String segment = result.substring(i++ * len, i * len);
+ if (!segment.equals(message))
+ throw new RuntimeException("Test failed");
+ }
+ is.close();
+ fis.close();
+ }
+
+ private static void testNewChannelOut(File blah) throws Exception {
+ ExtendedFileOutputStream fos = new ExtendedFileOutputStream(blah);
+ WritableByteChannel wbc = Channels.newChannel(fos);
+
+ for (int i=0; i<ITERATIONS; i++)
+ wbc.write(ByteBuffer.wrap(message.getBytes(encoding)));
+ wbc.close();
+ fos.close();
+ }
+
+ private static void testNewChannelIn(File blah) throws Exception {
+ ExtendedFileInputStream fis = new ExtendedFileInputStream(blah);
+ ReadableByteChannel rbc = Channels.newChannel(fis);
+
+ int messageSize = message.length() * ITERATIONS * 3;
+ byte data[] = new byte[messageSize+1];
+ ByteBuffer bb = ByteBuffer.wrap(data);
+
+ int bytesRead = 0;
+ int totalRead = 0;
+ while (bytesRead != -1) {
+ totalRead += bytesRead;
+ bytesRead = rbc.read(bb);
+ }
+
+ String result = new String(data, 0, totalRead, encoding);
+ int len = message.length();
+ for (int i=0; i<ITERATIONS; i++) {
+ String segment = result.substring(i++ * len, i * len);
+ if (!segment.equals(message))
+ throw new RuntimeException("Test failed");
+ }
+ rbc.close();
+ fis.close();
+ }
+
+ private static void testNewChannelWriteAfterClose(File blah)
+ throws Exception {
+ try (ExtendedFileOutputStream fos =
+ new ExtendedFileOutputStream(blah)) {
+ WritableByteChannel wbc = Channels.newChannel(fos);
+
+ wbc.close();
+ try {
+ wbc.write(ByteBuffer.allocate(0));
+ throw new RuntimeException
+ ("No ClosedChannelException on WritableByteChannel::write");
+ } catch (ClosedChannelException expected) {
+ }
+ }
+ }
+
+ private static void testNewChannelReadAfterClose(File blah)
+ throws Exception {
+ try (ExtendedFileInputStream fis = new ExtendedFileInputStream(blah)) {
+ ReadableByteChannel rbc = Channels.newChannel(fis);
+
+ rbc.close();
+ try {
+ rbc.read(ByteBuffer.allocate(0));
+ throw new RuntimeException
+ ("No ClosedChannelException on ReadableByteChannel::read");
+ } catch (ClosedChannelException expected) {
+ }
+ }
+ }
+
+ // Causes BufferOverflowException if bug 4481572 is present.
+ private static void test4481572(File blah) throws Exception {
+ ExtendedFileInputStream fis = new ExtendedFileInputStream(blah);
+ ReadableByteChannel rbc = Channels.newChannel(fis);
+
+ byte data[] = new byte[9000];
+ ByteBuffer bb = ByteBuffer.wrap(data);
+
+ int bytesRead = 1;
+ int totalRead = 0;
+ while (bytesRead > 0) {
+ totalRead += bytesRead;
+ bytesRead = rbc.read(bb);
+ }
+ rbc.close();
+ fis.close();
+ }
+
+ private static void testNewWriter(File blah) throws Exception {
+ FileOutputStream fos = new FileOutputStream(blah);
+ WritableByteChannel wbc = (WritableByteChannel)fos.getChannel();
+ Writer w = Channels.newWriter(wbc, encoding);
+ char data[] = new char[40];
+ message.getChars(0, message.length(), data, 0);
+ for (int i=0; i<ITERATIONS; i++)
+ w.write(data, 0, message.length());
+ w.flush();
+ w.close();
+ fos.close();
+ }
+
+ private static void testNewReader(File blah) throws Exception {
+ FileInputStream fis = new FileInputStream(blah);
+ ReadableByteChannel rbc = (ReadableByteChannel)fis.getChannel();
+ Reader r = Channels.newReader(rbc, encoding);
+
+ int messageSize = message.length() * ITERATIONS;
+ char data[] = new char[messageSize];
+
+ int totalRead = 0;
+ int charsRead = 0;
+ while (totalRead < messageSize) {
+ totalRead += charsRead;
+ charsRead = r.read(data, totalRead, messageSize - totalRead);
+ }
+ String result = new String(data, 0, totalRead);
+ int len = message.length();
+ for (int i=0; i<ITERATIONS; i++) {
+ String segment = result.substring(i++ * len, i * len);
+ if (!segment.equals(message))
+ throw new RuntimeException("Test failed");
+ }
+ r.close();
+ fis.close();
+ }
+}
+
+class ExtendedFileInputStream extends java.io.FileInputStream {
+ ExtendedFileInputStream(File file) throws FileNotFoundException {
+ super(file);
+ }
+}
+
+class ExtendedFileOutputStream extends java.io.FileOutputStream {
+ ExtendedFileOutputStream(File file) throws FileNotFoundException {
+ super(file);
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/Basic2.java b/ojluni/src/test/java/nio/channels/Channels/Basic2.java
new file mode 100644
index 0000000..b3e2849
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/Basic2.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2008, 2010, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 4607272
+ * @summary Test Channels methods for interoperability between streams and
+ * asynchronous byte channels
+ * @key randomness
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Random;
+import org.testng.annotations.Test;
+
+public class Basic2 {
+
+ static final Random rand = new Random();
+
+ @Test
+ public void basic2Test() throws Exception {
+ // establish loopback connection
+ AsynchronousServerSocketChannel listener =
+ AsynchronousServerSocketChannel.open().bind(new InetSocketAddress(0));
+ int port = ((InetSocketAddress)(listener.getLocalAddress())).getPort();
+ InetSocketAddress isa =
+ new InetSocketAddress(InetAddress.getLocalHost(), port);
+ AsynchronousSocketChannel ch1 = AsynchronousSocketChannel.open();
+ ch1.connect(isa).get();
+ AsynchronousSocketChannel ch2 = listener.accept().get();
+
+ // start thread to write to stream
+ Writer writer = new Writer(Channels.newOutputStream(ch1));
+ Thread writerThread = new Thread(writer);
+ writerThread.start();
+
+ // start thread to read from stream
+ Reader reader = new Reader(Channels.newInputStream(ch2));
+ Thread readerThread = new Thread(reader);
+ readerThread.start();
+
+ // wait for threads to complete
+ writerThread.join();
+ readerThread.join();
+
+ // shutdown listener
+ listener.close();
+
+ // check that reader received what we expected
+ if (reader.total() != writer.total())
+ throw new RuntimeException("Unexpected number of bytes read");
+ if (reader.hash() != writer.hash())
+ throw new RuntimeException("Hash incorrect for bytes read");
+
+ // channels should be closed
+ if (ch1.isOpen() || ch2.isOpen())
+ throw new RuntimeException("Channels should be closed");
+ }
+
+ static class Reader implements Runnable {
+ private final InputStream in;
+ private volatile int total;
+ private volatile int hash;
+
+ Reader(InputStream in) {
+ this.in = in;
+ }
+
+ public void run() {
+ try {
+ int n;
+ do {
+ // random offset/len
+ byte[] buf = new byte[128 + rand.nextInt(128)];
+ int len, off;
+ if (rand.nextBoolean()) {
+ len = buf.length;
+ off = 0;
+ n = in.read(buf);
+ } else {
+ len = 1 + rand.nextInt(64);
+ off = rand.nextInt(64);
+ n = in.read(buf, off, len);
+ }
+ if (n > len)
+ throw new RuntimeException("Too many bytes read");
+ if (n > 0) {
+ total += n;
+ for (int i=0; i<n; i++) {
+ int value = buf[off + i];
+ hash = hash ^ value;
+ }
+ }
+ } while (n > 0);
+ in.close();
+
+ } catch (IOException x) {
+ x.printStackTrace();
+ }
+ }
+
+ int total() { return total; }
+ int hash() { return hash; }
+ }
+
+ static class Writer implements Runnable {
+ private final OutputStream out;
+ private final int total;
+ private volatile int hash;
+
+ Writer(OutputStream out) {
+ this.out = out;
+ this.total = 50*1000 + rand.nextInt(50*1000);
+ }
+
+ public void run() {
+ hash = 0;
+ int rem = total;
+ try {
+ do {
+ byte[] buf = new byte[1 + rand.nextInt(rem)];
+ int off, len;
+
+ // write random bytes
+ if (rand.nextBoolean()) {
+ off = 0;
+ len = buf.length;
+ } else {
+ off = rand.nextInt(buf.length);
+ int r = buf.length - off;
+ len = (r <= 1) ? 1 : (1 + rand.nextInt(r));
+ }
+ for (int i=0; i<len; i++) {
+ byte value = (byte)rand.nextInt(256);
+ buf[off + i] = value;
+ hash = hash ^ value;
+ }
+ if ((off == 0) && (len == buf.length)) {
+ out.write(buf);
+ } else {
+ out.write(buf, off, len);
+ }
+ rem -= len;
+ } while (rem > 0);
+
+ // close stream when done
+ out.close();
+
+ } catch (IOException x) {
+ x.printStackTrace();
+ }
+ }
+
+ int total() { return total; }
+ int hash() { return hash; }
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/EncodingTest.java b/ojluni/src/test/java/nio/channels/Channels/EncodingTest.java
new file mode 100644
index 0000000..e5224d3
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/EncodingTest.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.Charset;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.StandardCharsets;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * @test
+ * @bug 8183743
+ * @summary Test to verify the new overload method with Charset functions the same
+ * as the existing method that takes a charset name.
+ * @run testng EncodingTest
+ */
+public class EncodingTest {
+ static final int ITERATIONS = 2;
+ public static final String CS_UTF8 = StandardCharsets.UTF_8.name();
+ public static final String CS_ISO8859 = StandardCharsets.ISO_8859_1.name();
+ // Android-removed: Using temp file instead of user.dir
+ // static String USER_DIR = System.getProperty("user.dir", ".");
+
+ // malformed input: a high surrogate without the low surrogate
+ static char[] illChars = {
+ '\u00fa', '\ud800'
+ };
+
+ static byte[] data = getData();
+
+ // Android-added: Added constructor and temp file creation to avoid using user_dir.
+ File testFileHandle;
+ File testIllegalInputHandle;
+ File testIllegalOutputHandle;
+
+ public EncodingTest() throws IOException {
+ testFileHandle = File.createTempFile("channelsEncodingTest", "txt");
+ testIllegalInputHandle = File.createTempFile("channelsIllegalInputTest", "txt");
+ testIllegalOutputHandle = File.createTempFile("channelsIllegalOutputTest", "txt");
+ }
+
+ static byte[] getData() {
+ try {
+ String str1 = "A string that contains ";
+ String str2 = " , an invalid character for UTF-8.";
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ baos.write(str1.getBytes());
+ baos.write(0xFA);
+ baos.write(str2.getBytes());
+ return baos.toByteArray();
+ } catch (IOException ex) {
+ return null; //shouldn't happen
+ }
+ }
+
+ // Android-changed: Using temp file instead of user.dir
+ String testFile = testFileHandle.getAbsolutePath();
+ String testIllegalInput = testIllegalInputHandle.getAbsolutePath();
+ String testIllegalOutput = testIllegalOutputHandle.getAbsolutePath();
+
+
+ /*
+ * DataProvider for read and write test.
+ * Writes and reads with the same encoding
+ */
+ @DataProvider(name = "writeAndRead")
+ public Object[][] getWRParameters() {
+ return new Object[][]{
+ {testFile, StandardCharsets.ISO_8859_1.name(), null,
+ StandardCharsets.ISO_8859_1.name(), StandardCharsets.ISO_8859_1},
+ {testFile, null, StandardCharsets.ISO_8859_1,
+ StandardCharsets.ISO_8859_1.name(), StandardCharsets.ISO_8859_1},
+ {testFile, StandardCharsets.UTF_8.name(), null,
+ StandardCharsets.UTF_8.name(), StandardCharsets.UTF_8},
+ {testFile, null, StandardCharsets.UTF_8,
+ StandardCharsets.UTF_8.name(), StandardCharsets.UTF_8}
+ };
+ }
+
+ /*
+ * DataProvider for illegal input test
+ * Writes the data in ISO8859 and reads with UTF8, expects MalformedInputException
+ */
+ @DataProvider(name = "illegalInput")
+ public Object[][] getParameters() {
+ return new Object[][]{
+ {testIllegalInput, StandardCharsets.ISO_8859_1.name(), null, StandardCharsets.UTF_8.name(), null},
+ {testIllegalInput, StandardCharsets.ISO_8859_1.name(), null, null, StandardCharsets.UTF_8},
+ {testIllegalInput, null, StandardCharsets.ISO_8859_1, StandardCharsets.UTF_8.name(), null},
+ {testIllegalInput, null, StandardCharsets.ISO_8859_1, null, StandardCharsets.UTF_8},
+ };
+ }
+
+ /*
+ * DataProvider for illegal output test
+ * Attempts to write some malformed chars, expects MalformedInputException
+ */
+ @DataProvider(name = "illegalOutput")
+ public Object[][] getWriteParameters() {
+ return new Object[][]{
+ {testIllegalOutput, StandardCharsets.UTF_8.name(), null},
+ {testIllegalOutput, null, StandardCharsets.UTF_8}
+ };
+ }
+
+ /**
+ * Verifies that the Readers created with the following methods are
+ * equivalent:
+ * newReader(ReadableByteChannel ch, String csName)
+ * newReader(ReadableByteChannel ch, Charset charset)
+ *
+ * The verification follows the following steps:
+ * Writes a file with a writer created with the specified charset
+ * Reads it with a reader created with newReader using the same charset;
+ * Compares that the results are the same.
+ *
+ * @param file the file name
+ * @param csnWriter the charset name for creating the writer
+ * @param charsetWriter the charset for creating the writer
+ * @param csnReader the charset name for creating the reader
+ * @param charsetReader the charset for creating the reader
+ * @throws Exception
+ */
+ @Test(dataProvider = "writeAndRead")
+ public void testWriteAndRead(String file, String csnWriter, Charset charsetWriter,
+ String csnReader, Charset charsetReader) throws Exception {
+ writeToFile(data, file, csnWriter, charsetWriter);
+ // read using charset name
+ String result1 = readFileToString(file, csnReader, null);
+ String result2 = readFileToString(file, null, charsetReader);
+
+ Assert.assertEquals(result1, result2);
+ }
+
+ /**
+ * Verifies that MalformedInputException is thrown when an input byte sequence
+ * is illegal for given charset that is configured for the reader.
+ *
+ * @param file the file to be read
+ * @param csnWriter the charset name for creating the writer
+ * @param charsetWriter the charset for creating the writer
+ * @param csnReader the charset name for creating the reader
+ * @param charsetReader the charset for creating the reader
+ * @throws Exception
+ */
+ @Test(dataProvider = "illegalInput", expectedExceptions = MalformedInputException.class)
+ void testMalformedInput(String file, String csnWriter, Charset charsetWriter,
+ String csnReader, Charset charsetReader) throws Exception {
+ writeToFile(data, file, csnWriter, charsetWriter);
+ readFileToString(file, csnReader, charsetReader);
+ }
+
+ /**
+ * Attempts to write illegal characters using a writer created by calling
+ * the newWriter method and expects a MalformedInputException.
+ *
+ * @param fileName the file name
+ * @param csn the charset name
+ * @param charset the charset
+ * @throws Exception
+ */
+ @Test(dataProvider = "illegalOutput", expectedExceptions = MalformedInputException.class)
+ public void testMalformedOutput(String fileName, String csn, Charset charset)
+ throws Exception {
+ try (FileOutputStream fos = new FileOutputStream(fileName);
+ WritableByteChannel wbc = (WritableByteChannel) fos.getChannel();) {
+ Writer writer;
+ if (csn != null) {
+ writer = Channels.newWriter(wbc, csn);
+ } else {
+ writer = Channels.newWriter(wbc, charset);
+ }
+
+ for (int i = 0; i < ITERATIONS; i++) {
+ writer.write(illChars);
+ }
+ writer.flush();
+ writer.close();
+ }
+ }
+
+ /**
+ * Writes the data to a file using a writer created by calling the newWriter
+ * method.
+ *
+ * @param data the data to be written
+ * @param fileName the file name
+ * @param csn the charset name
+ * @param charset the charset
+ * @throws Exception
+ */
+ private void writeToFile(byte[] data, String fileName, String csn, Charset charset) throws Exception {
+ try (FileOutputStream fos = new FileOutputStream(fileName);
+ WritableByteChannel wbc = (WritableByteChannel) fos.getChannel()) {
+ Writer writer;
+ String temp;
+ if (csn != null) {
+ writer = Channels.newWriter(wbc, csn);
+ temp = new String(data, csn);
+ } else {
+ writer = Channels.newWriter(wbc, charset);
+ temp = new String(data, charset);
+ }
+
+ for (int i = 0; i < ITERATIONS; i++) {
+ writer.write(temp);
+ }
+ writer.flush();
+ writer.close();
+ }
+ }
+
+ /**
+ * Reads a file into a String.
+ *
+ * @param file the file to be read
+ * @param csn the charset name
+ * @param charset the charset
+ * @throws Exception
+ */
+ String readFileToString(String file, String csn, Charset charset) throws Exception {
+ String result;
+ try (FileInputStream fis = new FileInputStream(file);
+ ReadableByteChannel rbc = (ReadableByteChannel) fis.getChannel()) {
+ Reader reader;
+ if (csn != null) {
+ reader = Channels.newReader(rbc, csn);
+ } else {
+ reader = Channels.newReader(rbc, charset);
+ }
+
+ int messageSize = data.length * ITERATIONS;
+ char data1[] = new char[messageSize];
+ int totalRead = 0;
+ int charsRead = 0;
+ while (totalRead < messageSize) {
+ totalRead += charsRead;
+ charsRead = reader.read(data1, totalRead, messageSize - totalRead);
+ }
+
+ result = new String(data1, 0, totalRead);
+ reader.close();
+ }
+
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/ReadByte.java b/ojluni/src/test/java/nio/channels/Channels/ReadByte.java
new file mode 100644
index 0000000..9f56154
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/ReadByte.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2002, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 4773447
+ * @summary Test Channels.newInputStream.read() method
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.Channels;
+import java.io.InputStream;
+import java.io.IOException;
+import org.testng.annotations.Test;
+
+public class ReadByte {
+
+ @Test
+ public void main() throws IOException {
+ ReadableByteChannel channel = new ReadableByteChannel() {
+ public int read(ByteBuffer dst) {
+ dst.put((byte) 129);
+ return 1;
+ }
+
+ public boolean isOpen() {
+ return true;
+ }
+
+ public void close() {
+ }
+ };
+
+ InputStream in = Channels.newInputStream(channel);
+ int data = in.read();
+ if (data < 0)
+ throw new RuntimeException(
+ "InputStream.read() spec'd to return 0-255");
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/ReadOffset.java b/ojluni/src/test/java/nio/channels/Channels/ReadOffset.java
new file mode 100644
index 0000000..a76f7fb
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/ReadOffset.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2007, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 6545054
+ * @summary Channels.newInputStream.read throws IAE when invoked with
+ * different offsets.
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.Channels;
+import java.io.InputStream;
+import java.io.IOException;
+import org.testng.annotations.Test;
+
+public class ReadOffset {
+
+ @Test
+ public void testReadOffset() throws IOException {
+ ReadableByteChannel rbc = new ReadableByteChannel() {
+ public int read(ByteBuffer dst) {
+ dst.put((byte)0);
+ return 1;
+ }
+ public boolean isOpen() {
+ return true;
+ }
+ public void close() {
+ }
+ };
+
+ InputStream in = Channels.newInputStream(rbc);
+
+ byte[] b = new byte[3];
+ in.read(b, 0, 1);
+ in.read(b, 2, 1); // throws IAE
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/ShortWrite.java b/ojluni/src/test/java/nio/channels/Channels/ShortWrite.java
new file mode 100644
index 0000000..809500c
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/ShortWrite.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2008, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 6448457
+ * @summary Test Channels.newOutputStream returns OutputStream that handles
+ * short writes from the underlying channel
+ * @key randomness
+ */
+
+import java.io.OutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.*;
+import java.util.Random;
+import org.testng.annotations.Test;
+
+public class ShortWrite {
+
+ static Random rand = new Random();
+ static int bytesWritten = 0;
+
+ @Test
+ public void testShortWrite() throws IOException {
+
+ WritableByteChannel wbc = new WritableByteChannel() {
+ public int write(ByteBuffer src) {
+ int rem = src.remaining();
+ if (rem > 0) {
+ // short write
+ int n = rand.nextInt(rem) + 1;
+ src.position(src.position() + n);
+ bytesWritten += n;
+ return n;
+ } else {
+ return 0;
+ }
+ }
+ public void close() throws IOException {
+ throw new RuntimeException("not implemented");
+ }
+ public boolean isOpen() {
+ throw new RuntimeException("not implemented");
+ }
+ };
+
+ // wrap Channel with OutputStream
+ OutputStream out = Channels.newOutputStream(wbc);
+
+
+ // write 100, 99, 98, ... 1
+ // and check that the expected number of bytes is written
+ int expected = 0;
+ byte[] buf = new byte[100];
+ for (int i=0; i<buf.length; i++) {
+ int len = buf.length-i;
+ out.write(buf, i, len);
+ expected += len;
+ }
+ System.out.format("Bytes written: %d, expected: %d\n", bytesWritten,
+ expected);
+ if (bytesWritten != expected)
+ throw new RuntimeException("incorrect number of bytes written");
+
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/TinyBuffers.java b/ojluni/src/test/java/nio/channels/Channels/TinyBuffers.java
new file mode 100644
index 0000000..9320ac5
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/TinyBuffers.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2004, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 4654722
+ * @summary Ensure that ridiculously tiny buffers work with
+ * Channels.newReader
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import java.nio.charset.*;
+import org.testng.annotations.Test;
+
+
+public class TinyBuffers {
+
+ private static Charset cs = Charset.forName("UTF-16");
+
+ private static void test(int sz) throws Exception {
+ ByteArrayInputStream bis = new ByteArrayInputStream(new byte[100]);
+ ReadableByteChannel ch = Channels.newChannel(bis);
+ Reader r = Channels.newReader(ch, cs.newDecoder(), sz);
+ char [] arr = new char[100];
+ System.out.println(r.read(arr, 0, arr.length));
+ }
+
+ @Test
+ public void testTinyBuffers() throws Exception {
+ for (int i = -2; i < 10; i++)
+ test(i);
+ }
+
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Channels/Write.java b/ojluni/src/test/java/nio/channels/Channels/Write.java
new file mode 100644
index 0000000..c2bba58
--- /dev/null
+++ b/ojluni/src/test/java/nio/channels/Channels/Write.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2002, 2010, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.java.nio.channels.Channels;
+
+/* @test
+ * @bug 4712766
+ * @summary Test Channels.newOutputStream.write
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.nio.channels.*;
+import org.testng.annotations.Test;
+
+public class Write {
+
+ @Test
+ public void testWrite() throws Exception {
+ byte[] bb = new byte[3];
+ File testFile = File.createTempFile("test1", null);
+ testFile.deleteOnExit();
+
+ FileOutputStream fos = new FileOutputStream(testFile);
+ FileChannel fc = fos.getChannel();
+ OutputStream out = Channels.newOutputStream(fc);
+
+ out.write(bb,0,1);
+ out.write(bb,2,1);
+
+ out.close();
+ fc.close();
+ fos.close();
+ testFile.delete();
+ }
+}
\ No newline at end of file
diff --git a/ojluni/src/test/java/nio/channels/Selector/SelectWithConsumer.java b/ojluni/src/test/java/nio/channels/Selector/SelectWithConsumer.java
index ac2f001..0c96996 100644
--- a/ojluni/src/test/java/nio/channels/Selector/SelectWithConsumer.java
+++ b/ojluni/src/test/java/nio/channels/Selector/SelectWithConsumer.java
@@ -572,6 +572,7 @@
assertTrue(n == 1);
assertFalse(sel.keys().contains(key1));
assertTrue(sel.keys().contains(key2));
+ sel.selectNow();
assertFalse(sel.selectedKeys().contains(key1));
assertTrue(sel.selectedKeys().contains(key2));
diff --git a/tools/expected_upstream/README.md b/tools/expected_upstream/README.md
index e69bd02..a660fe9 100644
--- a/tools/expected_upstream/README.md
+++ b/tools/expected_upstream/README.md
@@ -1,44 +1,117 @@
-This folder contains tools to update the files in the aosp/expected_upstream
-branch.
+If you want to import files from the OpenJDK into `libcore/`, you are reading
+the right documentation.
-# Prerequisite
+The general idea is to get a change from OpenJDK into libcore in AOSP by
+`git merge` from an OpenJDK branch. However, each file in `ojluni/` can come
+from a different OpenJDK version. `expected_upstream` is a staging branch
+storing the OpenJDK version of each file. Thus, we can use `git merge` when
+we update an `ojluni/` file from a new upstream version, and the command should
+automatically merge the file if no merge conflict.
+
+# Directory Layout
+in the `aosp/expected_upstream` branch.
+1. `ojluni/`
+ * It has the same layout as the ojluni/ files in `aosp/master`
+2. `EXPECTED_UPSTREAM` file
+ * The table has 3 columns, i.e.
+ 1. Destination path in `ojluni/`
+ 2. Expected upstream version / an upstream git tag
+ 3. Upstream source path
+ * The file format is like .csv file using a `,` separator
+3. `tools/expected_upstream/`
+ * Contains the tools
+
+# Understanding your change
+## Changes that shouldn't happen in the `aosp/expected_upstream` branch
+In general, if you want to change an `ojluni/` file by a text editor / IDE
+manually, you should make the change on `aosp/master`.
+
+1. Changes to non-OpenJDK files
+ * Those files are usually under the `luni/` folder, you can make the change
+ directly on `aosp/master`
+2. Adding / updating a patch to an existing `ojluni/` file
+ * You can make the change directly on `aosp/master`. Please follow this
+ [patch style guideline](https://goto.google.com/libcore-openjdk8-verify).
+3. Cherry-picking a commit from upstream
+ * You should first try to update an `ojluni/` file to a particular upstream
+ version. If you can't but still want to cherry-pick a upstream fix, you
+ should do so on the `aosp/master` branch.
+4. Changes to non-OpenJDK files in `ojluni/`
+ * Files, e.g. Android.bp, don't come from the upstream. You can make the
+ change directly on `aosp/master`.
+
+## Changes that should be made via the `aosp/expected_upstream` branch
+
+1. Add or upgrade a file from the upstream OpenJDK
+ * You are reading the right document! This documentation tells you how to
+ import the file from the upstream. Later, you can merge the file and
+ `expected_upstream` into `aosp/master` branch.
+2. Remove an `ojluni/` file that originally came from the OpenJDK
+ * Please remove the file on both `aosp/master` and `aosp/expected_upstream`
+ branches. Don't forget to remove the entry in the `EXPECTED_UPSTREAM` too.
+3. Revert the merge commit on `aosp/master` from `expected_upstream`
+ * If you don't plan to re-land your change on `aosp/master`, you should
+ probably revert the change `aosp/expected_upstream` as well.
+ * If you plan to re-land your change, your re-landing commit won't be
+ a merge commit, because `git` doesn't allow you to merge the same commit
+ twice into the same branch. You have 2 options
+ 1. Revert your change on `expected_upsteam` too and start over again
+ when you reland your change
+ 2. Just accept that the re-landing commit won't be a merge commit.
+
+## Life of a typical change
+
+Commit graph of a typical change
+```text
+----11.0.13-ga---------------- openjdk/jdk11u
+ \
+ A
+ \
+------------B-----C------------ expected_upstream
+ \
+--------------------D---E------ master
+```
+
+Typically, you will need 5 CLs
+* Commit `A` imports the file and moves the file in the `ojluni/` folder
+* Commit `B` merges the file into the expected_upstream with other `ojluni`
+ files
+ * Commit `A` and `B` are created by the `ojluni_refresh_files` script
+* Commit `C` edits the entry in the `EXPECTED_UPSTREAM` file
+* Commit `D` is a merge commit created by `git merge`
+* Commit `E` adds Android patches
+ * Includes other changes to non-OpenJDK files, e.g. `Android.bp`,
+ `api/current.txt`.
+
+### Why can't have a single commit to replace the commits `A`, `B` and `C`?
+* Preserve the upstream history. We can later `git blame` with the upstream
+ history.
+
+# Tools
+
+## Prerequisite
* python3
* pip3
* A remote `aosp` is setup in your local git repository
-# Directory Layout
-1. ojluni/
- * It has the same layout as the ojluni/ files in aosp/master
- * A file should only exist if aosp/master has the such file path, and the
- file content comes from the OpenJDK upstream.
-2. EXPECTED_UPSTREAM file
- * The file format is like .csv file using a `,` separator
- * The table has 3 columns, i.e.
- 1. Destination path in ojluni/
- 2. Expected upstream version. Normally, it's a git tag in the upstream
- git repositories.
- 3. File path in the git tree specified in the 2nd column.
-3. tools/expected_upstream/
- * Contains the tools
-
-# Tools
-## tools/expected_upstream/install_tools.sh
+## List of the scripts
+### tools/expected_upstream/install_tools.sh
* Installs the dependency libraries
* Installs the other tools into your current shell process
-## ojluni_modify_expectation
+### ojluni_modify_expectation
* Command line tool that can help modify the EXPECTED_UPSTREAM file
-## ojluni_refresh_files
+### ojluni_refresh_files
* Reads the EXPECTED_UPSTREAM file and updates the files contents in ojluni/
accordingly
-# Workflow in command lines
-## Setup
+## Workflow in command lines
+### Setup
1. Switch to the expected_upstream branch
```shell
-git branch local_expected_upstream aosp/expected_upstream
-git checkout local_expected_upstream
+git branch <local_branch> aosp/expected_upstream
+git checkout <local_branch>
```
2. Install tools
@@ -46,16 +119,16 @@
source ./tools/expected_upstream/install_tools.sh
```
## Upgrade a java class to a higher OpenJDK version
-For example, upgrade `java.lang.String` to 11+28 version:
+For example, upgrade `java.lang.String` to 11.0.13-ga version:
```shell
-ojluni_modify_expectation modify java.lang.String jdk11u/jdk-11+28
+ojluni_modify_expectation modify java.lang.String jdk11u/jdk-11.0.13-ga
ojluni_refresh_files
```
or if `java.lang.String` is missing in EXPECTED_UPSTREAM:
```shell
-ojluni_modify_expectation add jdk11u/jdk-11+28 java.lang.String
+ojluni_modify_expectation add jdk11u/jdk-11.0.13-ga java.lang.String
ojluni_refresh_files
```
2 commits should be created to update the `ojluni/src/main/java/java/lang/String.java`.
@@ -77,7 +150,7 @@
Then upload your change to AOSP gerrit.
```shell
-repo upload --cbr -t . # -t sets a topic to the CLs in the gerrit
+repo upload --cbr .
```
Then you can switch back to your local `master` branch to apply the changes
@@ -89,7 +162,7 @@
repo upload .
```
-## Add a java test from the upstream
+### Add a java test from the upstream
The process is similar to the above commands, but needs to run
`ojluni_modify_expectation` with an `add` subcommand.
@@ -98,15 +171,41 @@
```shell
ojluni_modify_expectation add jdk8u/jdk8u121-b13 java.lang.String.IsEmpty
```
-Note: java.lang.String.IsEmpty is a test class in the upstream repository.
+Note: `java.lang.String.IsEmpty` is a test class in the upstream repository.
+# Submit your change in [AOSP gerrit](http://r.android.com/)
+```text
+----11.0.13-ga---------------- openjdk/jdk11u
+ \
+ A
+ \
+------------B-----C------------ expected_upstream
+ \
+--------------------D---E------ master
+```
+Here are the order of events / votes required to submit your CL on gerrit as of
+Nov 2021.
+1. `Presubmit-Verified +2` on all 5 CLs
+ * Due to [b/204973624](http://b/204973624), you may `Bypass-Presubmit +1`
+ on commit `A` and `B` if the presubmit fails.
+2. `Code-review +2` on all 5 CLs from an Android Core Library team member
+3. If needed, `API-review +1` on commit `E` from an Android API council member
+4. Click the submit button / `Autosubmit +1` on commit `B`, `C` and `E`
+ * Never submit commit `A` individually without submitting `B` together.
+ * Otherwise, gerrit will create another merge commit from `A` without
+ submitting `B`.
+ * Due a Gerrit bug, you can't submit the commit `C` before submitting `B`
+ first manually, even though `B` is the direct parent of `C`. So just
+ submit `B` yourself manually.
+ * If you can't submit the CL due a permission issue, ask an Android Core
+ Library member to submit.
# Known bugs
* `repo upload` may not succeed because gerrit returns error.
1. Just try to run `repo upload` again!
* The initial upload takes a long time because it tries to sync with the
- remote AOSP gerrit server. The second upload is much faster and thus
- it may succeed.
+ remote AOSP gerrit server. The second upload is much faster because
+ the `git` objects have been uploaded.
2. `repo upload` returns TimeOutException, but the CL has been uploaded.
Just find your CL in http://r.android.com/. See http://b/202848945
3. Try to upload the merge commits 1 by 1
diff --git a/tools/expected_upstream/common_util.py b/tools/expected_upstream/common_util.py
index 49d39c6..4d431b9 100644
--- a/tools/expected_upstream/common_util.py
+++ b/tools/expected_upstream/common_util.py
@@ -14,15 +14,18 @@
"""Common Utils."""
-
# pylint: disable=g-importing-member
from dataclasses import dataclass
from pathlib import Path
+from pathlib import PurePath
import sys
from typing import List
+from typing import Set
# pylint: disable=g-import-not-at-top
try:
+ from git import Blob
+ from git import Commit
from git import Tree
except ModuleNotFoundError:
print(
@@ -33,6 +36,27 @@
THIS_DIR = Path(__file__).resolve().parent
LIBCORE_DIR = THIS_DIR.parent.parent.resolve()
+UPSTREAM_CLASS_PATHS = [
+ 'jdk/src/share/classes/',
+ 'src/java.base/share/classes/',
+ 'src/java.base/linux/classes/',
+ 'src/java.base/unix/classes/',
+ 'src/java.sql/share/classes/',
+ 'src/java.logging/share/classes/',
+ 'src/java.prefs/share/classes/',
+ 'src/java.net/share/classes/',
+]
+
+UPSTREAM_TEST_PATHS = [
+ 'jdk/test/',
+ 'test/jdk/',
+]
+
+UPSTREAM_SEARCH_PATHS = UPSTREAM_CLASS_PATHS + UPSTREAM_TEST_PATHS
+
+OJLUNI_JAVA_BASE_PATH = 'ojluni/src/main/java/'
+OJLUNI_TEST_PATH = 'ojluni/src/'
+
@dataclass
class ExpectedUpstreamEntry:
@@ -75,8 +99,7 @@
file.write(','.join([e.dst_path, e.git_ref, e.src_path]))
file.write('\n')
- def write_new_entry(self,
- entry: ExpectedUpstreamEntry,
+ def write_new_entry(self, entry: ExpectedUpstreamEntry,
entries: List[ExpectedUpstreamEntry] = None) -> None:
if entries is None:
entries = self.read_all_entries()
@@ -104,6 +127,233 @@
return ExpectedUpstreamEntry(items[0], items[1], items[2], comment_lines)
+class OjluniFinder:
+ """Finder for java classes or ojluni/ paths."""
+
+ def __init__(self, existing_paths: List[str]):
+ self.existing_paths = existing_paths
+
+ @staticmethod
+ def translate_from_class_name_to_ojluni_path(class_or_path: str) -> str:
+ """Returns a ojluni path from a class name."""
+ # if it contains '/', then it's a path
+ if '/' in class_or_path:
+ return class_or_path
+
+ base_path = OJLUNI_TEST_PATH if class_or_path.startswith(
+ 'test.') else OJLUNI_JAVA_BASE_PATH
+
+ relative_path = class_or_path.replace('.', '/')
+ return f'{base_path}{relative_path}.java'
+
+ def match_path_prefix(self, input_path: str) -> Set[str]:
+ """Returns a set of existing file paths matching the given partial path."""
+ path_matches = list(
+ filter(lambda path: path.startswith(input_path), self.existing_paths))
+ result_set: Set[str] = set()
+ # if it's found, just return the result
+ if input_path in path_matches:
+ result_set.add(input_path)
+ else:
+ input_ojluni_path = PurePath(input_path)
+ # the input ends with '/', the autocompletion result contain the children
+ # instead of the matching the prefix in its parent directory
+ input_path_parent_or_self = input_ojluni_path
+ if not input_path.endswith('/'):
+ input_path_parent_or_self = input_path_parent_or_self.parent
+ n_parts = len(input_path_parent_or_self.parts)
+ for match in path_matches:
+ path = PurePath(match)
+ # path.parts[n_parts] should not exceed the index and should be
+ # a valid child path because input_path_parent_or_self must be a
+ # valid directory
+ child = list(path.parts)[n_parts]
+ result = (input_path_parent_or_self / child).as_posix()
+ # if result is not exact, the result represents a directory.
+ if result != match:
+ result += '/'
+ result_set.add(result)
+
+ return result_set
+
+ def match_classname_prefix(self, input_class_name: str) -> List[str]:
+ """Returns a list of package / class names given the partial class name."""
+ # If '/' exists, it's probably a path, not a partial class name
+ if '/' in input_class_name:
+ return []
+
+ result_list = []
+ partial_relative_path = input_class_name.replace('.', '/')
+ for base_path in [OJLUNI_JAVA_BASE_PATH, OJLUNI_TEST_PATH]:
+ partial_ojluni_path = base_path + partial_relative_path
+ result_paths = self.match_path_prefix(partial_ojluni_path)
+ # pylint: disable=cell-var-from-loop
+ result_list.extend(
+ map(lambda path: convert_path_to_java_class_name(path, base_path),
+ list(result_paths)))
+
+ return result_list
+
+
+class OpenjdkFinder:
+ """Finder for java classes or paths in a upstream OpenJDK commit."""
+
+ def __init__(self, commit: Commit):
+ self.commit = commit
+
+ @staticmethod
+ def translate_src_path_to_ojluni_path(src_path: str) -> str:
+ """Returns None if src_path isn't in a known source directory."""
+ relative_path = None
+ for base_path in UPSTREAM_TEST_PATHS:
+ if src_path.startswith(base_path):
+ length = len(base_path)
+ relative_path = src_path[length:]
+ break
+
+ if relative_path:
+ return f'{OJLUNI_TEST_PATH}test/{relative_path}'
+
+ for base_path in UPSTREAM_CLASS_PATHS:
+ if src_path.startswith(base_path):
+ length = len(base_path)
+ relative_path = src_path[length:]
+ break
+
+ if relative_path:
+ return f'{OJLUNI_JAVA_BASE_PATH}{relative_path}'
+
+ return None
+
+ def find_src_path_from_classname(self, class_or_path: str) -> str:
+ """Finds a valid source path given a valid class name or path."""
+ # if it contains '/', then it's a path
+ if '/' in class_or_path:
+ if self.has_file(class_or_path):
+ return class_or_path
+ else:
+ return None
+
+ relative_path = class_or_path.replace('.', '/')
+ src_path = None
+ for base_path in UPSTREAM_SEARCH_PATHS:
+ full_path = f'{base_path}{relative_path}.java'
+ if self.has_file(full_path):
+ src_path = full_path
+ break
+
+ return src_path
+
+ def get_search_paths(self) -> List[str]:
+ return UPSTREAM_SEARCH_PATHS
+
+ def find_src_path_from_ojluni_path(self, ojluni_path: str) -> str:
+ """Returns a source path that guessed from the ojluni_path."""
+ base_paths = None
+ relative_path = None
+
+ TEST_PATH = OJLUNI_TEST_PATH + 'test/'
+ if ojluni_path.startswith(OJLUNI_JAVA_BASE_PATH):
+ base_paths = UPSTREAM_CLASS_PATHS
+ length = len(OJLUNI_JAVA_BASE_PATH)
+ relative_path = ojluni_path[length:]
+ elif ojluni_path.startswith(TEST_PATH):
+ base_paths = UPSTREAM_TEST_PATHS
+ length = len(TEST_PATH)
+ relative_path = ojluni_path[length:]
+ else:
+ return None
+
+ for base_path in base_paths:
+ full_path = base_path + relative_path
+ if self.has_file(full_path):
+ return full_path
+
+ return None
+
+ def match_path_prefix(self, input_path: str) -> List[str]:
+ """Returns a list of source paths matching the given partial string."""
+ result_list = []
+
+ search_tree = self.commit.tree
+ path_obj = PurePath(input_path)
+ is_exact = self.has_file(path_obj.as_posix())
+ is_directory_path = input_path.endswith('/')
+ exact_obj = search_tree[path_obj.as_posix()] if is_exact else None
+ search_word = ''
+ if is_exact and isinstance(exact_obj, Blob):
+ # an exact file path
+ result_list.append(input_path)
+ return result_list
+ elif is_directory_path:
+ # an exact directory path and can't be a prefix directory name.
+ if is_exact:
+ search_tree = exact_obj
+ else:
+ # Such path doesn't exist, and thus returns empty list
+ return result_list
+ elif len(path_obj.parts) >= 2 and not is_directory_path:
+ parent_path = path_obj.parent.as_posix()
+ if self.has_file(parent_path):
+ search_tree = search_tree[parent_path]
+ search_word = path_obj.name
+ else:
+ # Return empty list because no such path is found
+ return result_list
+ else:
+ search_word = input_path
+
+ for tree in search_tree.trees:
+ tree_path = PurePath(tree.path)
+ if tree_path.name.startswith(search_word):
+ # Append '/' to indicate directory type. If the result has this item
+ # only, shell should auto-fill the input, and thus
+ # next tabbing in shell should fall into the above condition
+ # `is_exact and input_path.endswith('/')` and will search in the child
+ # tree.
+ result_path = tree.path + '/'
+ result_list.append(result_path)
+
+ for blob in search_tree.blobs:
+ blob_path = PurePath(blob.path)
+ if blob_path.name.startswith(search_word):
+ result_list.append(blob.path)
+
+ return result_list
+
+ def match_classname_prefix(self, input_class_name: str) -> List[str]:
+ """Return a list of package / class names from given commit and input."""
+ # If '/' exists, it's probably a path, not a class name.
+ if '/' in input_class_name:
+ return []
+
+ result_list = []
+ for base_path in UPSTREAM_SEARCH_PATHS:
+ base_len = len(base_path)
+ path = base_path + input_class_name.replace('.', '/')
+ path_results = self.match_path_prefix(path)
+ for p in path_results:
+ relative_path = p[base_len:]
+ if relative_path.endswith('.java'):
+ relative_path = relative_path[0:-5]
+ result_list.append(relative_path.replace('/', '.'))
+
+ return result_list
+
+ def has_file(self, path: str) -> bool:
+ """Returns True if the directory / file exists in the tree."""
+ return has_file_in_tree(path, self.commit.tree)
+
+
+def convert_path_to_java_class_name(path: str, base_path: str) -> str:
+ base_len = len(base_path)
+ result = path[base_len:]
+ if result.endswith('.java'):
+ result = result[0:-5]
+ result = result.replace('/', '.')
+ return result
+
+
def has_file_in_tree(path: str, tree: Tree) -> bool:
"""Returns True if the directory / file exists in the tree."""
try:
diff --git a/tools/expected_upstream/install_tools.sh b/tools/expected_upstream/install_tools.sh
index 7d877c7..1781aff 100755
--- a/tools/expected_upstream/install_tools.sh
+++ b/tools/expected_upstream/install_tools.sh
@@ -11,6 +11,8 @@
THIS_DIR=$(realpath $(dirname $BASH_SOURCE))
alias ojluni_refresh_files=${THIS_DIR}/ojluni_refresh_files.py
alias ojluni_modify_expectation=${THIS_DIR}/ojluni_modify_expectation.py
+alias ojluni_run_tool_tests='PYTHONPATH=${PYTHONPATH}:${THIS_DIR} python3 -B -m unittest discover -v -s tests -p "*_test.py"'
+alias ojluni_upgrade_identicals=${THIS_DIR}/ojluni_upgrade_identicals.py
_ojluni_modify_expectation ()
diff --git a/tools/expected_upstream/ojluni_modify_expectation.py b/tools/expected_upstream/ojluni_modify_expectation.py
index 3749f710..705ef49 100755
--- a/tools/expected_upstream/ojluni_modify_expectation.py
+++ b/tools/expected_upstream/ojluni_modify_expectation.py
@@ -16,12 +16,11 @@
"""ojluni_modify_expectation is a command-line tool for modifying the EXPECTED_UPSTREAM file."""
import argparse
-# pylint: disable=g-importing-member
-from pathlib import PurePath
import sys
+
+# pylint: disable=g-importing-member
# pylint: disable=g-multiple-import
from typing import (
- Set,
Sequence,
List,
)
@@ -30,31 +29,17 @@
ExpectedUpstreamEntry,
ExpectedUpstreamFile,
LIBCORE_DIR,
- has_file_in_tree,
+ OpenjdkFinder,
+ OjluniFinder,
)
# Import git only after common_util because common_util will
# produce informative error
-from git import (Blob, Commit, Repo)
+from git import (Commit, Repo)
from gitdb.exc import BadName
LIBCORE_REPO = Repo(LIBCORE_DIR.as_posix())
-UPSTREAM_JAVA_BASE_PATHS = [
- 'jdk/src/share/classes/',
- 'src/java.base/share/classes/',
-]
-
-UPSTREAM_TEST_PATHS = [
- 'jdk/test/',
- 'test/jdk/',
-]
-
-UPSTREAM_SEARCH_PATHS = UPSTREAM_JAVA_BASE_PATHS + UPSTREAM_TEST_PATHS
-
-OJLUNI_JAVA_BASE_PATH = 'ojluni/src/main/java/'
-OJLUNI_TEST_PATH = 'ojluni/src/'
-
AUTOCOMPLETE_TAGS = [
'jdk7u/jdk7u40-b60',
'jdk8u/jdk8u121-b13',
@@ -77,149 +62,6 @@
error_and_exit(f'{e}')
-def translate_from_class_name_to_ojluni_path(class_or_path: str) -> str:
- # if it contains '/', then it's a path
- if '/' in class_or_path:
- return class_or_path
-
- base_path = OJLUNI_TEST_PATH if class_or_path.startswith(
- 'test.') else OJLUNI_JAVA_BASE_PATH
-
- relative_path = class_or_path.replace('.', '/')
- return f'{base_path}{relative_path}.java'
-
-
-def translate_src_path_to_ojluni_path(src_path: str) -> str:
- """Returns None if the path can be translated into a ojluni/ path."""
- relative_path = None
- for base_path in UPSTREAM_TEST_PATHS:
- if src_path.startswith(base_path):
- length = len(base_path)
- relative_path = src_path[length:]
- break
-
- if relative_path:
- return f'{OJLUNI_TEST_PATH}test/{relative_path}'
-
- for base_path in UPSTREAM_JAVA_BASE_PATHS:
- if src_path.startswith(base_path):
- length = len(base_path)
- relative_path = src_path[length:]
- break
-
- if relative_path:
- return f'{OJLUNI_JAVA_BASE_PATH}{relative_path}'
-
- return None
-
-
-def find_src_path_from_class(commit: Commit, class_or_path: str) -> str:
- """Finds a valid source path given a valid class name or path."""
- # if it contains '/', then it's a path
- if '/' in class_or_path:
- if has_file_in_tree(class_or_path, commit.tree):
- return class_or_path
- else:
- return None
-
- relative_path = class_or_path.replace('.', '/')
- src_path = None
- full_paths = []
- for base_path in UPSTREAM_SEARCH_PATHS:
- full_path = f'{base_path}{relative_path}.java'
- full_paths.append(full_path)
- if has_file_in_tree(full_path, commit.tree):
- src_path = full_path
- break
-
- return src_path
-
-
-def find_src_path_from_ojluni_path(commit: Commit, ojluni_path: str) -> str:
- """Returns a source path that guessed from the ojluni_path."""
- base_paths = None
- relative_path = None
- if ojluni_path.startswith(OJLUNI_JAVA_BASE_PATH):
- base_paths = UPSTREAM_JAVA_BASE_PATHS
- length = len(OJLUNI_JAVA_BASE_PATH)
- relative_path = ojluni_path[length:]
- elif ojluni_path.startswith(OJLUNI_TEST_PATH):
- base_paths = UPSTREAM_TEST_PATHS
- length = len(OJLUNI_TEST_PATH)
- relative_path = ojluni_path[length:]
- else:
- return None
-
- for base_path in base_paths:
- full_path = base_path + relative_path
- if has_file_in_tree(full_path, commit.tree):
- return full_path
-
- return None
-
-
-def autocomplete_existing_ojluni_path(input_path: str,
- existing_paths: List[str]) -> Set[str]:
- """Returns a set of existing file paths matching the given partial path."""
- path_matches = list(
- filter(lambda path: path.startswith(input_path), existing_paths))
- result_set: Set[str] = set()
- # if it's found, just return the result
- if input_path in path_matches:
- result_set.add(input_path)
- else:
- input_ojluni_path = PurePath(input_path)
- # the input ends with '/', the autocompletion result contain the children
- # instead of the matching the prefix in its parent directory
- input_path_parent_or_self = input_ojluni_path
- if not input_path.endswith('/'):
- input_path_parent_or_self = input_path_parent_or_self.parent
- n_parts = len(input_path_parent_or_self.parts)
- for match in path_matches:
- path = PurePath(match)
- # path.parts[n_parts] should not exceed the index and should be
- # a valid child path because input_path_parent_or_self must be a
- # valid directory
- child = list(path.parts)[n_parts]
- result = (input_path_parent_or_self / child).as_posix()
- # if result is not exact, the result represents a directory.
- if result != match:
- result += '/'
- result_set.add(result)
-
- return result_set
-
-
-def convert_path_to_java_class_name(path: str, base_path: str) -> str:
- base_len = len(base_path)
- result = path[base_len:]
- if result.endswith('.java'):
- result = result[0:-5]
- result = result.replace('/', '.')
- return result
-
-
-def autocomplete_existing_class_name(input_class_name: str,
- existing_paths: List[str]) -> List[str]:
- """Returns a list of package / class names given the partial class name."""
- # If '/' exists, it's probably a path, not a partial class name
- if '/' in input_class_name:
- return []
-
- result_list = []
- partial_relative_path = input_class_name.replace('.', '/')
- for base_path in [OJLUNI_JAVA_BASE_PATH, OJLUNI_TEST_PATH]:
- partial_ojluni_path = base_path + partial_relative_path
- result_paths = autocomplete_existing_ojluni_path(partial_ojluni_path,
- existing_paths)
- # pylint: disable=cell-var-from-loop
- result_list.extend(
- map(lambda path: convert_path_to_java_class_name(path, base_path),
- list(result_paths)))
-
- return result_list
-
-
def autocomplete_tag_or_commit(str_tag_or_commit: str) -> List[str]:
"""Returns a list of tags / commits matching the given partial string."""
if str_tag_or_commit is None:
@@ -228,73 +70,6 @@
filter(lambda tag: tag.startswith(str_tag_or_commit), AUTOCOMPLETE_TAGS))
-def autocomplete_upstream_path(input_path: str, commit: Commit,
- excluded_paths: Set[str]) -> List[str]:
- """Returns a list of source paths matching the given partial string."""
- result_list = []
-
- def append_if_not_excluded(path: str) -> None:
- nonlocal result_list, excluded_paths
- if path not in excluded_paths:
- result_list.append(path)
-
- search_tree = commit.tree
- path_obj = PurePath(input_path)
- is_exact = has_file_in_tree(path_obj.as_posix(), search_tree)
- search_word = ''
- if is_exact:
- git_obj = search_tree[path_obj.as_posix()]
- if isinstance(git_obj, Blob):
- append_if_not_excluded(input_path)
- return result_list
- else:
- # git_obj is a tree
- search_tree = git_obj
- elif len(path_obj.parts) >= 2:
- parent_path = path_obj.parent.as_posix()
- if has_file_in_tree(parent_path, search_tree):
- search_tree = search_tree[parent_path]
- search_word = path_obj.name
- else:
- # Return empty list because no such path is found
- return result_list
- else:
- search_word = input_path
-
- for tree in search_tree.trees:
- tree_path = PurePath(tree.path)
- if tree_path.name.startswith(search_word):
- append_if_not_excluded(tree.path)
-
- for blob in search_tree.blobs:
- blob_path = PurePath(blob.path)
- if blob_path.name.startswith(search_word):
- append_if_not_excluded(blob.path)
-
- return result_list
-
-
-def autocomplete_upstream_class(input_class_name: str, commit: Commit,
- excluded_paths: Set[str]) -> List[str]:
- """Return a list of package / class names from given commit and input."""
- # If '/' exists, it's probably a path, not a class name.
- if '/' in input_class_name:
- return []
-
- result_list = []
- for base_path in UPSTREAM_SEARCH_PATHS:
- base_len = len(base_path)
- path = base_path + input_class_name.replace('.', '/')
- path_results = autocomplete_upstream_path(path, commit, excluded_paths)
- for p in path_results:
- relative_path = p[base_len:]
- if relative_path.endswith('.java'):
- relative_path = relative_path[0:-5]
- result_list.append(relative_path.replace('/', '.'))
-
- return result_list
-
-
COMMAND_ACTIONS = ['add', 'modify', 'sort']
@@ -373,13 +148,14 @@
existing_dst_paths = list(
map(lambda entry: entry.dst_path, expected_entries))
+ ojluni_finder: OjluniFinder = OjluniFinder(existing_dst_paths)
# Case 1: Treat the input as file path
- autocomp_result += autocomplete_existing_ojluni_path(
- input_class_or_ojluni_path, existing_dst_paths)
+ autocomp_result += ojluni_finder.match_path_prefix(
+ input_class_or_ojluni_path)
# Case 2: Treat the input as java package / class name
- autocomp_result += autocomplete_existing_class_name(
- input_class_or_ojluni_path, existing_dst_paths)
+ autocomp_result += ojluni_finder.match_classname_prefix(
+ input_class_or_ojluni_path)
elif no_args == 3:
autocomp_result += autocomplete_tag_or_commit(args.tag_or_commit)
elif args.command == 'add':
@@ -391,32 +167,51 @@
if class_or_src_path is None:
class_or_src_path = ''
- existing_src_paths = set(map(lambda e: e.src_path, expected_entries))
- autocomp_result += autocomplete_upstream_path(class_or_src_path, commit,
- existing_src_paths)
+ openjdk_finder: OpenjdkFinder = OpenjdkFinder(commit)
- autocomp_result += autocomplete_upstream_class(class_or_src_path,
- commit,
- existing_src_paths)
+ matches = openjdk_finder.match_path_prefix(
+ class_or_src_path)
+
+ matches += openjdk_finder.match_classname_prefix(
+ class_or_src_path)
+
+ existing_dst_paths = set(map(lambda e: e.dst_path, expected_entries))
+
+ # Translate the class names or source paths to dst paths and exclude
+ # such matches from the auto-completion result
+ def source_not_exists(src_path_or_class: str) -> bool:
+ nonlocal existing_dst_paths, openjdk_finder
+ t_src_path = openjdk_finder.find_src_path_from_classname(
+ src_path_or_class)
+ if t_src_path is None:
+ # t_src_path is a java package. It must not in existing_dst_paths.
+ return True
+ t_dst_path = OpenjdkFinder.translate_src_path_to_ojluni_path(
+ t_src_path)
+ return t_dst_path not in existing_dst_paths
+
+ autocomp_result += list(filter(source_not_exists, matches))
print('\n'.join(autocomp_result))
exit(0)
if args.command == 'modify':
dst_class_or_file = args.class_or_ojluni_path[0]
- dst_file = translate_from_class_name_to_ojluni_path(dst_class_or_file)
- matches = list(filter(lambda e: dst_file == e.dst_path, expected_entries))
+ dst_path = OjluniFinder.translate_from_class_name_to_ojluni_path(
+ dst_class_or_file)
+ matches = list(filter(lambda e: dst_path == e.dst_path, expected_entries))
if not matches:
- error_and_exit(f'{dst_file} is not found in the EXPECTED_UPSTREAM.')
+ error_and_exit(f'{dst_path} is not found in the EXPECTED_UPSTREAM.')
entry: ExpectedUpstreamEntry = matches[0]
str_tag_or_commit = args.tag_or_commit[0]
is_src_given = args.source_file is not None
src_path = args.source_file if is_src_given else entry.src_path
commit = get_commit_or_exit(str_tag_or_commit)
- if has_file_in_tree(src_path, commit.tree):
+ openjdk_finder: OpenjdkFinder = OpenjdkFinder(commit)
+ if openjdk_finder.has_file(src_path):
pass
elif not is_src_given:
- guessed_src_path = find_src_path_from_ojluni_path(commit, dst_file)
+ guessed_src_path = openjdk_finder.find_src_path_from_ojluni_path(dst_path)
if guessed_src_path is None:
error_and_exit('[source_file] argument is required.')
src_path = guessed_src_path
@@ -430,14 +225,16 @@
class_or_src_path = args.class_or_source_file[0]
str_tag_or_commit = args.tag_or_commit[0]
commit = get_commit_or_exit(str_tag_or_commit)
- src_path = find_src_path_from_class(commit, class_or_src_path)
+ openjdk_finder = OpenjdkFinder(commit)
+ src_path = openjdk_finder.find_src_path_from_classname(class_or_src_path)
if src_path is None:
+ search_paths = openjdk_finder.get_search_paths()
error_and_exit(f'{class_or_src_path} is not found in {commit}. '
- f'The search paths are:\n{UPSTREAM_SEARCH_PATHS}')
+ f'The search paths are:\n{search_paths}')
ojluni_path = args.ojluni_path
# Guess the source path if it's not given in the argument
if ojluni_path is None:
- ojluni_path = translate_src_path_to_ojluni_path(src_path)
+ ojluni_path = OpenjdkFinder.translate_src_path_to_ojluni_path(src_path)
if ojluni_path is None:
error_and_exit('The ojluni destination path is not given.')
diff --git a/tools/expected_upstream/ojluni_refresh_files.py b/tools/expected_upstream/ojluni_refresh_files.py
index 3211180..f4ddb33 100755
--- a/tools/expected_upstream/ojluni_refresh_files.py
+++ b/tools/expected_upstream/ojluni_refresh_files.py
@@ -93,7 +93,7 @@
"Test: N/A")
MSG_SECOND_COMMIT = ("Merge {summary} from {ref} into the "
- " expected_upstream branch\n"
+ "expected_upstream branch\n"
"\n"
"List of files:\n"
" {files}\n"
@@ -159,8 +159,9 @@
# However, it's fine, because we later reset the HEAD to the second commit.
# The user expects the file showing in the file system, and the file is
# not staged/untracked because the file is in the second commit too.
- Path(entry.dst_path).parent.mkdir(parents=True, exist_ok=True)
- with open(entry.dst_path, "wb") as file:
+ absolute_dst_path = Path(LIBCORE_DIR, entry.dst_path)
+ absolute_dst_path.parent.mkdir(parents=True, exist_ok=True)
+ with absolute_dst_path.open("wb") as file:
file.write(src_blob.data_stream.read())
first_index.add(entry.dst_path)
@@ -190,7 +191,7 @@
# We updated the HEAD to the second commit. Thus, git-reset updates the
# current index. Otherwise, the current index, aka, repo.index, shows that
# the files are deleted.
- repo.index.reset(paths=dst_paths)
+ repo.index.reset()
print(f"New merge commit {second_commit} contains:")
print(f" {str_dst_paths}")
@@ -203,6 +204,7 @@
print("This script should only run on aosp/expected_upstream branch. "
f"Currently, this is on branch {repo.active_branch} "
f"tracking {current_tracking_branch}")
+ return
print("Reading EXPECTED_UPSTREAM file...")
expected_upstream_entries = ExpectedUpstreamFile().read_all_entries()
diff --git a/tools/expected_upstream/ojluni_upgrade_identicals.py b/tools/expected_upstream/ojluni_upgrade_identicals.py
new file mode 100755
index 0000000..083dee0
--- /dev/null
+++ b/tools/expected_upstream/ojluni_upgrade_identicals.py
@@ -0,0 +1,98 @@
+#!/usr/bin/python3 -B
+
+# Copyright 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""ojluni_modify_expectation is a command-line tool for modifying the EXPECTED_UPSTREAM file."""
+
+import argparse
+import sys
+from typing import Sequence
+
+from common_util import ExpectedUpstreamFile
+from common_util import LIBCORE_DIR
+from common_util import OpenjdkFinder
+
+# Import git only after common_util because common_util will
+# produce informative error
+from git import Commit
+from git import Repo
+from gitdb.exc import BadName
+
+LIBCORE_REPO = Repo(LIBCORE_DIR.as_posix())
+
+
+def error_and_exit(msg: str) -> None:
+ print(f'Error: {msg}', file=sys.stderr)
+ sys.exit(1)
+
+
+def get_commit_or_exit(git_ref: str) -> Commit:
+ try:
+ return LIBCORE_REPO.commit(git_ref)
+ except BadName as e:
+ error_and_exit(f'{e}')
+
+
+def main(argv: Sequence[str]) -> None:
+ arg_parser = argparse.ArgumentParser(
+ description='Set an entry in EXCPETED_UPSTREAM to the given version if'
+ ' the current and given version are identical.')
+ arg_parser.add_argument(
+ 'tag_or_commit', nargs=1,
+ help='A git tag or commit in the upstream-openjdkXXX branch')
+
+ args = arg_parser.parse_args(argv)
+
+ input_ref = args.tag_or_commit[0]
+ commit = get_commit_or_exit(input_ref)
+
+ expected_upstream_file = ExpectedUpstreamFile()
+ expected_entries = expected_upstream_file.read_all_entries()
+
+ new_finder = OpenjdkFinder(commit)
+
+ for expected_entry in expected_entries:
+ if expected_entry.git_ref == input_ref:
+ continue
+
+ current_commit = LIBCORE_REPO.commit(expected_entry.git_ref)
+ current_finder = OpenjdkFinder(current_commit)
+ if not current_finder.has_file(expected_entry.src_path):
+ error_and_exit(f'{expected_entry.src_path} is not found in '
+ f'{expected_entry.git_ref}')
+
+ current_blob = current_commit.tree[expected_entry.src_path]
+
+ # Try to guess the new source path in the new version
+ new_src_path = expected_entry.src_path
+ if new_finder.has_file(new_src_path):
+ pass
+ else:
+ new_src_path = new_finder.find_src_path_from_ojluni_path(
+ expected_entry.dst_path)
+ if new_src_path is None:
+ print(f"Warning: can't find the upstream path for "
+ f"{expected_entry.dst_path}", file=sys.stderr)
+ continue
+
+ new_blob = commit.tree[new_src_path]
+ if current_blob.data_stream.read() == new_blob.data_stream.read():
+ expected_entry.git_ref = input_ref
+ expected_entry.src_path = new_src_path
+
+ expected_upstream_file.write_all_entries(expected_entries)
+
+
+if __name__ == '__main__':
+ main(sys.argv[1:])
diff --git a/tools/expected_upstream/tests/__init__.py b/tools/expected_upstream/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/expected_upstream/tests/__init__.py
diff --git a/tools/expected_upstream/tests/common_util_test.py b/tools/expected_upstream/tests/common_util_test.py
new file mode 100755
index 0000000..05e2a6b
--- /dev/null
+++ b/tools/expected_upstream/tests/common_util_test.py
@@ -0,0 +1,293 @@
+#!/usr/bin/python3 -B
+
+# Copyright 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Tests for common_util."""
+
+from typing import List
+import unittest
+
+# pylint: disable=g-multiple-import
+from common_util import (
+ LIBCORE_DIR,
+ OpenjdkFinder,
+ OjluniFinder,
+)
+
+from git import Repo
+
+
+class OjluniFinderTest(unittest.TestCase):
+
+ LIST_OJLUNI_PATHS = [
+ 'ojluni/src/main/java/java/lang/String.java',
+ 'ojluni/src/main/java/java/lang/StringBuilder.java',
+ 'ojluni/src/main/java/java/lang/package-info.java',
+ 'ojluni/src/main/java/java/math/BigInteger.java',
+ 'ojluni/src/test/java/math/BigInteger/BigIntegerTest.java',
+ 'ojluni/src/main/native/System.c',
+ ]
+
+ def setUp(self):
+ super().setUp()
+ self.ojluni_finder = OjluniFinder(self.LIST_OJLUNI_PATHS)
+
+ def test_translate_from_class_name_to_ojluni_path(self):
+ # Translates a package
+ self.assert_class_to_path(
+ 'java.lang.NullPointerException',
+ 'ojluni/src/main/java/java/lang/NullPointerException.java')
+ self.assert_class_to_path(
+ 'TopPackage.SubPackage.ClassA',
+ 'ojluni/src/main/java/TopPackage/SubPackage/ClassA.java')
+
+ # Translates a test package
+ self.assert_class_to_path(
+ 'test.java.lang.NullPointerException',
+ 'ojluni/src/test/java/lang/NullPointerException.java')
+ self.assert_class_to_path(
+ 'test.TopPackage.SubPackage.ClassA',
+ 'ojluni/src/test/TopPackage/SubPackage/ClassA.java')
+
+ # Translates a path
+ self.assert_class_to_path(
+ 'ojluni/src/main/java/java/lang/NullPointerException.java',
+ 'ojluni/src/main/java/java/lang/NullPointerException.java')
+
+ # Test edge cases
+ self.assert_class_to_path('a', 'ojluni/src/main/java/a.java')
+ self.assert_class_to_path('test.a', 'ojluni/src/test/a.java')
+
+ def assert_class_to_path(self, classname: str, expected_path: str):
+ translated_path = OjluniFinder.translate_from_class_name_to_ojluni_path(
+ classname)
+ self.assertEqual(translated_path, expected_path)
+
+ def test_ojluni_match_path_prefix(self):
+ # directory path ending with / or not has different results
+ self.assert_match_ojluni_path('ojluni/src/main/java/java', [
+ 'ojluni/src/main/java/java/',
+ ])
+ self.assert_match_ojluni_path('ojluni/src/main/java/java/', [
+ 'ojluni/src/main/java/java/lang/',
+ 'ojluni/src/main/java/java/math/',
+ ])
+
+ self.assert_match_ojluni_path('ojluni/src/main/java/java/lang/', [
+ 'ojluni/src/main/java/java/lang/String.java',
+ 'ojluni/src/main/java/java/lang/StringBuilder.java',
+ 'ojluni/src/main/java/java/lang/package-info.java',
+ ])
+ self.assert_match_ojluni_path('ojluni/src/main/java/java/lang/String', [
+ 'ojluni/src/main/java/java/lang/String.java',
+ 'ojluni/src/main/java/java/lang/StringBuilder.java',
+ ])
+ self.assert_match_ojluni_path('ojluni/src/main/java/java/lang/StringB', [
+ 'ojluni/src/main/java/java/lang/StringBuilder.java',
+ ])
+ self.assert_match_ojluni_path('ojluni/src/main/java/java/math/', [
+ 'ojluni/src/main/java/java/math/BigInteger.java',
+ ])
+
+ self.assert_match_ojluni_path('ojluni/src/test/java/math/BigInteger/', [
+ 'ojluni/src/test/java/math/BigInteger/BigIntegerTest.java',
+ ])
+ self.assert_match_ojluni_path('ojluni/src/test/java/math/BigInteger/', [
+ 'ojluni/src/test/java/math/BigInteger/BigIntegerTest.java',
+ ])
+
+ def assert_match_ojluni_path(self, path_prefix: str, expected: List[str]):
+ result = self.ojluni_finder.match_path_prefix(path_prefix)
+ self.assertEqual(set(expected), result)
+
+ def test_ojluni_match_classname_prefix(self):
+ # directory path ending with / or not has different results
+ self.assert_match_ojluni_classname('java', ['java.'])
+ self.assert_match_ojluni_classname('java.', [
+ 'java.lang.',
+ 'java.math.',
+ ])
+
+ self.assert_match_ojluni_classname('java.lang.', [
+ 'java.lang.String',
+ 'java.lang.StringBuilder',
+ 'java.lang.package-info',
+ ])
+ self.assert_match_ojluni_classname('java.lang.String', [
+ 'java.lang.String',
+ 'java.lang.StringBuilder',
+ ])
+ self.assert_match_ojluni_classname('java.lang.StringB', [
+ 'java.lang.StringBuilder',
+ ])
+
+ self.assert_match_ojluni_classname('java.math.', [
+ 'java.math.BigInteger',
+ ])
+ self.assert_match_ojluni_classname('java.math.BigInteger', [
+ 'java.math.BigInteger',
+ ])
+ self.assert_match_ojluni_classname('test.java.math.BigInteger.', [
+ 'test.java.math.BigInteger.BigIntegerTest',
+ ])
+
+ def assert_match_ojluni_classname(self, path_prefix: str,
+ expected: List[str]):
+ result = self.ojluni_finder.match_classname_prefix(path_prefix)
+ self.assertEqual(set(expected), set(result))
+
+
+class OpenJdkFinderTest(unittest.TestCase):
+
+ def setUp(self):
+ super().setUp()
+ self.repo = Repo(LIBCORE_DIR.as_posix())
+ commit = self.repo.commit('jdk11u/jdk-11.0.13-ga')
+ self.finder = OpenjdkFinder(commit)
+
+ def tearDown(self):
+ super().tearDown()
+ self.repo.close()
+
+ def test_translate_src_path_to_ojluni_path(self):
+ self.assertEqual(
+ 'ojluni/src/main/java/java/lang/String.java',
+ OpenjdkFinder.translate_src_path_to_ojluni_path(
+ 'src/java.base/share/classes/java/lang/String.java'))
+ self.assertEqual(
+ 'ojluni/src/test/java/math/BigInteger/BigIntegerTest.java',
+ OpenjdkFinder.translate_src_path_to_ojluni_path(
+ 'test/jdk/java/math/BigInteger/BigIntegerTest.java'))
+
+ def test_find_src_path_from_classname(self):
+ self.assertEqual(
+ 'src/java.base/share/classes/java/lang/String.java',
+ self.finder.find_src_path_from_classname('java.lang.String'))
+ self.assertEqual(
+ 'test/jdk/java/math/BigInteger/BigIntegerTest.java',
+ self.finder.find_src_path_from_classname(
+ 'java.math.BigInteger.BigIntegerTest'))
+
+ def test_find_src_path_from_ojluni_path(self):
+ self.assertEqual(
+ 'src/java.base/share/classes/java/lang/String.java',
+ self.finder.find_src_path_from_ojluni_path(
+ 'ojluni/src/main/java/java/lang/String.java'))
+ self.assertEqual(
+ 'test/jdk/java/math/BigInteger/BigIntegerTest.java',
+ self.finder.find_src_path_from_ojluni_path(
+ 'ojluni/src/test/java/math/BigInteger/BigIntegerTest.java'))
+ self.assertEqual(
+ 'src/java.base/unix/classes/sun/nio/fs/UnixPath.java',
+ self.finder.find_src_path_from_ojluni_path(
+ 'ojluni/src/main/java/sun/nio/fs/UnixPath.java'))
+ self.assertEqual(
+ 'src/java.sql/share/classes/java/sql/Array.java',
+ self.finder.find_src_path_from_ojluni_path(
+ 'ojluni/src/main/java/java/sql/Array.java'))
+ self.assertEqual(
+ 'src/java.logging/share/classes/java/util/logging/Formatter.java',
+ self.finder.find_src_path_from_ojluni_path(
+ 'ojluni/src/main/java/java/util/logging/Formatter.java'))
+
+ def test_match_path_prefix(self):
+ self.assert_match_path_prefix([
+ 'src/java.base/share/classes/java/',
+ 'src/java.base/share/classes/javax/',
+ ], 'src/java.base/share/classes/java')
+ self.assert_match_path_prefix([
+ 'src/java.base/share/classes/java/io/',
+ 'src/java.base/share/classes/java/lang/',
+ 'src/java.base/share/classes/java/math/',
+ 'src/java.base/share/classes/java/net/',
+ 'src/java.base/share/classes/java/nio/',
+ 'src/java.base/share/classes/java/security/',
+ 'src/java.base/share/classes/java/text/',
+ 'src/java.base/share/classes/java/time/',
+ 'src/java.base/share/classes/java/util/',
+ ], 'src/java.base/share/classes/java/')
+ self.assert_match_path_prefix([
+ 'src/java.base/share/classes/java/lang/StringBuffer.java',
+ 'src/java.base/share/classes/java/lang/StringIndexOutOfBoundsException.java',
+ 'src/java.base/share/classes/java/lang/StringUTF16.java',
+ 'src/java.base/share/classes/java/lang/String.java',
+ 'src/java.base/share/classes/java/lang/StringConcatHelper.java',
+ 'src/java.base/share/classes/java/lang/StringLatin1.java',
+ 'src/java.base/share/classes/java/lang/StringBuilder.java',
+ 'src/java.base/share/classes/java/lang/StringCoding.java',
+ ], 'src/java.base/share/classes/java/lang/String')
+ self.assert_match_path_prefix([
+ 'test/jdk/java/math/BigInteger/BigIntegerTest.java',
+ ], 'test/jdk/java/math/BigInteger/BigInteger')
+
+ def assert_match_path_prefix(self, expected: List[str], prefix: str):
+ result = self.finder.match_path_prefix(prefix)
+ self.assertEqual(set(expected), set(result))
+
+ def test_match_classname_prefix(self):
+ self.assert_match_classname_prefix([
+ 'java.',
+ 'javax.',
+ ], 'java')
+ self.assert_match_classname_prefix([
+ 'java.rmi.',
+ 'java.math.',
+ 'java.beans.',
+ 'java.security.',
+ 'java.util.',
+ 'java.io.',
+ 'java.lang.',
+ 'java.nio.',
+ 'java.awt.',
+ 'java.sql.',
+ 'java.text.',
+ 'java.time.',
+ 'java.net.',
+ ], 'java.')
+ self.assert_match_classname_prefix(
+ [
+ 'java.math.BigInteger',
+ 'java.math.BigInteger.', # test package
+ ],
+ 'java.math.BigInteger')
+ self.assert_match_classname_prefix([
+ 'java.math.BigInteger.PrimitiveConversionTests',
+ 'java.math.BigInteger.CompareToTests',
+ 'java.math.BigInteger.UnicodeConstructor',
+ 'java.math.BigInteger.BigIntegerTest',
+ 'java.math.BigInteger.TestValueExact',
+ 'java.math.BigInteger.StringConstructorOverflow',
+ 'java.math.BigInteger.ExtremeShiftingTests',
+ 'java.math.BigInteger.DivisionOverflow',
+ 'java.math.BigInteger.OperatorNpeTests',
+ 'java.math.BigInteger.ModPow65537',
+ 'java.math.BigInteger.LargeValueExceptions',
+ 'java.math.BigInteger.ProbablePrime',
+ 'java.math.BigInteger.BitLengthOverflow',
+ 'java.math.BigInteger.StringConstructor',
+ 'java.math.BigInteger.PrimeTest',
+ 'java.math.BigInteger.ModPow',
+ 'java.math.BigInteger.ModInvTime',
+ 'java.math.BigInteger.DoubleValueOverflow',
+ 'java.math.BigInteger.SymmetricRangeTests',
+ 'java.math.BigInteger.ModPowPowersof2',
+ ], 'java.math.BigInteger.')
+
+ def assert_match_classname_prefix(self, expected: List[str], prefix: str):
+ result = self.finder.match_classname_prefix(prefix)
+ self.assertEqual(set(expected), set(result))
+
+
+if __name__ == '__main__':
+ unittest.main()