This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch agent/679-notice-year-output-timestamp
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
discard 90745d76 Mark the copyright year settings @since 3.7.0
discard 5d88bec7 [#679] Take the NOTICE copyright year from
project.build.outputTimestamp
add 07f3df32 Require Maven 3.9.0
add cd62ffb1 [#595] Fail the build when an IncludeResourceTransformer file
does not exist
add e0b4ab35 Compile against the Maven 3.9.x API
add 65b9ef4a [#876] Let IncludeResourceTransformer replace an existing
entry
add 3d9d5752 [MSHADE-847] Use explicit ASM API in remapper
add 2043101b Use project name in generated Apache NOTICE
add e9d6e9da Prepare 3.7.0
add 4c080821 [#679] Take the NOTICE copyright year from
project.build.outputTimestamp
add ad780e6a Mark the copyright year settings @since 3.7.0
add 41c942b1 Configure the NOTICE transformer in one pass over the
transformers
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 (90745d76)
\
N -- N -- N refs/heads/agent/679-notice-year-output-timestamp
(41c942b1)
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:
.github/dependabot.yml | 16 ++++
pom.xml | 6 +-
.../pom.xml | 25 ++----
.../src/main/resources/META-INF/NOTICE | 0
.../verify.groovy | 8 +-
.../include-resource-existing-entry/README.txt | 1 +
.../pom.xml | 12 +--
.../src/main/resources/META-INF/README.txt | 1 +
.../verify.groovy | 5 +-
.../invoker.properties | 0
.../pom.xml | 13 ++--
.../verify.groovy | 4 +-
.../apache/maven/plugins/shade/DefaultShader.java | 5 ++
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 18 +++--
.../resource/ApacheNoticeResourceTransformer.java | 13 ++++
.../shade/resource/IncludeResourceTransformer.java | 10 ++-
.../markdown/examples/resource-transformers.md.vm | 5 +-
.../ApacheNoticeResourceTransformerTest.java | 19 +++++
.../resource/IncludeResourceTransformerTest.java | 88 ++++++++++++++++++++++
19 files changed, 198 insertions(+), 51 deletions(-)
copy src/it/projects/{xml-transformer-ignores-dtd =>
apache-notice-project-name}/pom.xml (71%)
copy src/it/projects/{apache-notice-output-timestamp =>
apache-notice-project-name}/src/main/resources/META-INF/NOTICE (100%)
copy src/it/projects/{apache-notice-output-timestamp =>
apache-notice-project-name}/verify.groovy (73%)
create mode 100644 src/it/projects/include-resource-existing-entry/README.txt
copy src/it/projects/{apache-notice-output-timestamp =>
include-resource-existing-entry}/pom.xml (83%)
create mode 100644
src/it/projects/include-resource-existing-entry/src/main/resources/META-INF/README.txt
copy src/it/projects/{apache-notice-output-timestamp =>
include-resource-existing-entry}/verify.groovy (85%)
copy src/it/projects/{extrajar-missing-file =>
include-resource-missing-file}/invoker.properties (100%)
copy src/it/projects/{apache-notice-output-timestamp =>
include-resource-missing-file}/pom.xml (80%)
copy src/it/projects/{MSHADE-382_skip_execution =>
include-resource-missing-file}/verify.groovy (83%)
create mode 100644
src/test/java/org/apache/maven/plugins/shade/resource/IncludeResourceTransformerTest.java
