This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 1aaebd7 [MSHADE-301] jdk11 support upgrade asm version 7.0-beta
1aaebd7 is described below
commit 1aaebd70082f13684951d6b082ec1c2c9da03aa5
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Wed Oct 3 16:56:40 2018 +1000
[MSHADE-301] jdk11 support upgrade asm version 7.0-beta
* [MSHADE-301] add jdk11 to Jenkinsfile build
Signed-off-by: olivier lamy <ol...@apache.org>
* [MSHADE-301] jdk11 support upgrade asm version 7.0-beta
Signed-off-by: olivier lamy <ol...@apache.org>
---
Jenkinsfile | 2 +-
pom.xml | 2 +-
src/it/shading-with-java-10-sources/pom.xml | 6 ++--
.../invoker.properties | 19 +++++++++++
.../pom.xml | 12 ++++---
.../org/apache/maven/plugins/shade/its/App.java | 38 +++++++++++++++++++---
.../it/shading-with-java-11-sources/verify.groovy | 8 +++--
src/it/shading-with-java-8-sources/pom.xml | 4 +--
8 files changed, 73 insertions(+), 18 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e9f05f7..41fc431 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild()
+asfMavenTlpPlgnBuild(jdk:['7','8','9','10','11'])
diff --git a/pom.xml b/pom.xml
index 11a95d3..c76837e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<mavenVersion>3.0</mavenVersion>
<javaVersion>7</javaVersion>
<currentVersion>${project.version}</currentVersion>
- <asmVersion>6.2.1</asmVersion>
+ <asmVersion>7.0-beta</asmVersion>
</properties>
<contributors>
diff --git a/src/it/shading-with-java-10-sources/pom.xml
b/src/it/shading-with-java-10-sources/pom.xml
index 849dbe8..b96ba5e 100644
--- a/src/it/shading-with-java-10-sources/pom.xml
+++ b/src/it/shading-with-java-10-sources/pom.xml
@@ -44,7 +44,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
<release>10</release>
</configuration>
@@ -98,10 +98,10 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${java.home}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
-
<argument>${project.build.directory}/shading-with-java-10-sources-1.0-SNAPSHOT-shaded.jar
</argument>
+
<argument>${project.build.directory}/shading-with-java-10-sources-1.0-SNAPSHOT-shaded.jar</argument>
<argument>hidden.App</argument>
</arguments>
</configuration>
diff --git a/src/it/shading-with-java-11-sources/invoker.properties
b/src/it/shading-with-java-11-sources/invoker.properties
new file mode 100644
index 0000000..eb74a63
--- /dev/null
+++ b/src/it/shading-with-java-11-sources/invoker.properties
@@ -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 = 11+
+invoker.goals=clean verify
diff --git a/src/it/shading-with-java-10-sources/pom.xml
b/src/it/shading-with-java-11-sources/pom.xml
similarity index 92%
copy from src/it/shading-with-java-10-sources/pom.xml
copy to src/it/shading-with-java-11-sources/pom.xml
index 849dbe8..0ea23fe 100644
--- a/src/it/shading-with-java-10-sources/pom.xml
+++ b/src/it/shading-with-java-11-sources/pom.xml
@@ -24,7 +24,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.shade.its</groupId>
- <artifactId>shading-with-java-10-sources</artifactId>
+ <artifactId>shading-with-java-11-sources</artifactId>
<version>1.0-SNAPSHOT</version>
<name>users-shader-impl</name>
@@ -44,9 +44,11 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
- <release>10</release>
+ <source>11</source>
+ <target>11</target>
+ <release>11</release>
</configuration>
</plugin>
</plugins>
@@ -98,10 +100,10 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${java.home}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
-
<argument>${project.build.directory}/shading-with-java-10-sources-1.0-SNAPSHOT-shaded.jar
</argument>
+
<argument>${project.build.directory}/shading-with-java-11-sources-1.0-SNAPSHOT-shaded.jar</argument>
<argument>hidden.App</argument>
</arguments>
</configuration>
diff --git a/Jenkinsfile
b/src/it/shading-with-java-11-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java
similarity index 57%
copy from Jenkinsfile
copy to
src/it/shading-with-java-11-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java
index e9f05f7..a92156e 100644
--- a/Jenkinsfile
+++
b/src/it/shading-with-java-11-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java
@@ -1,4 +1,6 @@
-/**
+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
@@ -6,9 +8,9 @@
* 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
@@ -17,4 +19,32 @@
* under the License.
*/
-asfMavenTlpPlgnBuild()
+
+/**
+ * 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();
+ }
+}
diff --git a/Jenkinsfile b/src/it/shading-with-java-11-sources/verify.groovy
similarity index 77%
copy from Jenkinsfile
copy to src/it/shading-with-java-11-sources/verify.groovy
index e9f05f7..453e8bd 100644
--- a/Jenkinsfile
+++ b/src/it/shading-with-java-11-sources/verify.groovy
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -16,5 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
+assert new File(basedir, 'build.log').exists();
-asfMavenTlpPlgnBuild()
+content = new File(basedir, 'build.log').text;
+assert content.contains( '=== RunnableTest ===');
+assert content.contains( 'Hello world one!');
+assert content.contains( 'Hello world two!');
diff --git a/src/it/shading-with-java-8-sources/pom.xml
b/src/it/shading-with-java-8-sources/pom.xml
index 2e53fe7..5e3a6a4 100644
--- a/src/it/shading-with-java-8-sources/pom.xml
+++ b/src/it/shading-with-java-8-sources/pom.xml
@@ -98,10 +98,10 @@ under the License.
<goal>exec</goal>
</goals>
<configuration>
- <executable>java</executable>
+ <executable>${java.home}/bin/java</executable>
<arguments>
<argument>-classpath</argument>
-
<argument>${project.build.directory}/shading-with-java-8-sources-1.0-SNAPSHOT-shaded.jar
</argument>
+
<argument>${project.build.directory}/shading-with-java-8-sources-1.0-SNAPSHOT-shaded.jar</argument>
<argument>hidden.App</argument>
</arguments>
</configuration>
