You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gi...@apache.org on 2022/03/17 13:04:11 UTC
[maven-shade-plugin] branch dependabot/maven/org.hamcrest-hamcrest-core-2.2 updated (f3836b9 -> 203a8cb)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.hamcrest-hamcrest-core-2.2
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard f3836b9 Bump hamcrest-core from 1.3 to 2.2
add 83c123d [MSHADE-36] Add option to include dependency reduced POM instead of original one
add 49524f3 [maven-release-plugin] prepare release maven-shade-plugin-3.3.0
add 6597095 [maven-release-plugin] prepare for next development iteration
add f4e3499 Bump slf4j-api from 1.7.30 to 1.7.31
add 24d5d42 Merge pull request #101 from apache/dependabot/maven/org.slf4j-slf4j-api-1.7.31
add cf2d90c [MSHADE-382] Add property to skip execution
add e8f13d6 Bump slf4j-simple from 1.7.30 to 1.7.31
add e8133dd Merge pull request #102 from apache/dependabot/maven/org.slf4j-slf4j-simple-1.7.31
add 0070183 Bump asmVersion from 9.1 to 9.2
add 146b87b [MSHADE-391] Do not write modified class files for no-op relocations
add 4d03156 update CI url
add c18d3d3 [MSHADE-401] Improve ServiceResourceTransformer
add a8d3a57 Bump jdependency from 2.6.0 to 2.7.0 (#99)
add b34dc80 run gh action with more jdk (#111)
add 2d343cd use a property for slf4j version
add c13c9bb Bump slf4j.version from 1.7.31 to 1.7.32 (#113)
add 1dca37c [MSHADE-396] Improve SourceContent Shading
add c648ccf [MSHADE-396] Add explanation to shadeSourcesContent documentation
add 54bda0a [MSHADE-405] - ShowOverlapping Uses http instead of https
add bcf2c76 Bump sisu.version from 0.3.4 to 0.3.5
add 765eb36 (doc) use shared gh action
add d2bdd60 Bump jdom2 from 2.0.6 to 2.0.6.1
add 04afab6 Shared GitHub actions v2
add 17b87aa [MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator (#123)
add 203a8cb Bump hamcrest-core from 1.3 to 2.2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f3836b9)
\
N -- N -- N refs/heads/dependabot/maven/org.hamcrest-hamcrest-core-2.2 (203a8cb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../workflows/maven-verify.yml | 18 +-
.github/workflows/maven.yml | 50 -----
README.md | 8 +-
pom.xml | 19 +-
.../invoker.properties | 5 +-
.../pom.xml | 32 ++-
.../src/main/java/com/example}/Main.java | 10 +-
.../verify.bsh | 73 +++++++
.../invoker.properties | 0
.../pom.xml | 18 +-
.../MSHADE-382_skip_execution/verify.groovy} | 7 +-
.../pom.xml | 48 +++--
.../verify.groovy | 173 +++++++++++++++
.../apache/maven/plugins/shade/DefaultShader.java | 234 +++++++++++++--------
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 56 ++++-
.../maven/plugins/shade/pom/MavenJDOMWriter.java | 18 +-
.../plugins/shade/relocation/SimpleRelocator.java | 43 +++-
.../resource/ServicesResourceTransformer.java | 81 ++-----
.../shade/resource/UseDependencyReducedPom.java | 55 +++++
.../maven/plugins/shade/DefaultShaderTest.java | 77 +++++++
.../shade/relocation/SimpleRelocatorTest.java | 52 ++++-
.../resource/ServiceResourceTransformerTest.java | 11 +-
22 files changed, 781 insertions(+), 307 deletions(-)
copy src/it/projects/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface => .github/workflows/maven-verify.yml (78%)
delete mode 100644 .github/workflows/maven.yml
copy src/it/projects/{dep-reduced-pom-relocated-result => MSHADE-36-inject-dep-reduced-pom-in-final}/invoker.properties (96%)
copy src/it/projects/{mini-jar => MSHADE-36-inject-dep-reduced-pom-in-final}/pom.xml (67%)
copy src/it/projects/{MSHADE-313_minimized-services/test/src/main/java => MSHADE-36-inject-dep-reduced-pom-in-final/src/main/java/com/example}/Main.java (77%)
create mode 100644 src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/verify.bsh
copy src/it/projects/{MSHADE-313_minimized-services => MSHADE-382_skip_execution}/invoker.properties (100%)
copy src/it/projects/{xml-transformer-ignores-dtd => MSHADE-382_skip_execution}/pom.xml (69%)
copy src/it/{mrm/repository/MSHADE-247/mshade-247-one-0.1-sources.jar/org/apache/maven/its/shade/csj/Test.java => projects/MSHADE-382_skip_execution/verify.groovy} (88%)
copy src/it/projects/{MSHADE-182 => MSHADE-391_noRelocationKeepOriginalClasses}/pom.xml (52%)
create mode 100644 src/it/projects/MSHADE-391_noRelocationKeepOriginalClasses/verify.groovy
create mode 100644 src/main/java/org/apache/maven/plugins/shade/resource/UseDependencyReducedPom.java