Skip to content

Commit ac9f1ea

Browse files
Update to pom-scijava 44.0.0 and build on Java 21
- POM: bump parent pom-scijava 34.1.0 -> 44.0.0 - POM: set scijava.jvm.version=21, Java21 javadoc URL, legacyMode=true - POM: declare ome:turbojpeg at runtime scope so it stays off the compile/javadoc classpath (its default-package class breaks the JDK 9+ javadoc module step during release), matching multiview-reconstruction - CI: build on Java 21 (jdk), bump checkout@v4 and setup-java@v4 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent abdce62 commit ac9f1ea

3 files changed

Lines changed: 23 additions & 7 deletions

File tree

.github/workflows/build-main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Set up Java
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
19-
java-version: '8'
19+
java-version: '21'
20+
java-package: 'jdk'
2021
distribution: 'zulu'
2122
cache: 'maven'
2223
- name: Set up CI environment

.github/workflows/build-pr.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: Set up Java
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
17-
java-version: '8'
17+
java-version: '21'
18+
java-package: 'jdk'
1819
distribution: 'zulu'
1920
cache: 'maven'
2021
- name: Set up CI environment

pom.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>34.1.0</version>
8+
<version>44.0.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -115,6 +115,9 @@
115115
<license.licenseName>gpl_v2</license.licenseName>
116116
<license.copyrightOwners>Fiji developers.</license.copyrightOwners>
117117
<license.projectName>Fiji distribution of ImageJ for the life sciences.</license.projectName>
118+
<scijava.jvm.version>21</scijava.jvm.version>
119+
<scijava.javadoc.url.java>https://javadoc.scijava.org/Java21/</scijava.javadoc.url.java>
120+
<legacyMode>true</legacyMode> <!-- NB: Make javadoc less strict about Java module system. -->
118121

119122
<!-- NB: Deploy releases to the SciJava Maven repository. -->
120123
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
@@ -184,6 +187,17 @@
184187
<artifactId>ome-xml</artifactId>
185188
</dependency>
186189

190+
<!-- Pulled transitively (compile) via bio-formats. Re-declared at runtime scope so
191+
it stays available at runtime but is off the compile/javadoc classpath: its jar
192+
has a class in the default package, which the javadoc tool cannot place on the
193+
JDK 9+ module path ("Unable to derive module descriptor") during release. -->
194+
<dependency>
195+
<groupId>ome</groupId>
196+
<artifactId>turbojpeg</artifactId>
197+
<version>${bio-formats.version}</version>
198+
<scope>runtime</scope>
199+
</dependency>
200+
187201
<!-- Third party dependencies -->
188202
<dependency>
189203
<groupId>edu.mines</groupId>

0 commit comments

Comments
 (0)