fix

Author: Accelerator1996

.jcheck/conf

@@ -1,11 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-<<<<<<< HEAD
-version=11.0.27
-=======
 version=11.0.28
->>>>>>> jdk-11.0.28+6
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

make/autoconf/version-numbers

@@ -28,20 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-<<<<<<< HEAD
-DEFAULT_VERSION_UPDATE=27
-=======
 DEFAULT_VERSION_UPDATE=28
->>>>>>> jdk-11.0.28+6
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-<<<<<<< HEAD
-DEFAULT_VERSION_DATE=2025-04-15
-=======
 DEFAULT_VERSION_DATE=2025-07-15
->>>>>>> jdk-11.0.28+6
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/data/tzdata/VERSION

@@ -21,8 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-<<<<<<< HEAD
-tzdata2025a
-=======
 tzdata2025b
->>>>>>> jdk-11.0.28+6

src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java

@@ -43,28 +43,6 @@ final class CamerfirmaTLSPolicy {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
-<<<<<<< HEAD
-    // SHA-256 certificate fingerprints of distrusted roots
-    private static final Set<String> FINGERPRINTS = Set.of(
-        // cacerts alias: camerfirmachamberscommerceca
-        // DN: CN=Chambers of Commerce Root,
-        //     OU=http://www.chambersign.org,
-        //     O=AC Camerfirma SA CIF A82743287, C=EU
-        "0C258A12A5674AEF25F28BA7DCFAECEEA348E541E6F5CC4EE63B71B361606AC3",
-        // cacerts alias: camerfirmachambersca
-        // DN: CN=Chambers of Commerce Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0",
-        // cacerts alias: camerfirmachambersignca
-        // DN: CN=Global Chambersign Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "136335439334A7698016A0D324DE72284E079D7B5220BB8FBD747816EEBEBACA"
-    );
-=======
     // SHA-256 certificate fingerprint of distrusted root for TLS
     // cacerts alias: camerfirmachambersca
     // DN: CN=Chambers of Commerce Root - 2008,
@@ -73,7 +51,6 @@ final class CamerfirmaTLSPolicy {
     //     C=EU
     private static final String FINGERPRINT =
             "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0";
->>>>>>> jdk-11.0.28+6
 
     // Any TLS Server certificate that is anchored by one of the Camerfirma
     // roots above and is issued after this date will be distrusted.
@@ -96,11 +73,7 @@ static void checkDistrust(X509Certificate[] chain)
             throw new ValidatorException("Cannot generate fingerprint for "
                 + "trust anchor of TLS server certificate");
         }
-<<<<<<< HEAD
-        if (FINGERPRINTS.contains(fp)) {
-=======
         if (FINGERPRINT.equalsIgnoreCase(fp)) {
->>>>>>> jdk-11.0.28+6
             Date notBefore = chain[0].getNotBefore();
             LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(),
                                                         ZoneOffset.UTC);

test/jdk/java/util/TimeZone/TimeZoneData/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
-tzdata2025a
-=======
 tzdata2025b
->>>>>>> jdk-11.0.28+6

test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Camerfirma.java

@@ -21,19 +21,6 @@
  * questions.
  */
 
-<<<<<<< HEAD
-import java.io.File;
-import java.security.Security;
-import java.time.*;
-import java.util.*;
-import javax.net.ssl.*;
-
-/**
- * @test
- * @bug 8346587
- * @summary Check that TLS Server certificates chaining back to distrusted
- *          Camerfirma roots are invalid
-=======
 import javax.net.ssl.X509TrustManager;
 import java.io.File;
 import java.security.Security;
@@ -47,7 +34,6 @@
  * @bug 8346587 8350498
  * @summary Check that TLS Server certificates chaining back to distrusted
  *          Camerfirma root are invalid
->>>>>>> jdk-11.0.28+6
  * @library /test/lib
  * @modules java.base/sun.security.validator
  * @run main/othervm Camerfirma after policyOn invalid
@@ -58,33 +44,19 @@
 
 public class Camerfirma {
 
-<<<<<<< HEAD
-    private static final String certPath = "chains" + File.separator + "camerfirma";
-
-    // Each of the roots have a test certificate chain stored in a file
-    // named "<root>-chain.pem".
-    private static String[] rootsToTest = new String[] {
-            "camerfirmachamberscommerceca", "camerfirmachambersca",
-            "camerfirmachambersignca"};
-=======
     private static final String CERT_PATH = "chains" + File.separator + "camerfirma";
 
     // Each of the roots have a test certificate chain stored in a file
     // named "<root>-chain.pem".
     private static final String ROOT_TO_TEST = "camerfirmachambersca";
->>>>>>> jdk-11.0.28+6
 
     // Date after the restrictions take effect
     private static final ZonedDateTime DISTRUST_DATE =
             LocalDate.of(2025, 04, 16).atStartOfDay(ZoneOffset.UTC);
 
     public static void main(String[] args) throws Exception {
 
-<<<<<<< HEAD
-        // All of the test certificates are signed with SHA-1 so we need
-=======
         // All the test certificates are signed with SHA-1, so we need
->>>>>>> jdk-11.0.28+6
         // to remove the constraint that disallows SHA-1 certificates.
         String prop = Security.getProperty("jdk.certpath.disabledAlgorithms");
         String newProp = prop.replace(", SHA1 jdkCA & usage TLSServer", "");
@@ -98,10 +70,6 @@ public static void main(String[] args) throws Exception {
         };
 
         Date notBefore = distrust.getNotBefore(DISTRUST_DATE);
-<<<<<<< HEAD
-        distrust.testCertificateChain(certPath, notBefore, tms, rootsToTest);
-=======
         distrust.testCertificateChain(CERT_PATH, notBefore, tms, ROOT_TO_TEST);
->>>>>>> jdk-11.0.28+6
     }
 }