From 71b7c8aba7d160ce719806fb7c2155cd5bf0038d Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Mon, 3 Jun 2019 18:50:03 +0200
Subject: [PATCH 1/2] Update multi-release-jar-demo (no more
 maven-antrun-plugin required)

---
 java9/multi-release-jar-demo/pom.xml          | 56 +++++--------------
 .../demos/mrjar/ProcessIdProvider.java        |  2 +-
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/java9/multi-release-jar-demo/pom.xml b/java9/multi-release-jar-demo/pom.xml
index fba8c4db..1b264a6b 100644
--- a/java9/multi-release-jar-demo/pom.xml
+++ b/java9/multi-release-jar-demo/pom.xml
@@ -10,7 +10,6 @@
     <groupId>org.hibernate.demos</groupId>
     <artifactId>multi-release-jar-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <name>multi-release-jar-demo</name>
     <url>http://hibernate.org/</url>
@@ -19,53 +18,28 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
-        <java9.build.outputDirectory>${project.build.directory}/classes-java9</java9.build.outputDirectory>
     </properties>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <executions>
-                    <execution>
-                        <id>compile-java9</id>
-                        <phase>compile</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${java9.build.outputDirectory}" />
-                                <javac srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}"
-                                    classpath="${project.build.outputDirectory}" includeantruntime="false" />
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${java9.build.outputDirectory}</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
+                  <execution>
+                    <id>jdk9</id>
+                    <goals>
+                      <goal>compile</goal>
+                    </goals>
+                    <configuration>
+                      <release>9</release>
+                      <compileSourceRoots>
+                        <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
+                      </compileSourceRoots>
+  					  <multiReleaseOutput>true</multiReleaseOutput>
+                    </configuration>
+                  </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/java9/multi-release-jar-demo/src/main/java9/org/hibernate/demos/mrjar/ProcessIdProvider.java b/java9/multi-release-jar-demo/src/main/java9/org/hibernate/demos/mrjar/ProcessIdProvider.java
index acf4020d..ee06c13b 100644
--- a/java9/multi-release-jar-demo/src/main/java9/org/hibernate/demos/mrjar/ProcessIdProvider.java
+++ b/java9/multi-release-jar-demo/src/main/java9/org/hibernate/demos/mrjar/ProcessIdProvider.java
@@ -12,7 +12,7 @@
 public class ProcessIdProvider {
 
 	public ProcessIdDescriptor getPid() {
-		long pid = ProcessHandle.current().getPid();
+		long pid = ProcessHandle.current().pid();
 		return new ProcessIdDescriptor( pid, "ProcessHandle" );
 	}
 }

From b48dd623417f3c73ba2f13ce8e50641c4b8d5e29 Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Mon, 3 Jun 2019 18:52:18 +0200
Subject: [PATCH 2/2] tabs or spaces...

---
 java9/multi-release-jar-demo/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java9/multi-release-jar-demo/pom.xml b/java9/multi-release-jar-demo/pom.xml
index 1b264a6b..3946012b 100644
--- a/java9/multi-release-jar-demo/pom.xml
+++ b/java9/multi-release-jar-demo/pom.xml
@@ -37,7 +37,7 @@
                       <compileSourceRoots>
                         <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
                       </compileSourceRoots>
-  					  <multiReleaseOutput>true</multiReleaseOutput>
+                      <multiReleaseOutput>true</multiReleaseOutput>
                     </configuration>
                   </execution>
                 </executions>