Merge 65a9ab1

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.

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
 ```

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}"

settings.gradle

@@ -1,4 +1,4 @@
-rootProject.name = 'corretto-jdk'
+rootProject.name = 'corretto-22'
 
 import org.apache.tools.ant.taskdefs.condition.Os