Skip to content
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

Cherry picked the fix for the bad packaging back to the main branch #602

Merged
merged 1 commit into from
Sep 15, 2021

Conversation

eeverman
Copy link
Owner

@eeverman eeverman commented Sep 15, 2021

  • Fix an issue where the sonotype plugin does not upload artifacts if the last one is marked as 'don't upload'
  • rm mystery logback file - not related to the project
  • Fix warnings about duplicate MANIFEST.MF files in the shaded andhow jar

All Submissions:

Have you checked that...

  • Your pull request is to the main branch
  • Your code is up to date with the latest code from the main
  • You followed the guidelines in our Developer Guide?
  • Your code does not decrease test coverage (maybe it improves coverage!!)
  • If this is related to an issue, please include a link to the issue with the 'Fixes #XXX' syntax.

* Fix an issue where the sonotype plugin does not upload artifacts if the last one is marked as 'don't upload'
* rm mystery logback file - not related to the project
* Fix warnings about duplicate MANIFEST.MF files in the shaded andhow jar
@eeverman
Copy link
Owner Author

This is related to Issue #592. The initial fix was applied to 'homepage', i.e., it was on the current release. This MR applies that to the main development branch.

@eeverman eeverman requested a review from alex-kar September 15, 2021 04:49
@codecov
Copy link

codecov bot commented Sep 15, 2021

Codecov Report

Merging #602 (f718dde) into main (563fee4) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##               main     #602   +/-   ##
=========================================
  Coverage     84.86%   84.86%           
  Complexity       18       18           
=========================================
  Files           133      133           
  Lines          3667     3667           
  Branches        447      447           
=========================================
  Hits           3112     3112           
  Misses          408      408           
  Partials        147      147           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 93e93e4...f718dde. Read the comment docs.

</plugins>
</build>
</profile>
</profiles>
Copy link
Owner Author

Choose a reason for hiding this comment

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

I basically moved this profile section from the parent pom, where it applied to all modules, to just this pom. The annotation processor has special requirements for compilation:

  • It needs tools.jar (JDK8) or --add-modules=jdk.compiler (JDK9+) to compile.
  • It also needs to turn off annotation processing with the proc:none compile flag, so that the compiler doesn't attempt to have the annotation processor its compiling process the annotations in the code its compiling.

The tools.jar dependency of JDK8 caused issues b/c w/ the prior setup (declared in the parent pom), the andhow module inherited the dependency. Thus, it ended up as a dependency in the main distributed artifact's pom file, forcing projects using andhow to provide it. Tools.jar is not available via Maven repos, so this caused other projects to fail unless they were on linux w/ JDK 8.

</root>

<logger name="gov.usgs.wma.gcmrc" level="INFO" />
</configuration>
Copy link
Owner Author

Choose a reason for hiding this comment

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

This is a random file - It shouldn't have been in the project. I'm sure I put it in there accidentally - It looks like a file from work.

@@ -351,6 +351,7 @@
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<skipLocalStaging>true</skipLocalStaging>
Copy link
Owner Author

Choose a reason for hiding this comment

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

This was a new issue - It turns out that if the last module is skipped for nexus deploy and nexus is in 'defer' mode (it waits to see if the entire build was successful before uploading artifacts), nexus forgets to go back and do the rest of the uploads.

Its a bug, but apparently they don't plan to fix it:
https://issues.sonatype.org/browse/NEXUS-9138
(Thats me complaining in the last comment on that ticket)

@eeverman eeverman merged commit 83366cb into main Sep 15, 2021
@eeverman eeverman deleted the apply-Issue592-patch-to-fix-pkg-err branch September 28, 2021 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants