Skip to content

Commit

Permalink
8294840: langtools OptionalDependencyTest.java use File.pathSeparator
Browse files Browse the repository at this point in the history
Reviewed-by: alanb
  • Loading branch information
MBaesken committed Oct 5, 2022
1 parent ee6c391 commit f531dae
Showing 1 changed file with 3 additions and 2 deletions.
Expand Up @@ -30,6 +30,7 @@
* @summary Tests optional dependency handling
*/

import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Set;
Expand Down Expand Up @@ -71,7 +72,7 @@ public void compileAll() throws Exception {
*/
@Test
public void optionalDependenceNotResolved() {
JdepsRunner jdepsRunner = new JdepsRunner("--module-path", "m2.jar:m3.jar",
JdepsRunner jdepsRunner = new JdepsRunner("--module-path", "m2.jar" + File.pathSeparator + "m3.jar",
"--inverse",
"--package", "p2", "m1.jar");
int rc = jdepsRunner.run(true);
Expand All @@ -83,7 +84,7 @@ public void optionalDependenceNotResolved() {
*/
@Test
public void optionalDependenceResolved() {
JdepsRunner jdepsRunner = new JdepsRunner("--module-path", "m2.jar:m3.jar",
JdepsRunner jdepsRunner = new JdepsRunner("--module-path", "m2.jar" + File.pathSeparator + "m3.jar",
"--inverse", "--add-modules", "m3",
"--package", "p2", "m1.jar");
int rc = jdepsRunner.run(true);
Expand Down

7 comments on commit f531dae

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@MBaesken
Copy link
Member Author

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 f531dae Oct 25, 2022

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 f531dae4 to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/langtools/tools/jdeps/optionalDependency/OptionalDependencyTest.java

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

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

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

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

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

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

@MBaesken
Copy link
Member Author

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 f531dae Oct 25, 2022

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch MBaesken-backport-f531dae4 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-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 f531dae4 from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 5 Oct 2022 and was reviewed by Alan Bateman.

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/jdk17u-dev:

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

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk19u

@openjdk
Copy link

@openjdk openjdk bot commented on f531dae Nov 3, 2022

Choose a reason for hiding this comment

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

@RealCLanger the backport was successfully created on the branch RealCLanger-backport-f531dae4 in my personal fork of openjdk/jdk19u. To create a pull request with this backport targeting openjdk/jdk19u: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 f531dae4 from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 5 Oct 2022 and was reviewed by Alan Bateman.

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/jdk19u:

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

Please sign in to comment.