You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2024/12/19 22:12:21 UTC
(maven-shade-plugin) branch override created (now c6d1308)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch override
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
at c6d1308 annotate overrides
This branch includes the following new commits:
new c6d1308 annotate overrides
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-shade-plugin) 01/01: annotate overrides
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch override
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit c6d1308d837e58585c62e8f238d3ba4d2f2bfb62
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Thu Dec 19 17:12:12 2024 -0500
annotate overrides
---
.../plugins/shade/resource/ApacheLicenseResourceTransformer.java | 4 ++++
.../plugins/shade/resource/ComponentsXmlResourceTransformer.java | 5 +++++
.../maven/plugins/shade/resource/PluginXmlResourceTransformer.java | 5 +++++
3 files changed, 14 insertions(+)
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
index b14452c..f319717 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
@@ -35,21 +35,25 @@ public class ApacheLicenseResourceTransformer extends AbstractCompatibilityTrans
private static final String LICENSE_MD_PATH = "META-INF/LICENSE.md";
+ @Override
public boolean canTransformResource(String resource) {
return LICENSE_PATH.equalsIgnoreCase(resource)
|| LICENSE_TXT_PATH.regionMatches(true, 0, resource, 0, LICENSE_TXT_PATH.length())
|| LICENSE_MD_PATH.regionMatches(true, 0, resource, 0, LICENSE_MD_PATH.length());
}
+ @Override
public void processResource(String resource, InputStream is, List<Relocator> relocators, long time)
throws IOException {
// no op
}
+ @Override
public boolean hasTransformedResource() {
return false;
}
+ @Override
public void modifyOutputStream(JarOutputStream os) throws IOException {
// no op
}
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
index 9a5269a..ef507d0 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java
@@ -47,16 +47,19 @@ public class ComponentsXmlResourceTransformer extends AbstractCompatibilityTrans
public static final String COMPONENTS_XML_PATH = "META-INF/plexus/components.xml";
+ @Override
public boolean canTransformResource(String resource) {
return COMPONENTS_XML_PATH.equals(resource);
}
+ @Override
public void processResource(String resource, InputStream is, List<Relocator> relocators, long time)
throws IOException {
Xpp3Dom newDom;
try {
BufferedInputStream bis = new BufferedInputStream(is) {
+ @Override
public void close() throws IOException {
// leave ZIP open
}
@@ -117,6 +120,7 @@ public class ComponentsXmlResourceTransformer extends AbstractCompatibilityTrans
}
}
+ @Override
public void modifyOutputStream(JarOutputStream jos) throws IOException {
JarEntry jarEntry = new JarEntry(COMPONENTS_XML_PATH);
jarEntry.setTime(time);
@@ -130,6 +134,7 @@ public class ComponentsXmlResourceTransformer extends AbstractCompatibilityTrans
components.clear();
}
+ @Override
public boolean hasTransformedResource() {
return !components.isEmpty();
}
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java
index eed7295..2282b97 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/PluginXmlResourceTransformer.java
@@ -49,16 +49,19 @@ public class PluginXmlResourceTransformer extends AbstractCompatibilityTransform
public static final String PLUGIN_XML_PATH = "META-INF/maven/plugin.xml";
+ @Override
public boolean canTransformResource(String resource) {
return PLUGIN_XML_PATH.equals(resource);
}
+ @Override
public void processResource(String resource, InputStream is, List<Relocator> relocators, long time)
throws IOException {
Xpp3Dom newDom;
try {
BufferedInputStream bis = new BufferedInputStream(is) {
+ @Override
public void close() throws IOException {
// leave ZIP open
}
@@ -116,6 +119,7 @@ public class PluginXmlResourceTransformer extends AbstractCompatibilityTransform
}
}
+ @Override
public void modifyOutputStream(JarOutputStream jos) throws IOException {
byte[] data = getTransformedResource();
@@ -128,6 +132,7 @@ public class PluginXmlResourceTransformer extends AbstractCompatibilityTransform
mojos.clear();
}
+ @Override
public boolean hasTransformedResource() {
return !mojos.isEmpty();
}