Skip to content

Commit

Permalink
8322321: Add man page doc for -XX:+VerifySharedSpaces
Browse files Browse the repository at this point in the history
Reviewed-by: dholmes, ccheung
  • Loading branch information
iklam committed Dec 20, 2023
1 parent 97db670 commit f7dc257
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/java.base/share/man/java.1
Expand Up @@ -1579,6 +1579,15 @@ Specifies the path and name of the class data sharing (CDS) archive file
See \f[B]Application Class Data Sharing\f[R].
.RE
.TP
\f[V]-XX:+VerifySharedSpaces\f[R]
If this option is specified, the JVM will load a CDS archive file only
if it passes an integrity check based on CRC32 checksums.
The purpose of this flag is to check for unintentional damage to CDS
archive files in transmission or storage.
To guarantee the security and proper operation of CDS, the user must
ensure that the CDS archive files used by Java applications cannot be
modified without proper authorization.
.TP
\f[V]-XX:SharedArchiveConfigFile=\f[R]\f[I]shared_config_file\f[R]
Specifies additional shared data added to the archive file.
.TP
Expand Down

10 comments on commit f7dc257

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@shipilev
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on f7dc257 Jan 4, 2024

Choose a reason for hiding this comment

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

@shipilev the backport was successfully created on the branch backport-shipilev-f7dc257a in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit f7dc257a from the openjdk/jdk repository.

The commit being backported was authored by Ioi Lam on 20 Dec 2023 and was reviewed by David Holmes and Calvin Cheung.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-shipilev-f7dc257a:backport-shipilev-f7dc257a
$ git checkout backport-shipilev-f7dc257a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-shipilev-f7dc257a

@shipilev
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@shipilev
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@jmtd
Copy link

@jmtd jmtd commented on f7dc257 Jan 4, 2024

Choose a reason for hiding this comment

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

@shipilev you beat me to it !

@openjdk
Copy link

@openjdk openjdk bot commented on f7dc257 Jan 4, 2024

Choose a reason for hiding this comment

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

@shipilev Could not automatically backport f7dc257a to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/java.base/share/man/java.1

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-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/jdk17u-dev.git master:master

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

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

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

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

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

@openjdk
Copy link

@openjdk openjdk bot commented on f7dc257 Jan 4, 2024

Choose a reason for hiding this comment

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

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

  • src/java.base/share/man/java.1

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.git master:master

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

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

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

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

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

@shipilev
Copy link
Member

Choose a reason for hiding this comment

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

@shipilev you beat me to it !

Feel free to do 17u and 11u :) I can go do Atomics/C2 backports.

@jmtd
Copy link

@jmtd jmtd commented on f7dc257 Jan 4, 2024

Choose a reason for hiding this comment

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

I'll take a look at17 at least. Have fun! (P.S.: Are you going to FOSDEM?)

Please sign in to comment.