Skip to content

8344925: translet-name ignored when package-name is also set #23446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from

Conversation

JoeWang-Java
Copy link
Member

@JoeWang-Java JoeWang-Java commented Feb 4, 2025

Fix an issue where the translet-name is incorrectly set when the package-name is also specified.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8344925: translet-name ignored when package-name is also set (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23446/head:pull/23446
$ git checkout pull/23446

Update a local copy of the PR:
$ git checkout pull/23446
$ git pull https://git.openjdk.org/jdk.git pull/23446/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23446

View PR using the GUI difftool:
$ git pr show -t 23446

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23446.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 4, 2025

👋 Welcome back joehw! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Feb 4, 2025

@JoeWang-Java This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8344925: translet-name ignored when package-name is also set

Reviewed-by: lancea, iris, naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 39 new commits pushed to the master branch:

  • 1079147: 8348570: CTW: Expose the code hidden by uncommon traps
  • 1a74ee6: 8349092: File.getFreeSpace violates specification if quotas are in effect (win)
  • 0181030: 8349006: File.getCanonicalPath should remove "(on UNIX platforms)" from its specification
  • ed8945a: 8347377: Add validation checks for ICC_Profile header fields
  • 1ab1c1d: 8349058: 'internal proprietary API' warnings make javac warnings unusable
  • eb84702: 8349513: Remove unused BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libTracePinnedThreads
  • f12d2de: 8345212: Since checker should better handle non numeric values
  • 5ec1aae: 8347842: ThreadPoolExecutor specification discusses RuntimePermission
  • 3fbae32: 8349465: [UBSAN] test_os_reserve_between.cpp reported applying non-zero offset to null pointer
  • e0487c7: 8346777: Add missing const declarations and rename variables
  • ... and 29 more: https://git.openjdk.org/jdk/compare/bad39b6d8892ba9b86bc81bf01108a1df617defb...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 4, 2025
@openjdk
Copy link

openjdk bot commented Feb 4, 2025

@JoeWang-Java The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Feb 4, 2025
@mlbridge
Copy link

mlbridge bot commented Feb 4, 2025

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented Feb 5, 2025

@jerboaa
Copy link
Contributor

jerboaa commented Feb 5, 2025

@JoeWang-Java Have you seen https://git.openjdk.org/jdk/pull/22425?

Just mentioning since it looks like a duplicate proposal.

@JoeWang-Java
Copy link
Member Author

@JoeWang-Java Have you seen https://git.openjdk.org/jdk/pull/22425?

Just mentioning since it looks like a duplicate proposal.

Indeed, I missed that. The right procedure to take over an issue is to ask the person assigned to the bug, that would avoid any confusion and duplicate effort. Unfortunately, he never asked me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 6, 2025
String path = (destination != null) ? destination + expected : new File(xslFile).getParent() + expected;

if (generateTranslet) {
//Files.list(Path.of(path)).forEach(System.out::println);
Copy link
Contributor

Choose a reason for hiding this comment

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

Left over from testing the test? I'd suggest to remove this commented out code.

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed. Thanks.

public class JUnitTestUtil {
public static final String CLS_DIR = System.getProperty("test.classes");
public static final String SRC_DIR = System.getProperty("test.src");
public static final boolean isWindows = System.getProperty("os.name").contains("Windows");
Copy link
Member

Choose a reason for hiding this comment

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

It is good as it stands, but Platform.isWindows() can be used here

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated using the test lib. Thanks.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Feb 6, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 6, 2025
@JoeWang-Java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 7, 2025

Going to push as commit 3989a19.
Since your change was applied there have been 41 commits pushed to the master branch:

  • 1eb54e4: 8346049: jdk/test/lib/security/timestamp/TsaServer.java warnings
  • a0c7f66: 8349508: runtime/cds/appcds/TestParallelGCWithCDS.java should not check for specific output
  • 1079147: 8348570: CTW: Expose the code hidden by uncommon traps
  • 1a74ee6: 8349092: File.getFreeSpace violates specification if quotas are in effect (win)
  • 0181030: 8349006: File.getCanonicalPath should remove "(on UNIX platforms)" from its specification
  • ed8945a: 8347377: Add validation checks for ICC_Profile header fields
  • 1ab1c1d: 8349058: 'internal proprietary API' warnings make javac warnings unusable
  • eb84702: 8349513: Remove unused BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libTracePinnedThreads
  • f12d2de: 8345212: Since checker should better handle non numeric values
  • 5ec1aae: 8347842: ThreadPoolExecutor specification discusses RuntimePermission
  • ... and 31 more: https://git.openjdk.org/jdk/compare/bad39b6d8892ba9b86bc81bf01108a1df617defb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 7, 2025
@openjdk openjdk bot closed this Feb 7, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 7, 2025
@openjdk
Copy link

openjdk bot commented Feb 7, 2025

@JoeWang-Java Pushed as commit 3989a19.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

5 participants