Skip to content

Commit

Permalink
8331077: nroff man page update for jar tool
Browse files Browse the repository at this point in the history 
Reviewed-by: jjg, coffeys
  • Loading branch information
@coffeys
Weibing Xiao authored and coffeys committed May 2, 2024
1 parent cccc953 commit c21672d
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/jdk.jartool/share/man/jar.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ created or a non-modular JAR file being updated.
Specifies the location of module dependence for generating the hash.
.TP
\f[V]\[at]\f[R]\f[I]file\f[R]
Reads \f[V]jar\f[R] options and file names from a text file.
Reads \f[V]jar\f[R] options and file names from a text file as if they
were supplied on the command line
.SH OPERATION MODIFIERS VALID ONLY IN CREATE, UPDATE, AND GENERATE-INDEX MODES
.PP
You can use the following options to customize the actions of the create
Expand Down Expand Up @@ -330,11 +331,14 @@ class files from the file \f[V]classes.list\f[R].
.PP
\f[B]Note:\f[R]
.PP
To shorten or simplify the \f[V]jar\f[R] command, you can specify
arguments in a separate text file and pass it to the \f[V]jar\f[R]
command with the at sign (\f[V]\[at]\f[R]) as a prefix.
To shorten or simplify the \f[V]jar\f[R] command, you can provide an arg
file that lists the files to include in the JAR file and pass it to the
\f[V]jar\f[R] command with the at sign (\f[V]\[at]\f[R]) as a prefix.
.RS
.PP
\f[V]jar --create --file my.jar \[at]classes.list\f[R]
.RE
.PP
If one or more entries in the arg file cannot be found then the jar
command fails without creating the JAR file.
.RE

5 comments on commit c21672d

@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

@TheRealMDoerr
Copy link
Contributor

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 c21672d May 31, 2024

Choose a reason for hiding this comment

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

@TheRealMDoerr the backport was successfully created on the branch backport-TheRealMDoerr-c21672d8 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 c21672d8 from the openjdk/jdk repository.

The commit being backported was authored by Weibing Xiao on 2 May 2024 and was reviewed by Jonathan Gibbons and Sean Coffey.

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-TheRealMDoerr-c21672d8:backport-TheRealMDoerr-c21672d8
$ git checkout backport-TheRealMDoerr-c21672d8
# 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-TheRealMDoerr-c21672d8

@MBaesken
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

@openjdk
Copy link

@openjdk openjdk bot commented on c21672d Jul 24, 2024

Choose a reason for hiding this comment

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

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

  • src/jdk.jartool/share/man/jar.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-MBaesken-c21672d8-master

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

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

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

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

Below you can find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Weibing Xiao on 2 May 2024 and was reviewed by Jonathan Gibbons and Sean Coffey.

Thanks!

Please sign in to comment.