[MSHADE-301] jdk11 support upgrade asm version 7.0-beta
authorOlivier Lamy <olamy@apache.org>
Wed, 3 Oct 2018 06:56:40 +0000 (16:56 +1000)
committerGitHub <noreply@github.com>
Wed, 3 Oct 2018 06:56:40 +0000 (16:56 +1000)
* [MSHADE-301] add jdk11 to Jenkinsfile build

Signed-off-by: olivier lamy <olamy@apache.org>
* [MSHADE-301] jdk11 support upgrade asm version 7.0-beta

Signed-off-by: olivier lamy <olamy@apache.org>
Jenkinsfile
pom.xml
src/it/shading-with-java-10-sources/pom.xml
src/it/shading-with-java-11-sources/invoker.properties [new file with mode: 0644]
src/it/shading-with-java-11-sources/pom.xml [new file with mode: 0644]
src/it/shading-with-java-11-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java [new file with mode: 0644]
src/it/shading-with-java-11-sources/verify.groovy [new file with mode: 0644]
src/it/shading-with-java-8-sources/pom.xml

index e9f05f7..41fc431 100644 (file)
@@ -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 (file)
--- 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>
index 849dbe8..b96ba5e 100644 (file)
@@ -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 (file)
index 0000000..eb74a63
--- /dev/null
@@ -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-11-sources/pom.xml b/src/it/shading-with-java-11-sources/pom.xml
new file mode 100644 (file)
index 0000000..0ea23fe
--- /dev/null
@@ -0,0 +1,116 @@
+<?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-11-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.8.0</version>
+          <configuration>
+            <source>11</source>
+            <target>11</target>
+            <release>11</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.home}/bin/java</executable>
+              <arguments>
+                <argument>-classpath</argument>
+                <argument>${project.build.directory}/shading-with-java-11-sources-1.0-SNAPSHOT-shaded.jar</argument>
+                <argument>hidden.App</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
diff --git a/src/it/shading-with-java-11-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java b/src/it/shading-with-java-11-sources/src/main/java/org/apache/maven/plugins/shade/its/App.java
new file mode 100644 (file)
index 0000000..a92156e
--- /dev/null
@@ -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();
+    }
+}
diff --git a/src/it/shading-with-java-11-sources/verify.groovy b/src/it/shading-with-java-11-sources/verify.groovy
new file mode 100644 (file)
index 0000000..453e8bd
--- /dev/null
@@ -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!');
index 2e53fe7..5e3a6a4 100644 (file)
@@ -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>