Skip to content

Commit

Permalink
[MSHADE-289] - Maven Shade Plugin does not work under Java 10
Browse files Browse the repository at this point in the history
 o Updating ASM to 6.2.1 to prevent IllegalArgumentException
 o Adding integration test for Java 10
 o Upgrade Jdependency to 2.0 and fixing another problem with malformed dependency.
 o Added configuraton for TLSv1.2
 o Needed to run tests only for JDK8+ based on jdependency
   Also needed to limit running some of ITs for JDK8+
  • Loading branch information
Juliano Julio Costa authored and khmarbaise committed Aug 19, 2018
1 parent 27b7e2b commit 06aff75
Show file tree
Hide file tree
Showing 13 changed files with 280 additions and 22 deletions.
11 changes: 9 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<mavenVersion>3.0</mavenVersion>
<javaVersion>7</javaVersion>
<currentVersion>${project.version}</currentVersion>
<asmVersion>6.0</asmVersion>
<asmVersion>6.2.1</asmVersion>
</properties>

<contributors>
Expand Down Expand Up @@ -150,7 +150,7 @@
<dependency>
<groupId>org.vafer</groupId>
<artifactId>jdependency</artifactId>
<version>1.2</version>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -219,6 +219,9 @@
<ignoreClasses>
<ignoreClass>module-info</ignoreClass>
</ignoreClasses>
<excludes>
<exclude>org.vafer:jdependency</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -269,6 +272,10 @@
<goal>clean</goal>
<goal>install</goal>
</goals>
<properties>
<!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
<https.protocols>${https.protocols}</https.protocols>
</properties>
</configuration>
</plugin>
</plugins>
Expand Down
18 changes: 18 additions & 0 deletions src/it/mini-jar-malformed-dependencies/invoker.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 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.java.version = 1.8+
2 changes: 1 addition & 1 deletion src/it/mini-jar-package-info/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.5+
invoker.java.version = 1.8+
2 changes: 1 addition & 1 deletion src/it/mini-jar-respect-includes/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.5+
invoker.java.version = 1.8+
2 changes: 1 addition & 1 deletion src/it/mini-jar/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.5+
invoker.java.version = 1.8+
18 changes: 18 additions & 0 deletions src/it/mshade-123/invoker.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 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.java.version = 1.8+
19 changes: 19 additions & 0 deletions src/it/shading-with-java-10-sources/invoker.properties
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.java.version = 10+
invoker.goals=clean verify
114 changes: 114 additions & 0 deletions src/it/shading-with-java-10-sources/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.maven.plugins.shade.its</groupId>
<artifactId>shading-with-java-10-sources</artifactId>
<version>1.0-SNAPSHOT</version>

<name>users-shader-impl</name>


<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<release>10</release>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>@project.version@</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>@project.version@</version>
<classifier>tests</classifier>
</dependency>
</dependencies>
<executions>
<execution>
<id>create-shaded-artifact</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<relocations>
<relocation>
<pattern>org.apache.maven.plugins.shade.its</pattern>
<shadedPattern>hidden</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<id>run</id>
<phase>verify</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<argument>${project.build.directory}/shading-with-java-10-sources-1.0-SNAPSHOT-shaded.jar </argument>
<argument>hidden.App</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package org.apache.maven.plugins.shade.its;

/*
* 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.
*/


/**
* Hello world!
*/
public class App
{
public static void main( String[] args )
{
System.out.println( "=== RunnableTest ===" );

// Anonymous Runnable
Runnable r1 = new Runnable()
{

@Override
public void run()
{
System.out.println( "Hello world one!" );
}
};

// Lambda Runnable
Runnable r2 = () -> System.out.println( "Hello world two!" );

// Run em!
r1.run();
r2.run();
}
}
24 changes: 24 additions & 0 deletions src/it/shading-with-java-10-sources/verify.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* 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.
*/
assert new File(basedir, 'build.log').exists();

content = new File(basedir, 'build.log').text;
assert content.contains( '=== RunnableTest ===');
assert content.contains( 'Hello world one!');
assert content.contains( 'Hello world two!');
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ private ClazzpathUnit addDependencyToClasspath( Clazzpath cp, Artifact dependenc
ioe.initCause( e );
throw ioe;
}
catch ( ArrayIndexOutOfBoundsException e )
catch ( ArrayIndexOutOfBoundsException | IllegalArgumentException e )
{
// trap ArrayIndexOutOfBoundsExceptions caused by malformed dependency classes (MSHADE-107)
log.warn( dependency.toString()
Expand Down
5 changes: 5 additions & 0 deletions src/site/apt/index.apt.vm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ ${project.name}
{{{./source-repository.html}source repository}} and will find supplementary information in the
{{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.

* Version 3.2.0 Hints

If you like to use <<<minimizeJar>>> this means you have to use JDK8+. This
is based on a required upgrade of dependencies.

* Examples

To provide you with better understanding on some usages of the Shade Plugin,
Expand Down

0 comments on commit 06aff75

Please sign in to comment.