Skip to content

Commit

Permalink
[MSHADE-36] Support for injecting the dependency-reduced-pom.xml into…
Browse files Browse the repository at this point in the history
… the final shaded jar
  • Loading branch information
nielsbasjes committed Aug 30, 2019
1 parent 57d78de commit 6fd4581
Show file tree
Hide file tree
Showing 6 changed files with 297 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

invoker.goals = clean package
invoker.java.version = 1.8+
100 changes: 100 additions & 0 deletions src/it/MSHADE-36-inject-dep-reduced-pom-in-final/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<project>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.maven.plugins.shade.its</groupId>
<artifactId>shade-parent</artifactId>
<version>1.0</version>
<relativePath>../setup-parent</relativePath>
</parent>

<groupId>org.apache.maven.its.shade.drp</groupId>
<artifactId>test</artifactId>
<version>1.0</version>
<packaging>jar</packaging>

<name>MSHADE-36</name>
<description>
Test to see that the dependency-reduced-pom.xml is injected into the final jar instead of the normal pom.xml
</description>

<properties>
<maven.compiler.source>1.4</maven.compiler.source>
<maven.compiler.target>1.4</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.4.1</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<id>attach-shade</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>true</createDependencyReducedPom>
<useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
<relocations>
<relocation>
<pattern>org.codehaus.plexus</pattern>
<shadedPattern>nl.example.shaded.org.codehaus.plexus</shadedPattern>
</relocation>
</relocations>
<artifactSet>
<includes>
<include>junit:junit</include>
<include>org.codehaus.plexus:plexus-utils</include>
</includes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package nl.example;

import org.codehaus.plexus.util.StringUtils;

public class Main
{
public static void main( String[] args ) {
System.out.println( "Hello World!" + ( isEmpty("foo") ? " is empty!" : " -- ") );
}

public static boolean isEmpty( String input ) {
return StringUtils.isEmpty( input );
}
}
63 changes: 63 additions & 0 deletions src/it/MSHADE-36-inject-dep-reduced-pom-in-final/verify.bsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import java.io.*;
import java.util.jar.*;
import java.util.Arrays;
import org.codehaus.plexus.util.*;

String[] wanted =
{
"nl/example/Main.class",
"junit/swingui/icons/error.gif",
"nl/example/shaded/org/codehaus/plexus/util/StringUtils.class",
};

String[] unwanted =
{
"junit/swingui/TestRunner.class",
"org/codehaus/plexus/util/StringUtils.class",
};

JarFile jarFile = new JarFile( new File( basedir, "target/test-1.0.jar" ) );

for ( String path : wanted )
{
if ( jarFile.getEntry( path ) == null )
{
throw new IllegalStateException( "wanted path is missing: " + path );
}
}

for ( String path : unwanted )
{
if ( jarFile.getEntry( path ) != null )
{
throw new IllegalStateException( "unwanted path is present: " + path );
}
}

JarEntry jarEntry = jarFile.getEntry( "META-INF/maven/org.apache.maven.its.shade.drp/test/pom.xml" );
String pomFile = IOUtil.toString( jarFile.getInputStream( jarEntry ), "UTF-8" );

if ( pomFile.contains( "<groupId>org.codehaus.plexus</groupId>" ) ) {
throw new IllegalStateException( "The pom.xml still contains a reference to the org.codehaus.plexus dependency");
}

jarFile.close();
33 changes: 28 additions & 5 deletions src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
import java.util.Map;
import java.util.Set;

import static org.apache.maven.plugins.shade.resource.UseDependencyReducedPomXml.createPomXmlReplaceTransformers;

/**
* Mojo that performs shading delegating to the Shader component.
*
Expand Down Expand Up @@ -289,6 +291,14 @@ public class ShadeMojo
@Parameter( defaultValue = "false" )
private boolean generateUniqueDependencyReducedPom;

/**
* Do we put the dependency reduced pom in the jar instead of the jar file provided by the project.
*
* @since 3.2.2
*/
@Parameter( defaultValue = "false" )
private boolean useDependencyReducedPomInJar;

/**
* When true, dependencies are kept in the pom but with scope 'provided'; when false, the dependency is removed.
*/
Expand Down Expand Up @@ -437,6 +447,24 @@ public void execute()

List<ResourceTransformer> resourceTransformers = getResourceTransformers();

if ( createDependencyReducedPom )
{
createDependencyReducedPom( artifactIds );
}

if ( useDependencyReducedPomInJar )
{
if ( !createDependencyReducedPom )
{
throw new MojoExecutionException(
"Cannot use the dependency-reduced-pom.xml if it is not created." );
}

// In some cases the used implementation of the resourceTransformers is immutable.
resourceTransformers = new ArrayList<>( resourceTransformers );
resourceTransformers.addAll( createPomXmlReplaceTransformers( project, dependencyReducedPomLocation ) );
}

ShadeRequest shadeRequest = shadeRequest( artifacts, outputJar, filters, relocators, resourceTransformers );

shader.shade( shadeRequest );
Expand Down Expand Up @@ -532,11 +560,6 @@ else if ( !renamed )

projectHelper.attachArtifact( project, "jar", "tests", shadedTests );
}

if ( createDependencyReducedPom )
{
createDependencyReducedPom( artifactIds );
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.apache.maven.plugins.shade.resource;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import org.apache.maven.project.MavenProject;

import java.io.File;
import java.util.Arrays;
import java.util.List;

/**
* Manually creates the resource processors needed to remove the original pom.xml and inject
* the dependency-reduced-pom.xml in it's place in the shaded JAR.
*/
public class UseDependencyReducedPomXml
{
public static List<ResourceTransformer> createPomXmlReplaceTransformers(
MavenProject project,
File dependencyReducedPomLocation
)
{
String pomXmlInFinalJarFilename =
"META-INF/maven/" + project.getGroupId() + "/" + project.getArtifactId() + "/pom.xml";

DontIncludeResourceTransformer removePomXML = new DontIncludeResourceTransformer();
removePomXML.resource = pomXmlInFinalJarFilename;

IncludeResourceTransformer insertDependencyReducedPomXML = new IncludeResourceTransformer();
insertDependencyReducedPomXML.file = dependencyReducedPomLocation;
insertDependencyReducedPomXML.resource = pomXmlInFinalJarFilename;

return Arrays.asList(
removePomXML,
insertDependencyReducedPomXML
);
}
}

0 comments on commit 6fd4581

Please sign in to comment.