Skip to content

Commit

Permalink
# This is a combination of 2 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

fix(build): revert maven-shade-plugin 3.3.0

Due to a bug in maven shade plugin 3.3.0, compile dependencies got stripped from `google-cloud-nio:shaded`. This bug only affects artifacts where shadedArtifactAttached=true.

Related: googleapis/java-bigtable-hbase#3600
Reference: https://issues.apache.org/jira/projects/MSHADE/issues/MSHADE-419
  • Loading branch information
BenWhitehead committed May 3, 2022
1 parent a253acc commit c300b0f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion google-cloud-nio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<!-- MSHADE-419: 3.3.0 Shade plugin causes pom to be created without compile dependencies -->
<version>3.2.4</version>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<relocations>
Expand Down
2 changes: 1 addition & 1 deletion owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
s.move(library)

s.remove_staging_dirs()
java.common_templates(excludes=["README.md", ".kokoro/build.sh"])
java.common_templates(excludes=["README.md", ".kokoro/build.sh", "renovate.json"])
6 changes: 6 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@
"^com.fasterxml.jackson.core"
],
"groupName": "jackson dependencies"
},
{
"packagePatterns": [
"^org.apache.maven.plugins:maven-shade-plugin"
],
"allowedVersions": "(,3.3.0),(3.3.0,)"
}
],
"semanticCommits": true,
Expand Down

0 comments on commit c300b0f

Please sign in to comment.