Skip to content

Commit 1dc5c0a

Browse files
committed
Move java-9 profile above the platform profiles
And add a comment explaining it.
1 parent 8faa9d6 commit 1dc5c0a

File tree

1 file changed

+25
-20
lines changed

1 file changed

+25
-20
lines changed

pom.xml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2058,6 +2058,31 @@
20582058
</build>
20592059
</profile>
20602060

2061+
<!--
2062+
The java-9 profile includes adjustments for Java 9+; in particular, it
2063+
configures the release value, and fixes the path to the javadoc executable.
2064+
-->
2065+
<profile>
2066+
<id>java-9</id>
2067+
<activation>
2068+
<jdk>[9,)</jdk>
2069+
</activation>
2070+
<properties>
2071+
<maven.compiler.release>${scijava.jvm.version}</maven.compiler.release>
2072+
</properties>
2073+
<build>
2074+
<plugins>
2075+
<plugin>
2076+
<groupId>org.apache.maven.plugins</groupId>
2077+
<artifactId>maven-javadoc-plugin</artifactId>
2078+
<configuration>
2079+
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
2080+
</configuration>
2081+
</plugin>
2082+
</plugins>
2083+
</build>
2084+
</profile>
2085+
20612086
<!--
20622087
The following profiles set the scijava.platform system properties to
20632088
match the detected architecture. The main intended use case is for
@@ -2187,25 +2212,5 @@
21872212
<scijava.platform.arch>64</scijava.platform.arch>
21882213
</properties>
21892214
</profile>
2190-
<profile>
2191-
<id>java-9</id>
2192-
<activation>
2193-
<jdk>[9,)</jdk>
2194-
</activation>
2195-
<properties>
2196-
<maven.compiler.release>${scijava.jvm.version}</maven.compiler.release>
2197-
</properties>
2198-
<build>
2199-
<plugins>
2200-
<plugin>
2201-
<groupId>org.apache.maven.plugins</groupId>
2202-
<artifactId>maven-javadoc-plugin</artifactId>
2203-
<configuration>
2204-
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
2205-
</configuration>
2206-
</plugin>
2207-
</plugins>
2208-
</build>
2209-
</profile>
22102215
</profiles>
22112216
</project>

0 commit comments

Comments
 (0)