Skip to content

Commit 71b7c8a

Browse files
rfscholteyrodiere
authored andcommitted
Update multi-release-jar-demo (no more maven-antrun-plugin required)
1 parent 50b5ee0 commit 71b7c8a

File tree

2 files changed

+16
-42
lines changed

2 files changed

+16
-42
lines changed

java9/multi-release-jar-demo/pom.xml

+15-41
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<groupId>org.hibernate.demos</groupId>
1111
<artifactId>multi-release-jar-demo</artifactId>
1212
<version>1.0-SNAPSHOT</version>
13-
<packaging>jar</packaging>
1413

1514
<name>multi-release-jar-demo</name>
1615
<url>http://hibernate.org/</url>
@@ -19,53 +18,28 @@
1918
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2019
<maven.compiler.source>1.8</maven.compiler.source>
2120
<maven.compiler.target>1.8</maven.compiler.target>
22-
<java9.sourceDirectory>${project.basedir}/src/main/java9</java9.sourceDirectory>
23-
<java9.build.outputDirectory>${project.build.directory}/classes-java9</java9.build.outputDirectory>
2421
</properties>
2522

2623
<build>
2724
<plugins>
2825
<plugin>
2926
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-antrun-plugin</artifactId>
31-
<version>1.8</version>
27+
<artifactId>maven-compiler-plugin</artifactId>
28+
<version>3.8.1</version>
3229
<executions>
33-
<execution>
34-
<id>compile-java9</id>
35-
<phase>compile</phase>
36-
<configuration>
37-
<tasks>
38-
<mkdir dir="${java9.build.outputDirectory}" />
39-
<javac srcdir="${java9.sourceDirectory}" destdir="${java9.build.outputDirectory}"
40-
classpath="${project.build.outputDirectory}" includeantruntime="false" />
41-
</tasks>
42-
</configuration>
43-
<goals>
44-
<goal>run</goal>
45-
</goals>
46-
</execution>
47-
</executions>
48-
</plugin>
49-
<plugin>
50-
<groupId>org.apache.maven.plugins</groupId>
51-
<artifactId>maven-resources-plugin</artifactId>
52-
<version>3.0.2</version>
53-
<executions>
54-
<execution>
55-
<id>copy-resources</id>
56-
<phase>prepare-package</phase>
57-
<goals>
58-
<goal>copy-resources</goal>
59-
</goals>
60-
<configuration>
61-
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
62-
<resources>
63-
<resource>
64-
<directory>${java9.build.outputDirectory}</directory>
65-
</resource>
66-
</resources>
67-
</configuration>
68-
</execution>
30+
<execution>
31+
<id>jdk9</id>
32+
<goals>
33+
<goal>compile</goal>
34+
</goals>
35+
<configuration>
36+
<release>9</release>
37+
<compileSourceRoots>
38+
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
39+
</compileSourceRoots>
40+
<multiReleaseOutput>true</multiReleaseOutput>
41+
</configuration>
42+
</execution>
6943
</executions>
7044
</plugin>
7145
<plugin>

java9/multi-release-jar-demo/src/main/java9/org/hibernate/demos/mrjar/ProcessIdProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public class ProcessIdProvider {
1313

1414
public ProcessIdDescriptor getPid() {
15-
long pid = ProcessHandle.current().getPid();
15+
long pid = ProcessHandle.current().pid();
1616
return new ProcessIdDescriptor( pid, "ProcessHandle" );
1717
}
1818
}

0 commit comments

Comments
 (0)