Skip to content

Commit 938c8a4

Browse files
committed
Update the incubator to Java 11
And make each module inherit from the aggregator POM. This has a couple of advantages, most notably inheriting a consistent build system including the JVM version.
1 parent e6717c7 commit 938c8a4

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: java
2-
jdk: openjdk8
2+
jdk: openjdk11
33
branches:
44
only:
55
- master

‎pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
88
<version>28.0.0</version>
9-
<relativePath />
109
</parent>
1110

1211
<artifactId>scijava-incubator</artifactId>
@@ -63,10 +62,12 @@
6362
</ciManagement>
6463

6564
<properties>
66-
<package-name>N/A</package-name>
6765
<license.licenseName>N/A</license.licenseName>
6866
<license.copyrightOwners>N/A</license.copyrightOwners>
6967

68+
<scijava.jvm.version>11</scijava.jvm.version>
69+
<scijava.jvm.build.version>[11,11.9999]</scijava.jvm.build.version>
70+
7071
<!-- NB: Deploy releases to the SciJava Maven repository. -->
7172
<releaseProfiles>deploy-to-scijava</releaseProfiles>
7273
</properties>

‎scijava/scijava-ops/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
<parent>
66
<groupId>org.scijava</groupId>
7-
<artifactId>pom-scijava</artifactId>
8-
<version>26.0.0</version>
9-
<relativePath />
7+
<artifactId>scijava-incubator</artifactId>
8+
<version>0-SNAPSHOT</version>
9+
<relativePath>../..</relativePath>
1010
</parent>
1111

1212
<artifactId>scijava-ops</artifactId>
13-
<version>0-SNAPSHOT</version>
1413

1514
<name>SciJava Ops</name>
1615
<description>SciJava Operations: a framework for reusable algorithms.</description>

0 commit comments

Comments
 (0)