Skip to content

Rename the generated apijar files to -api.jar#14909

Merged
dweiss merged 1 commit intoapache:mainfrom
dweiss:rename-apijars
Jul 7, 2025
Merged

Rename the generated apijar files to -api.jar#14909
dweiss merged 1 commit intoapache:mainfrom
dweiss:rename-apijars

Conversation

@dweiss
Copy link
Contributor

@dweiss dweiss commented Jul 7, 2025

No description provided.

@dweiss dweiss added the skip-changelog Apply to PRs that don't need a changelog entry, stopping the automated changelog check. label Jul 7, 2025
@dweiss dweiss added this to the 11.0.0 milestone Jul 7, 2025
Copy link
Member

@rmuir rmuir left a comment

Choose a reason for hiding this comment

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

Looks good. I expect dev-tools/scripts/smokeTestRelease.py:630 to complain, but we can fix it.

@dweiss
Copy link
Contributor Author

dweiss commented Jul 7, 2025

Looks good. I expect dev-tools/scripts/smokeTestRelease.py:630 to complain, but we can fix it.

I think this only checks the top-level files? I keep an eye on the nightly run for this so if it complains, I'll follow-up.

@dweiss dweiss merged commit 6ef0273 into apache:main Jul 7, 2025
8 checks passed
@dweiss dweiss deleted the rename-apijars branch July 7, 2025 11:24
@rmuir
Copy link
Member

rmuir commented Jul 7, 2025

@dweiss here would be my proposed mod (a bit hacky, but it should do the trick if we need)

diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index fbcb0586cd2..17b816162fc 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -633,7 +633,7 @@ def verifyUnpacked(java: Any, artifact: str, unpackPath: str, gitRevision: str,
 
   if isSrc:
     print("    make sure no JARs/WARs in src dist...")
-    lines = os.popen("find . -name \\*.jar").readlines()
+    lines = os.popen("find . -name \\*.jar -not -name \\*-api.jar").readlines()
     if len(lines) != 0:
       print("    FAILED:")
       for line in lines:

@dweiss
Copy link
Contributor Author

dweiss commented Jul 7, 2025

Oh, I see it now. I'll add it with the reference to this issue.

@dweiss
Copy link
Contributor Author

dweiss commented Jul 7, 2025

Copy link
Contributor

@uschindler uschindler left a comment

Choose a reason for hiding this comment

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

OK.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

module:core/other skip-changelog Apply to PRs that don't need a changelog entry, stopping the automated changelog check.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants