fix: module name → com.google.errorprone.annotations
#4317
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sgammon
commented
Mar 12, 2024
| @@ -14,7 +14,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
|
|
|||
| open module com.google.errorprone.annotation { | |||
| open module com.google.errorprone.annotations { | |||
There was a problem hiding this comment.
Module fix. One million palms on face.
Comment on lines
151
to
-156
| Bundle-SymbolicName: com.google.$<replacestring;$<replacestring;${project.artifactId};^error_prone;errorprone>;_;.> | ||
| Automatic-Module-Name: $<Bundle-SymbolicName> | ||
| -exportcontents: com.google.errorprone*,!META-INF.* | ||
| -exportcontents: com.google.errorprone* | ||
| -noextraheaders: true | ||
| -removeheaders: Private-Package | ||
| -fixupmessages: ^Classes found in the wrong directory: .* |
There was a problem hiding this comment.
Nice silver lining: the OSGI configuration at the top level is now completely restored to what it was before. Only the annotations module has OSGi build customizations. In fact, my original JPMS PR (after this) is probably localized completely to annotations/pom.xml.
- fix: name in `module-info.java` for `annotations` module - fix: don't emit `Automatic-Module-Name` in `annotations` module - chore: preserve all other aspects of OSGi and JAR builds Relates-To: google#4311 Signed-off-by: Sam Gammon <[email protected]>
sgammon
force-pushed
the
fix/module-name
branch
from
21f6869 to
bc52c58
Compare
sgammon
commented
Mar 12, 2024
Comment on lines
+108
to
+122
| <!-- | ||
| The OSGi bundle build is overridden here to allow for MRJAR classes in the | ||
| versioned class space underneath META-INF. | ||
|
|
||
| The `annotations` module also should not have an `Automatic-Module-Name`. | ||
| Otherwise, these flags should stay in-sync with the same block in the root | ||
| `pom.xml`. | ||
| --> | ||
| <bnd><![CDATA[ | ||
| Bundle-SymbolicName: com.google.errorprone.annotations | ||
| -exportcontents: com.google.errorprone*,!META-INF.* | ||
| -noextraheaders: true | ||
| -removeheaders: Private-Package | ||
| -fixupmessages: ^Classes found in the wrong directory: .* | ||
| ]]></bnd> |
There was a problem hiding this comment.
Fix: OSGI plugin now has a dedicated run within the child project, and suppresses the parent run with <phase>none</phase>.
cushon
approved these changes
Mar 12, 2024
copybara-service bot
pushed a commit
that referenced
this pull request
Mar 12, 2024
## Summary Fixes the module name: ~~`com.google.errorprone.annotation`~~ → `com.google.errorprone.annotations`. Amends the OSGi build not to include `Automatic-Module-Name` in the `MANIFEST.MF` for the `annotations` project. ## Changelog - fix: name in `module-info.java` for `annotations` module - fix: don't emit `Automatic-Module-Name` in `annotations` module - chore: preserve all other aspects of OSGi and JAR builds Relates to [discussion](#4311 (comment)) in #4311. Double checked for correct JAR structure; see [these screenshots](#4311 (comment)). cc / @cushon @ben-manes Fixes #4317 FUTURE_COPYBARA_INTEGRATE_REVIEW=#4317 from sgammon:fix/module-name bc52c58 PiperOrigin-RevId: 615074017
copybara-service bot
pushed a commit
that referenced
this pull request
Mar 12, 2024
## Summary Fixes the module name: ~~`com.google.errorprone.annotation`~~ → `com.google.errorprone.annotations`. Amends the OSGi build not to include `Automatic-Module-Name` in the `MANIFEST.MF` for the `annotations` project. ## Changelog - fix: name in `module-info.java` for `annotations` module - fix: don't emit `Automatic-Module-Name` in `annotations` module - chore: preserve all other aspects of OSGi and JAR builds Relates to [discussion](#4311 (comment)) in #4311. Double checked for correct JAR structure; see [these screenshots](#4311 (comment)). cc / @cushon @ben-manes Fixes #4317 FUTURE_COPYBARA_INTEGRATE_REVIEW=#4317 from sgammon:fix/module-name bc52c58 PiperOrigin-RevId: 615074017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fixes the module name:
com.google.errorprone.annotationcom.google.errorprone.annotations. Amends the OSGi build not to includeAutomatic-Module-Namein theMANIFEST.MFfor theannotationsproject.Changelog
module-info.javaforannotationsmoduleAutomatic-Module-NameinannotationsmoduleRelates to discussion in #4311. Double checked for correct JAR structure; see these screenshots.
cc / @cushon @ben-manes