From 5a52128adcf4988a87681f5af34611cfb82f5a9f Mon Sep 17 00:00:00 2001
From: Elif Aslan <elifasln@amazon.com>
Date: Wed, 27 Dec 2023 22:02:22 +0000
Subject: [PATCH] Merge 65a9ab1a0da41a803f9bffabeb15092722f9a2e4

---
 CHANGELOG.md    | 2 +-
 README.md       | 5 +----
 build.gradle    | 6 +++---
 settings.gradle | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8e6bf3a71c..f5c88135cff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Change Log for Amazon Corretto JDK
 
-The following sections describe the changes for each release of Amazon Corretto JDK.
+The following sections describe the changes for each release of Amazon Corretto 22.
diff --git a/README.md b/README.md
index c3671f5ba8b..4eeb0caef8e 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,7 @@ Please read these files: "LICENSE", "ADDITIONAL_LICENSE_INFO", "ASSEMBLY_EXCEPTI
 ### Branches
 
 _develop_
-: The default branch. The branch that consumes development and patches to upstream jdk. Corretto builds are generated from this branch.
-
-_upstream-jdk_
-: The branch is similar to master at [openjdk/jdk](https://github.com/openjdk/jdk). This branch merges into develop.
+: The default branch. The branch that consumes development and patches to upstream [openjdk/jdk22](https://github.com/openjdk/jdk22). Corretto builds are generated from this branch.
 
 ### OpenJDK Readme
 ```
diff --git a/build.gradle b/build.gradle
index 6399e45e064..74ada8ea10e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ allprojects {
         buildRoot = file("$buildDir/buildRoot")
         distributionDir = file("$buildDir/distributions")
         packageInfo = [
-                url       : "https://github.com/corretto/corretto-jdk",
+                url       : "https://github.com/corretto/corretto-${project.version.major}",
                 vendor    : 'Amazon',
                 packager  : 'Amazon',
                 description  : 'Amazon Corretto\'s packaging of the runtime core elements of the OpenJDK code.',
@@ -91,8 +91,8 @@ allprojects {
                 '--with-jvm-features=zgc',
                 "--with-version-build=${project.version.build}",
                 '--with-version-pre=',
-                "--with-vendor-bug-url=https://github.com/corretto/corretto-jdk/issues/",
-                "--with-vendor-vm-bug-url=https://github.com/corretto/corretto-jdk/issues/",
+                "--with-vendor-bug-url=https://github.com/corretto/corretto-${project.version.major}/issues/",
+                "--with-vendor-vm-bug-url=https://github.com/corretto/corretto-${project.version.major}/issues/",
                 '--with-vendor-name=Amazon.com Inc.',
                 '--with-vendor-url=https://aws.amazon.com/corretto/',
                 "--with-vendor-version-string=Corretto-${project.version.full}"
diff --git a/settings.gradle b/settings.gradle
index dd51067ddcb..53c357b836c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-rootProject.name = 'corretto-jdk'
+rootProject.name = 'corretto-22'
 
 import org.apache.tools.ant.taskdefs.condition.Os