Skip to content

Commit

Permalink
8300642: [17u,11u] Fix DEFAULT_PROMOTED_VERSION_PRE=ea for -dev
Browse files Browse the repository at this point in the history 
Reviewed-by: clanger
  • Loading branch information
@GoeLin
GoeLin committed Jan 19, 2023
1 parent 4895228 commit b3e16fc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion make/conf/version-numbers.conf
View file
Expand Up @@ -39,4 +39,4 @@ DEFAULT_VERSION_CLASSFILE_MINOR=0
DEFAULT_VERSION_DOCS_API_SINCE=11
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
DEFAULT_JDK_SOURCE_TARGET_VERSION=17
DEFAULT_PROMOTED_VERSION_PRE=
DEFAULT_PROMOTED_VERSION_PRE=ea

3 comments on commit b3e16fc

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented on b3e16fc Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on b3e16fc Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin Could not automatically backport b3e16fc2 to openjdk/jdk11u-dev due to conflicts in the following files:

  • make/conf/version-numbers.conf

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b GoeLin-backport-b3e16fc2

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev b3e16fc287b6656e0227b30e698f544c3998843d

# Backport the commit
$ git cherry-pick --no-commit b3e16fc287b6656e0227b30e698f544c3998843d
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b3e16fc287b6656e0227b30e698f544c3998843d'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport b3e16fc287b6656e0227b30e698f544c3998843d.

Please sign in to comment.