You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2024/01/21 01:58:09 UTC
(maven-shade-plugin) branch MSHADE-420 updated (efaf023 -> d30f676)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MSHADE-420
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
discard efaf023 [MSHADE-420] check output and fail if not fixed
discard c476a66 [MSHADE-420] put system properties in MAVEN_OPTS
discard 50a6571 [MSHADE-420] create IT: 2 runs with different TZ give different jars
add c9a4425 [MSHADE-438] Update to Maven 3.2.5 (#175)
add 42f3f3a Bump xmlunit-legacy from 2.9.0 to 2.9.1
add 45dcf07 [MSHADE-400] Self-minimisation with custom entry points
add d11775c Bump mrm-maven-plugin from 1.4.1 to 1.5.0
add 04f36fd update parent POM to 39
add 80d78cc format
add a1e01c3 Merge pull request #181 from apache/39
add 7e22fe8 Update README.md (#182)
add 65eaea6 Auto-link MSHADE Jira
add 06d9058 Bump plexus-utils from 3.4.2 to 3.5.1 (#178)
add f15f26b [MSHADE-443] Fix problems with shadeSourcesContent (#185)
add b598aef [MNG-6829] Replace StringUtils#isEmpty(String) and #isNotEmpty(String) (#187)
add 57edc03 Bump asmVersion from 9.4 to 9.5
add d5d3bd7 refactor: refactor bad smell UnnecessaryToStringCall (#186)
add 2e7f87a Add git blame ignore (for reformat)
add f251212 [MSHADE-447] Do not use forked guice, use sisu from parent (#188)
add d3dd181 [MSHADE-446] Update dependencies (#189)
add fc0f784 Get rid of security alerts (#190)
add 9265316 Fix for tmp file creation
add 963e30e [maven-release-plugin] prepare release maven-shade-plugin-3.5.0
add 6a400db [maven-release-plugin] prepare for next development iteration
add e56294a [MSHADE-454] Shade Plugin does not work with JDK 20
add 64f577b [MSHADE-459] Adjust to test also with Java 21 (#196)
add c2a2e2b [MSHADE-458] Refresh download page
add d2a1552 [MSHADE-457] Upgrade Parent to 40
add bd4759b [maven-release-plugin] prepare release maven-shade-plugin-3.5.1
add 6b30767 [maven-release-plugin] prepare for next development iteration
add 7bbe9ed Bump org.codehaus.mojo:mrm-maven-plugin from 1.5.0 to 1.6.0
add d39df09 [MSHADE-463] Bump asmVersion from 9.5 to 9.6 (#200)
add 12d09ab Bump org.apache.maven.plugins:maven-plugins from 40 to 41
add 4753d8e Bump org.codehaus.plexus:plexus-utils from 3.5.1 to 4.0.0
add a7e68b4 [MSHADE-420] create IT: 2 runs with different TZ give different jars
add d7b6c48 [MSHADE-420] put system properties in MAVEN_OPTS
add d30f676 [MSHADE-420] check output and fail if not fixed
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 (efaf023)
\
N -- N -- N refs/heads/MSHADE-420 (d30f676)
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:
.asf.yaml | 11 +
.../invoker.properties => .git-blame-ignore-revs | 6 +-
.github/workflows/maven-verify.yml | 3 +
README.md | 6 +-
pom.xml | 147 +-
src/it/MSHADE-321_respectDrpFlag/verify.groovy | 1 +
src/it/projects/MSHADE-105/bundle/pom.xml | 2 +-
src/it/projects/MSHADE-105/shaded-jar/pom.xml | 2 +-
src/it/projects/MSHADE-185/verify.groovy | 1 +
.../invoker.properties | 1 +
.../MSHADE-313_minimized-services/verify.bsh | 2 +
src/it/projects/MSHADE-316/invoker.properties | 6 +-
.../pom.xml | 6 +-
.../pom.xml | 4 +-
.../verify.bsh | 4 +-
.../pom.xml | 2 +-
.../invoker.properties | 1 +
.../pom.xml | 29 +-
.../src/main/java/org/acme/Application.java} | 18 +-
.../src/main/java/org/acme/UnusedClass.java} | 3 +-
.../src/main/java/org/acme/UnusedService.java} | 4 +-
.../main/java/org/acme/UnusedServiceImplA.java} | 8 +-
.../main/java/org/acme/UnusedServiceImplB.java} | 8 +-
.../src/main/java/org/acme/UsedClass.java} | 3 +-
.../src/main/java/org/acme/UsedService.java} | 4 +-
.../main/java/org/acme/UsedServiceUnusedImpl.java} | 8 +-
.../main/java/org/acme/UsedServiceUsedImpl.java} | 8 +-
.../META-INF/services/org.acme.UnusedService} | 8 +-
.../META-INF/services/org.acme.UsedService} | 7 +-
.../verify.bsh | 27 +-
.../verify.groovy | 1 +
.../dep-reduced-pom-exclusions/verify.groovy | 1 +
.../projects/dep-reduced-pom-unique/verify.groovy | 1 +
.../dep-reduced-pom-use-base-version/verify.groovy | 1 +
src/it/projects/dep-reduced-pom/verify.groovy | 1 +
src/it/projects/mini-jar-respect-includes/pom.xml | 8 +-
.../projects/mini-jar-respect-includes/verify.bsh | 5 +-
.../plugin-descriptor-relocation/verify.groovy | 48 +-
.../project-with-reactors-included/pom.xml | 4 +-
.../projects/shading-with-java-8-sources/pom.xml | 2 +-
.../projects/shading-with-release-sources/pom.xml | 2 +-
src/it/projects/users-shader-impl/pom.xml | 2 +-
.../apache/maven/plugins/shade/DefaultShader.java | 869 +++++-----
.../apache/maven/plugins/shade/ShadeRequest.java | 50 +-
.../org/apache/maven/plugins/shade/Shader.java | 9 +-
.../apache/maven/plugins/shade/ShadingResult.java | 6 +-
.../apache/maven/plugins/shade/filter/Filter.java | 10 +-
.../maven/plugins/shade/filter/MinijarFilter.java | 355 ++--
.../maven/plugins/shade/filter/SimpleFilter.java | 108 +-
.../maven/plugins/shade/mojo/ArchiveFilter.java | 18 +-
.../maven/plugins/shade/mojo/ArtifactId.java | 78 +-
.../maven/plugins/shade/mojo/ArtifactSelector.java | 67 +-
.../maven/plugins/shade/mojo/ArtifactSet.java | 12 +-
.../plugins/shade/mojo/PackageRelocation.java | 21 +-
.../maven/plugins/shade/mojo/RelativizePath.java | 79 +-
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 1213 ++++++--------
.../apache/maven/plugins/shade/pom/Counter.java | 19 +-
.../maven/plugins/shade/pom/MavenJDOMWriter.java | 1772 +++++++++-----------
.../apache/maven/plugins/shade/pom/PomWriter.java | 46 +-
.../maven/plugins/shade/relocation/Relocator.java | 18 +-
.../plugins/shade/relocation/SimpleRelocator.java | 236 ++-
.../resource/AbstractCompatibilityTransformer.java | 17 +-
.../resource/ApacheLicenseResourceTransformer.java | 30 +-
.../resource/ApacheNoticeResourceTransformer.java | 209 +--
.../shade/resource/AppendingTransformer.java | 47 +-
.../resource/ComponentsXmlResourceTransformer.java | 175 +-
.../resource/DontIncludeResourceTransformer.java | 43 +-
.../shade/resource/GroovyResourceTransformer.java | 105 +-
.../shade/resource/IncludeResourceTransformer.java | 49 +-
.../resource/ManifestResourceTransformer.java | 145 +-
.../resource/PluginXmlResourceTransformer.java | 188 +--
.../resource/ReproducibleResourceTransformer.java | 14 +-
.../ResourceBundleAppendingTransformer.java | 65 +-
.../shade/resource/ResourceTransformer.java | 18 +-
.../resource/ServicesResourceTransformer.java | 65 +-
.../resource/SisuIndexResourceTransformer.java | 57 +-
.../shade/resource/UseDependencyReducedPom.java | 19 +-
.../shade/resource/XmlAppendingTransformer.java | 89 +-
.../properties/MicroprofileConfigTransformer.java | 11 +-
.../OpenWebBeansPropertiesTransformer.java | 11 +-
.../resource/properties/PropertiesTransformer.java | 148 +-
.../resource/properties/SortedProperties.java | 41 +-
.../properties/io/NoCloseOutputStream.java | 30 +-
.../io/SkipPropertiesDateLineWriter.java | 56 +-
src/site/xdoc/download.xml.vm | 117 +-
.../maven/plugins/shade/DefaultShaderTest.java | 538 +++---
.../org/apache/maven/plugins/shade/MockShader.java | 20 +-
.../CustomReproducibleResourceTransformer.java | 39 +-
.../plugins/shade/filter/MinijarFilterTest.java | 149 +-
.../plugins/shade/filter/SimpleFilterTest.java | 128 +-
.../maven/plugins/shade/mojo/ArtifactIdTest.java | 269 ++-
.../plugins/shade/mojo/ArtifactSelectorTest.java | 55 +-
.../plugins/shade/mojo/RelativizePathTest.java | 37 +-
.../maven/plugins/shade/mojo/ShadeMojoTest.java | 297 ++--
.../relocation/SimpleRelocatorParameterTest.java | 37 +-
.../shade/relocation/SimpleRelocatorTest.java | 390 +++--
.../ApacheLicenseResourceTransformerTest.java | 32 +-
...cheNoticeResourceTransformerParameterTests.java | 102 +-
.../ApacheNoticeResourceTransformerTest.java | 32 +-
.../shade/resource/AppendingTransformerTest.java | 28 +-
.../ComponentsXmlResourceTransformerTest.java | 45 +-
.../resource/GroovyResourceTransformerTest.java | 161 +-
.../resource/ManifestResourceTransformerTest.java | 182 +-
.../resource/ReproducibleResourceTransformer.java | 16 +-
.../ResourceBundleAppendingTransformerTest.java | 105 +-
.../resource/ServiceResourceTransformerTest.java | 145 +-
.../resource/XmlAppendingTransformerTest.java | 28 +-
.../properties/PropertiesTransformerTest.java | 89 +-
.../shade/resource/rule/TransformerTesterRule.java | 156 +-
109 files changed, 4537 insertions(+), 5694 deletions(-)
copy src/it/projects/MSHADE-313_minimized-services/invoker.properties => .git-blame-ignore-revs (91%)
copy src/it/projects/{MSHADE-313_minimized-services => MSHADE-400_self-minimized-services}/invoker.properties (95%)
copy src/it/projects/{MSHADE-182 => MSHADE-400_self-minimized-services}/pom.xml (70%)
copy src/it/projects/{project-with-reactors-included/two/src/main/java/org/apache/maven/plugins/shade/its/two/App.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/Application.java} (82%)
copy src/it/projects/{MSHADE-284_shadeTestJar/impl/src/main/java/Impl.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UnusedClass.java} (94%)
copy src/it/projects/{MSHADE-284_shadeTestJar/impl/src/main/java/Impl.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UnusedService.java} (91%)
copy src/it/projects/{MSHADE-284_shadeTestJar/api/src/test/java/ApiTest.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UnusedServiceImplA.java} (86%)
copy src/it/projects/{MSHADE-284_shadeTestJar/api/src/test/java/ApiTest.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UnusedServiceImplB.java} (86%)
copy src/it/projects/{MSHADE-284_shadeTestJar/impl/src/main/java/Impl.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UsedClass.java} (95%)
copy src/it/projects/{MSHADE-284_shadeTestJar/impl/src/main/java/Impl.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UsedService.java} (91%)
copy src/it/projects/{MSHADE-284_shadeTestJar/api/src/test/java/ApiTest.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UsedServiceUnusedImpl.java} (86%)
copy src/it/projects/{MSHADE-284_shadeTestJar/api/src/test/java/ApiTest.java => MSHADE-400_self-minimized-services/src/main/java/org/acme/UsedServiceUsedImpl.java} (86%)
copy src/it/projects/{MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface => MSHADE-400_self-minimized-services/src/main/resources/META-INF/services/org.acme.UnusedService} (82%)
copy src/it/projects/{MSHADE-313_minimized-services/invoker.properties => MSHADE-400_self-minimized-services/src/main/resources/META-INF/services/org.acme.UsedService} (88%)
copy src/it/projects/{MSHADE-313_minimized-services => MSHADE-400_self-minimized-services}/verify.bsh (68%)