Files
pf4j/pf4j-3.2.0-java8build.patch

89 lines
3.2 KiB
Diff

--- pf4j-release-3.2.0/maven-archetypes/quickstart/src/main/resources/archetype-resources/pom.xml 2019-11-29 21:08:29.000000000 +0100
+++ pf4j-release-3.2.0/maven-archetypes/quickstart/src/main/resources/archetype-resources/pom.xml 2020-03-02 09:18:02.612548585 +0100
@@ -23,7 +23,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>8</maven.compiler.release>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<pf4j.version>{{project.version}}</pf4j.version>
<slf4j.version>1.7.7</slf4j.version>
@@ -45,4 +46,16 @@
</resources>
</build>
+ <profiles>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
--- pf4j-release-3.2.0/pf4j/pom.xml 2019-11-29 21:08:29.000000000 +0100
+++ pf4j-release-3.2.0/pf4j/pom.xml 2020-03-02 09:21:21.061560168 +0100
@@ -30,26 +30,13 @@
<goal>compile</goal>
</goals>
<configuration>
+ <source>8</source>
+ <target>8</target>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
-
- <!-- compile module-info.java for Java 9+ -->
- <execution>
- <id>java9-compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <release>9</release>
- <multiReleaseOutput>true</multiReleaseOutput>
- <includes>
- <include>module-info.java</include>
- </includes>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
--- pf4j-release-3.2.0/pom.xml 2019-11-29 21:08:29.000000000 +0100
+++ pf4j-release-3.2.0/pom.xml 2020-03-02 09:18:02.616548606 +0100
@@ -43,7 +43,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.release>8</maven.compiler.release>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
<slf4j.version>1.7.25</slf4j.version>
<asm.version>7.1</asm.version>
@@ -218,6 +219,15 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk9+</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <maven.compiler.release>8</maven.compiler.release>
+ </properties>
+ </profile>
</profiles>
</project>