Mercurial > hg > icedtea6
view patches/ecj/override.patch @ 3268:8b26ecee3670
Update to build against July 2016 security fixes (b40).
Upstream changes:
- S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
- S6496269: Many warnings generated from com/sun/java/util/jar/pack/*.cpp when compiled on Linux
- S6522789: [zh_CN] translation of "enclosing class" in doclet is incorrect
- S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
- S6579775: l10n update after 6212566
- S6600143: Remove another 450 unnecessary casts
- S6611629: Avoid hardcoded cygwin paths for memory detection
- S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
- S6690018: RSAClientKeyExchange NullPointerException
- S6714842: CertPathBuilder returns incorrect CertPath for BasicConstraints in builderParams
- S6726309: Compiler warnings in nio code
- S6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles
- S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
- S6752638: java.awt.GraphicsEnvironment.preferLocaleFonts() throws NPE on Linux
- S6755847: (launcher) will trigger assertions in debug build
- S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
- S6793818: JpegImageReader is too greedy creating color profiles
- S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
- S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
- S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected
- S6864028: Update the java launcher to use the new entry point JVM_FindClassFromBootLoader
- S6875904: Java 7 message synchronization 1
- S6882437: CertPath/X509CertPathDiscovery/Test fails on jdk7/pit/b62
- S6888127: java.util.jar.Pack200.Packer Memory Leak
- S6888215: memory leak in jpeg plugin
- S6888925: SunMSCAPI's Cipher can't use RSA public keys obtained from other sources.
- S6889552: Sun provider should not require LDAP CertStore to be present
- S6941936: Broken pipe error of test case DNSIdentities.java
- S6951599: Rename package of security tools for modularization
- S6953295: Move few sun.security.{util, x509, pkcs} classes used by keytool/jarsigner to another package
- S6958026: Problem with PKCS12 keystore
- S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
- S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
- S6989774: imageio compiler warnings in native code
- S6990106: FindBugs scan - Malicious code vulnerability Warnings in com.sun.java.util.jar.pack.*
- S6994413: JDK_GetVersionInfo0 only expects a two digit build number
- S7000225: Sanity check on sane-alsa-headers is broken
- S7000752: Duplicate entry in RowSetResourceBundles.properties
- S7001094: Can't initialize SunPKCS11 more times than PKCS11 driver maxSessionCount
- S7003227: (pack200) intermittent failures compiling pack200
- S7004706: l10n of 7000752 Duplicate entry in RowSetResourceBundles.properties
- S7006704: (pack200) add missing file for 6990106
- S7011497: Improve trust anchor searching method during cert path validation
- S7017734: jdk7 message drop 1 translation integration
- S7023416: (pack200) fix parfait issues
- S7029680: fix test/sun/misc/Version/Version.java build parsing
- S7038175: Expired PKITS certificates causing CertPathBuilder and CertPathValidator regression test failures
- S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
- S7050826: Hebrew characters are not rendered on OEL 5.6
- S7055363: jdk_security3 test target cleanup
- S7060849: Eliminate pack200 build warnings
- S7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
- S7069870: Parts of the JDK erroneously rely on generic array initializers with diamond
- S7081817: test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java failing
- S7092825: javax.crypto.Cipher.Transform.patternCache is synchronizedMap and became scalability bottleneck.
- S7105780: Add SSLSocket client/SSLEngine server to templates directory
- S7107613: scalability blocker in javax.crypto.CryptoPermissions
- S7107616: scalability blocker in javax.crypto.JceSecurityManager
- S7109274: Restrict the use of certificates with RSA keys less than 1024 bits
- S7129083: CookieManager does not store cookies if url is read before setting cookie manager
- S7152582: PKCS11 tests should use the NSS libraries available in the OS
- S7166955: (pack200) JNI_GetCreatedJavaVMs needs additional checking
- S7196855: autotest.sh fails on ubuntu because libsoftokn.so not found
- S7200682: TEST_BUG: keytool/autotest.sh still has problems with libsoftokn.so
- S8002306: (se) Selector.open fails if invoked with thread interrupt status set [win]
- S8009634: TEST_BUG: sun/misc/Version/Version.java handle 2 digit minor in VM version
- S8010166: TEST_BUG: fix for 8009634 overlooks possible version strings (sun/misc/Version/Version.java)
- S8013228: Create new system properties to control allowable OCSP clock skew and CRL connection timeout
- S8019341: Update CookieHttpsClientTest to use the newer framework.
- S8022228: Intermittent test failures in sun/security/ssl/javax/net/ssl/NewAPIs
- S8022594: Potential deadlock in <clinit> of sun.nio.ch.Util/IOUtil
- S8023546: sun/security/mscapi/ShortRSAKey1024.sh fails intermittently
- S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
- S8027026: Change keytool -genkeypair to use -keyalg RSA
- S8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
- S8029646: [pack200] should support the new zip64 format.
- S8036612: [parfait] JNI exception pending in jdk/src/windows/native/sun/security/mscapi/security.cpp
- S8037557: test SessionCacheSizeTests.java timeout
- S8074839: Resolve disabled warnings for libunpack and the unpack200 binary
- S8079410: Hotspot version to share the same update and build version from JDK
- S8079718: IIOP Input Stream Hooking
- S8130735: javax.swing.TimerQueue: timer fires late when another timer starts
- S8139436: sun.security.mscapi.KeyStore might load incomplete data
- S8140344: add support for 3 digit update release numbers
- S8144313: Test SessionTimeOutTests can be timeout
- S8145017: Add support for 3 digit hotspot minor version numbers
- S8145446: Perfect pipe placement
- S8146387: Test SSLSession/SessionCacheSizeTests socket accept timed out
- S8146669: Test SessionTimeOutTests fails intermittently
- S8146993: Several javax/management/remote/mandatory regression tests fail after JDK-8138811
- S8147771: Construction of static protection domains under Javax custom policy
- S8147857: [TEST] RMIConnector logs attribute names incorrectly
- S8148872: Complete name checking
- S8149962: Better delineation of XML processing
- S8150752: Share Class Data
- S8151841: Build needs additional flags to compile with GCC 6
- S8151876: (tz) Support tzdata2016d
- S8151925: Font reference improvements
- S8152479: Coded byte streams
- S8155981: Bolster bytecode verification
- S8161262: Fix jdk build with gcc 4.1.2: -fno-strict-overflow not known.
- S8162344: The API changes made by CR 7064075 need to be reverted
- S8162818: Sync src/share/native/com/sun/media code with OpenJDK 7
- S8162828: Sync imageioJPEG.c with initial OpenJDK 7 version
- S8163022: Remove @Override annotation on interfaces added by 2016/04 security fixes
- S8164181: Remove @Override annotation on interfaces added by 2016/07 security fixes
ChangeLog:
2016-08-16 Andrew John Hughes <gnu.andrew@redhat.com>
* patches/imageiojpeg_sync.patch,
* patches/openjdk/4893408-jpegreader_byte_gray.patch,
* patches/openjdk/6563752-ss12_support.patch,
* patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
* patches/openjdk/6729772-opt_cleanup.patch,
* patches/openjdk/6791502-invalid_icc_profile.patch,
* patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
* patches/openjdk/6799141-split_out_versions.patch,
* patches/openjdk/6816311-compiler_name.patch,
* patches/openjdk/6888215-jpeg_memory_leak.patch,
* patches/openjdk/6974017-minorver_for_solaris.patch,
* patches/openjdk/6980281-majorver_for_solaris.patch,
* patches/openjdk/6989774-imageio_compiler_warnings.patch,
* patches/openjdk/7000225-bad_tabs.patch,
* patches/openjdk/7038711-fix_no-clobber_usage.patch,
* patches/parisc.patch:
Removed as applied upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Remove deleted patches.
* NEWS: Updated with b40 changes. Correct
1.13.11 release notes to mention b39, not b38.
* patches/arch.patch:
Drop hunk in jdk/make/common/shared/Compiler-gcc.gmk
as compiler versions are no longer specified by
architecture on GNU/Linux, following 6799141.
* patches/ecj/override.patch:
Remove sections included in upstream 8163022.
* patches/linker-libs-order.patch:
Drop ALSA chunk in make/common/shared/Sanity.gmk
as version is now obtained from header file
following 6799141.
* patches/openjdk/7025066-embedded_build.patch:
Regenerated.
* patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch:
Remove cast from context as it no longer exists
following 6600143.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 17 Aug 2016 02:53:46 +0100 |
parents | 60be25a84f2d |
children |
line wrap: on
line source
diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java --- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2016-08-16 02:49:10.269396706 +0100 +++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2016-08-16 05:30:32.814484518 +0100 @@ -50,17 +50,14 @@ } // size of the chunk given by the parser - @Override public int size() { return len; } - @Override public byte[] read() { return data; } - @Override public long writeTo(DataFile file) { return file.writeTo(data, 0, len); } @@ -70,7 +67,6 @@ * @param buf * @return */ - @Override public Data createNext(DataHead dataHead, ByteBuffer buf) { if (!config.isOnlyMemory() && dataHead.inMemory >= config.memoryThreshold) { try { diff -Nru openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java --- openjdk-ecj.orig/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2016-08-16 02:49:10.909386153 +0100 +++ openjdk-ecj/jaxws/drop_included/jaxws_src/src/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2016-08-16 05:30:32.814484518 +0100 @@ -644,7 +644,6 @@ return AccessController.doPrivileged( new PrivilegedAction<T>() { - @Override public T run() { Object proxy = Proxy.newProxyInstance(portInterface.getClassLoader(), new Class[]{portInterface, WSBindingProvider.class, Closeable.class}, pis); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java --- openjdk-ecj.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2016-08-16 02:49:55.380653021 +0100 +++ openjdk-ecj/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java 2016-08-16 05:30:32.814484518 +0100 @@ -485,7 +485,6 @@ Receiver. Therefore, subclasses should not override this method. Instead, they should implement implSend(). */ - @Override public final synchronized void send(final MidiMessage message, final long timeStamp) { if (!open) { @@ -501,7 +500,6 @@ * Therefore, subclasses that override this method must call * 'super.close()'. */ - @Override public final void close() { open = false; synchronized (AbstractMidiDevice.this.traRecLock) { diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java --- openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2016-08-16 02:49:24.297165438 +0100 +++ openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2016-08-16 05:30:32.814484518 +0100 @@ -1044,7 +1044,6 @@ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() { - @Override public Class<?> run() { try { ReflectUtil.checkPackageAccess(className); @@ -1118,7 +1117,6 @@ javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() { - @Override public Void run() { for (int i = 0; i < sig.length; i++) { if (tracing) { @@ -1207,7 +1205,6 @@ final String className = opClassName; targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() { - @Override public Class<?> run() { try { ReflectUtil.checkPackageAccess(className); @@ -1243,7 +1240,6 @@ AccessControlContext stack = AccessController.getContext(); Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Object>() { - @Override public Object run() { try { ReflectUtil.checkPackageAccess(method.getDeclaringClass()); @@ -1680,7 +1676,6 @@ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() { - @Override public Class<?> run() { try { ReflectUtil.checkPackageAccess(respType); @@ -2858,7 +2853,6 @@ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() { - @Override public Class<?> run() { try { ReflectUtil.checkPackageAccess(className); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java --- openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2016-08-16 02:49:24.501162074 +0100 +++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2016-08-16 05:30:32.814484518 +0100 @@ -175,7 +175,6 @@ this.defaultContextClassLoader = AccessController.doPrivileged( new PrivilegedAction<ClassLoader>() { - @Override public ClassLoader run() { return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(), dcl); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java --- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2016-08-16 02:49:31.009054787 +0100 +++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2016-08-16 05:30:32.810484583 +0100 @@ -200,7 +200,6 @@ super.uninstallListeners(); } - @Override public SynthContext getContext(JComponent c) { return getContext(c, getComponentState(c)); } @@ -273,7 +272,6 @@ // end UI Initialization //====================== - @Override public void propertyChange(PropertyChangeEvent e) { if (SynthLookAndFeel.shouldUpdateStyle(e)) { updateStyle(comboBox); @@ -318,7 +316,6 @@ } } - @Override public void paintBorder(SynthContext context, Graphics g, int x, int y, int w, int h) { context.getPainter().paintComboBoxBorder(context, g, x, y, w, h); @@ -424,7 +421,6 @@ setText(" "); } - @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { setName("ComboBox.listRenderer"); @@ -491,7 +487,6 @@ editor.setName("ComboBox.textField"); } - @Override public Component getEditorComponent() { return editor; } @@ -501,7 +496,6 @@ * * @param anObject the displayed value of the editor */ - @Override public void setItem(Object anObject) { String text; @@ -517,7 +511,6 @@ } } - @Override public Object getItem() { Object newValue = editor.getText(); @@ -540,18 +533,15 @@ return newValue; } - @Override public void selectAll() { editor.selectAll(); editor.requestFocus(); } - @Override public void addActionListener(ActionListener l) { editor.addActionListener(l); } - @Override public void removeActionListener(ActionListener l) { editor.removeActionListener(l); } @@ -685,27 +675,22 @@ // MouseListener/MouseMotionListener Methods //------------------------------------------------------------------ - @Override public void mouseEntered(MouseEvent mouseEvent) { updateOver(true); } - @Override public void mouseExited(MouseEvent mouseEvent) { updateOver(false); } - @Override public void mousePressed(MouseEvent mouseEvent) { updatePressed(true); } - @Override public void mouseReleased(MouseEvent mouseEvent) { updatePressed(false); } - @Override public void mouseClicked(MouseEvent e) {} //------------------------------------------------------------------ @@ -722,16 +707,13 @@ * This bug was only noticed when acting as a button, but may be generally * present. If so, remove the if() block */ - @Override public void popupMenuCanceled(PopupMenuEvent e) { if (shouldActLikeButton() || pressedWhenPopupVisible) { comboBox.repaint(); } } - @Override public void popupMenuWillBecomeVisible(PopupMenuEvent e) {} - @Override public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {} } diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java --- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2016-08-16 02:49:31.017054654 +0100 +++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2016-08-16 05:30:32.810484583 +0100 @@ -839,7 +839,6 @@ tk.addPropertyChangeListener(key, this); } - @Override public void propertyChange(PropertyChangeEvent pce) { UIDefaults defaults = UIManager.getLookAndFeelDefaults(); if (defaults.getBoolean("Synth.doNotSetTextAA")) { @@ -908,7 +907,6 @@ if (!isUpdatePending()) { setUpdatePending(true); Runnable uiUpdater = new Runnable() { - @Override public void run() { updateAllUIs(); setUpdatePending(false); @@ -925,7 +923,6 @@ } private class Handler implements PropertyChangeListener { - @Override public void propertyChange(PropertyChangeEvent evt) { String propertyName = evt.getPropertyName(); Object newValue = evt.getNewValue(); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java --- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2016-08-16 02:49:31.189051818 +0100 +++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2016-08-16 05:30:32.814484518 +0100 @@ -154,7 +154,6 @@ tree.addPropertyChangeListener(this); } - @Override public SynthContext getContext(JComponent c) { return getContext(c, getComponentState(c)); } diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java 2016-08-16 03:20:55.673982482 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java 2016-08-16 05:30:32.814484518 +0100 @@ -616,7 +616,6 @@ * a given connection may change. When sessions change, so may * peer identities and cipher suites. */ - @Override public void handshakeCompleted(HandshakeCompletedEvent event) { session = event.getSession(); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/pkcs11/P11Key.java openjdk-ecj/jdk/src/share/classes/sun/security/pkcs11/P11Key.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2016-08-16 03:20:55.641983012 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2016-08-16 05:31:55.249125351 +0100 @@ -216,7 +216,6 @@ /** * Return bit length of the key. */ - @Override public int length() { return keyLength; } diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk-ecj/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2016-08-16 03:20:55.681982351 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2016-08-16 05:30:32.814484518 +0100 @@ -606,7 +606,7 @@ /* * Return the certificate's revocation status code */ - @Override public CertStatus getCertStatus() { + public CertStatus getCertStatus() { return certStatus; } @@ -614,11 +614,11 @@ return certId; } - @Override public Date getRevocationTime() { + public Date getRevocationTime() { return (Date) revocationTime.clone(); } - @Override public Reason getRevocationReason() { + public Reason getRevocationReason() { return revocationReason; } diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-08-16 03:20:55.677982417 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2016-08-16 05:30:32.814484518 +0100 @@ -461,7 +461,7 @@ return (CertificateIssuerExtension) getExtension(PKIXExtensions.CertificateIssuer_Id); } - @Override + public int compareTo(X509CRLEntryImpl that) { int compSerial = getSerialNumber().compareTo(that.getSerialNumber()); if (compSerial != 0) { diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-08-16 03:20:55.677982417 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2016-08-16 05:30:32.814484518 +0100 @@ -1281,7 +1281,6 @@ return hashcode; } - @Override public int compareTo(X509IssuerSerial another) { int cissuer = issuer.toString() .compareTo(another.issuer.toString()); diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java --- openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2016-08-16 02:49:56.796629679 +0100 +++ openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2016-08-16 05:30:32.814484518 +0100 @@ -701,7 +701,6 @@ this.delegate = delegate; } - @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);