You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/02/02 10:56:28 UTC
[maven-indexer] 01/01: [MINDEXER-135] Fix CLI shading
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MINDEXER-135
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 9c71966afa3e685432ceb6637523e1e1244a5e70
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Feb 2 11:55:55 2022 +0100
[MINDEXER-135] Fix CLI shading
And overall fix shading warnings.
---
indexer-cli/pom.xml | 24 ++++++++++++++++++++++
.../apache/maven/index/cli/NexusIndexerCli.java | 2 +-
indexer-core/pom.xml | 3 +++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/indexer-cli/pom.xml b/indexer-cli/pom.xml
index 0acf1bd..cb7b67c 100644
--- a/indexer-cli/pom.xml
+++ b/indexer-cli/pom.xml
@@ -59,6 +59,12 @@ under the License.
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>compile</scope> <!-- to make it into shaded CLI JAR -->
+ </dependency>
+
<!-- Needed for CLI assembly only, to make it work in "standalone" CLI mode -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -91,6 +97,7 @@ under the License.
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -114,6 +121,23 @@ under the License.
<configuration>
<shadedArtifactAttached>false</shadedArtifactAttached>
<createDependencyReducedPom>false</createDependencyReducedPom>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>about.html</exclude>
+ </excludes>
+ </filter>
+ </filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
diff --git a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index 8f1f363..6b76830 100644
--- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
+++ b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
@@ -176,7 +176,7 @@ public class NexusIndexerCli
@Override
public String getPomPropertiesPath()
{
- return "META-INF/maven/org.sonatype.nexus/nexus-indexer/pom.properties";
+ return "META-INF/maven/org.apache.maven.indexer/indexer-core/pom.properties";
}
@Override
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index c68ef5f..5147649 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -235,6 +235,9 @@ under the License.
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
</excludes>
</filter>
</filters>