Skip to content

Commit

Permalink
Merge pull request #338 from scenerygraphics/pom-jdk-fix
Browse files Browse the repository at this point in the history
Add @axtimwalde's suggested fixes for handling jdks >8
  • Loading branch information
kephale authored Dec 7, 2020
2 parents eeead2f + 38d6a0d commit 121e036
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<developer>
<id>kephale</id>
<name>Kyle Harrington</name>
<url>https://imagej.net/User:Kharrington</url>
<url>https://kyleharrington.com</url>
<roles>
<role>founder</role>
<role>lead</role>
Expand Down Expand Up @@ -108,7 +108,9 @@
<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>deploy-to-scijava</releaseProfiles>

<scijava.jvm.build.version>11</scijava.jvm.build.version>
<scijava.jvm.build.version>8</scijava.jvm.build.version>
<scijava.jvm.test.version>${scijava.jvm.version}</scijava.jvm.test.version>
<scijava.jvm.build.version>[1.8.0-101,)</scijava.jvm.build.version>

<scenery.version>5de0b1e</scenery.version>
<!-- <scijava-common.version>2.84.0</scijava-common.version>-->
Expand Down Expand Up @@ -446,14 +448,11 @@

<profiles>
<profile>
<id>sciview</id>
<id>java-9</id>
<activation>
<jdk>[8,)</jdk>
<activeByDefault>true</activeByDefault>
<jdk>[9,)</jdk>
</activation>
<properties>
<scijava.jvm.version>11</scijava.jvm.version>
<org.apache.maven.plugins.enforcer.RequireJavaVersion>[8,)</org.apache.maven.plugins.enforcer.RequireJavaVersion>
<maven.compiler.release>${scijava.jvm.version}</maven.compiler.release>
</properties>
</profile>
Expand Down

0 comments on commit 121e036

Please sign in to comment.