Skip to content

Commit 31147d3

Browse files
cmhulbertcmhulbert
authored
Merge pull request #21 from saalfeldlab/build/jdk21
Build/jdk21
2 parents 7d79dc9 + e421192 commit 31147d3

35 files changed

Lines changed: 1866 additions & 1777 deletions

‎.github/workflows/build-main.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16+
17+
- name: Install Blosc
18+
run: sudo apt install -y libblosc1
19+
1620
- name: Set up Java
1721
uses: actions/setup-java@v3
1822
with:
19-
java-version: '8'
20-
distribution: 'zulu'
23+
java-version: '21'
24+
distribution: 'temurin'
2125
cache: 'maven'
2226
- name: Set up CI environment
2327
run: .github/setup.sh

‎.github/workflows/build-pr.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14+
15+
- name: Install Blosc
16+
run: sudo apt install -y libblosc1
17+
1418
- name: Set up Java
1519
uses: actions/setup-java@v3
1620
with:
17-
java-version: '8'
18-
distribution: 'zulu'
21+
java-version: '21'
22+
distribution: 'temurin'
1923
cache: 'maven'
2024
- name: Set up CI environment
2125
run: .github/setup.sh

‎pom.xml‎

Lines changed: 77 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<groupId>org.scijava</groupId>
66
<artifactId>pom-scijava</artifactId>
7-
<version>31.1.0</version>
7+
<version>37.0.0</version>
88
</parent>
99

1010
<groupId>org.janelia.saalfeldlab</groupId>
1111
<artifactId>label-utilities-spark</artifactId>
12-
<version>0.9.5-SNAPSHOT</version>
12+
<version>1.0.0-SNAPSHOT</version>
1313

1414
<name>N5-Label-Multisets-Spark</name>
1515
<description>Spark based tools for label data.</description>
@@ -18,7 +18,7 @@
1818
<!-- <organization>saalfeldlab</organization> -->
1919
<organization>
2020
<name>Saalfeld Lab</name>
21-
<url>http://saalfeldlab.janelia.org/</url>
21+
<url>https://saalfeldlab.janelia.org/</url>
2222
</organization>
2323
<licenses>
2424
<license>
@@ -30,24 +30,35 @@
3030
<mailingLists>
3131
<mailingList>
3232
<name>ImageJ Forum</name>
33-
<archive>http://image.sc/</archive>
33+
<archive>https://image.sc/</archive>
3434
</mailingList>
3535
</mailingLists>
3636

3737
<developers>
3838
<developer>
3939
<id>hanslovsky</id>
4040
<name>Philipp Hanslovsky</name>
41-
<url>http://imagej.net/User:Hanslovsky</url>
41+
<url>https://imagej.net/User:Hanslovsky</url>
4242
<roles>
4343
<role>founder</role>
4444
<role>lead</role>
4545
<role>developer</role>
4646
<role>debugger</role>
4747
<role>reviewer</role>
4848
<role>support</role>
49+
</roles>
50+
</developer>
51+
<developer>
52+
<id>hulbertc</id>
53+
<name>Caleb Hulbert</name>
54+
<email>hulbertc@janelia.hhmi.org</email>
55+
<organization>HHMI Janelia</organization>
56+
<organizationUrl>https://janelia.org/</organizationUrl>
57+
<roles>
58+
<role>developer</role>
4959
<role>maintainer</role>
5060
</roles>
61+
<timezone>-5</timezone>
5162
</developer>
5263
</developers>
5364

@@ -83,7 +94,30 @@
8394
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
8495
<package-name>org.janelia.saalfeldlab.label.spark</package-name>
8596

86-
<imglib2-cache.version>1.0.0-beta-13</imglib2-cache.version>
97+
<scijava.jvm.version>21</scijava.jvm.version>
98+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
99+
<javadoc.skip>true</javadoc.skip>
100+
<maven.javadoc.skip>${javadoc.skip}</maven.javadoc.skip>
101+
102+
<n5.version>3.2.0</n5.version>
103+
<n5-hdf5.version>2.2.0</n5-hdf5.version>
104+
<n5-google-cloud.version>4.1.0</n5-google-cloud.version>
105+
<n5-aws-s3.version>4.1.2</n5-aws-s3.version>
106+
<n5-zarr.version>1.3.3</n5-zarr.version>
107+
<n5-imglib2.version>7.0.0</n5-imglib2.version>
108+
<n5-universe.version>1.5.0</n5-universe.version>
109+
<imglib2-label-multisets.version>0.13.2</imglib2-label-multisets.version>
110+
<slf4j-api.version>1.7.36</slf4j-api.version>
111+
112+
<label-utilities.version>0.5.1</label-utilities.version>
113+
<label-utilities-n5.version>0.3.2</label-utilities-n5.version>
114+
<imglib2-mutex-watershed.version>0.1.2</imglib2-mutex-watershed.version>
115+
116+
<spark.version>3.5.1</spark.version>
117+
<spark-core_2.12.version>${spark.version}</spark-core_2.12.version>
118+
<jackson.version>2.15.4</jackson.version>
119+
120+
<enforcer.skip>true</enforcer.skip>
87121
</properties>
88122

89123
<repositories>
@@ -97,27 +131,26 @@
97131
<dependency>
98132
<groupId>org.janelia.saalfeldlab</groupId>
99133
<artifactId>label-utilities</artifactId>
100-
<version>0.5.0</version>
134+
<version>${label-utilities.version}</version>
101135
</dependency>
102136
<dependency>
103137
<groupId>org.janelia.saalfeldlab</groupId>
104138
<artifactId>label-utilities-n5</artifactId>
105-
<version>0.3.1</version>
139+
<version>${label-utilities-n5.version}</version>
106140
</dependency>
107141
<dependency>
108142
<groupId>org.janelia.saalfeldlab</groupId>
109143
<artifactId>imglib2-mutex-watershed</artifactId>
110-
<version>0.1.2</version>
144+
<version>${imglib2-mutex-watershed.version}</version>
111145
</dependency>
112146
<dependency>
113147
<groupId>org.apache.spark</groupId>
114148
<artifactId>spark-core_2.12</artifactId>
115-
<version>3.2.1</version>
149+
<version>${spark-core_2.12.version}</version>
116150
</dependency>
117151
<dependency>
118152
<groupId>net.imglib2</groupId>
119153
<artifactId>imglib2</artifactId>
120-
<version>5.13.0</version>
121154
</dependency>
122155
<dependency>
123156
<groupId>net.imglib2</groupId>
@@ -129,18 +162,7 @@
129162
</dependency>
130163
<dependency>
131164
<groupId>org.janelia.saalfeldlab</groupId>
132-
<artifactId>n5</artifactId>
133-
<version>2.2.0</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.janelia.saalfeldlab</groupId>
137-
<artifactId>n5-imglib2</artifactId>
138-
<version>4.3.0</version>
139-
</dependency>
140-
<dependency>
141-
<groupId>org.janelia.saalfeldlab</groupId>
142-
<artifactId>n5-hdf5</artifactId>
143-
<version>1.0.4</version>
165+
<artifactId>n5-universe</artifactId>
144166
</dependency>
145167
<dependency>
146168
<groupId>net.imglib2</groupId>
@@ -162,13 +184,18 @@
162184
<artifactId>throwing-function</artifactId>
163185
<version>1.5.1</version>
164186
</dependency>
187+
188+
<!-- logging -->
189+
<dependency>
190+
<groupId>ch.qos.logback</groupId>
191+
<artifactId>logback-core</artifactId>
192+
</dependency>
165193
<dependency>
166-
<groupId>com.fasterxml.jackson.core</groupId>
167-
<artifactId>jackson-databind</artifactId>
168-
<version>2.12.7.1</version>
194+
<groupId>ch.qos.logback</groupId>
195+
<artifactId>logback-classic</artifactId>
169196
</dependency>
170197

171-
<!-- test -->
198+
<!-- test -->
172199
<dependency>
173200
<groupId>junit</groupId>
174201
<artifactId>junit</artifactId>
@@ -177,6 +204,29 @@
177204

178205
</dependencies>
179206

207+
<build>
208+
<plugins>
209+
<plugin>
210+
<groupId>org.apache.maven.plugins</groupId>
211+
<artifactId>maven-compiler-plugin</artifactId>
212+
<configuration>
213+
<compilerArgs>
214+
<arg>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</arg>
215+
</compilerArgs>
216+
</configuration>
217+
</plugin>
218+
<plugin>
219+
<groupId>org.apache.maven.plugins</groupId>
220+
<artifactId>maven-surefire-plugin</artifactId>
221+
<configuration>
222+
<argLine>
223+
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
224+
</argLine>
225+
</configuration>
226+
</plugin>
227+
</plugins>
228+
</build>
229+
180230
<profiles>
181231
<profile>
182232
<id>fatWithSpark</id>
@@ -185,7 +235,6 @@
185235
<plugin>
186236
<groupId>org.apache.maven.plugins</groupId>
187237
<artifactId>maven-shade-plugin</artifactId>
188-
<version>3.2.4</version>
189238
<configuration>
190239
<filters>
191240
<filter>
@@ -244,7 +293,6 @@
244293
<plugin>
245294
<groupId>org.apache.maven.plugins</groupId>
246295
<artifactId>maven-shade-plugin</artifactId>
247-
<version>3.2.4</version>
248296
<configuration>
249297
<filters>
250298
<filter>

‎src/.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[*]
2-
indent_style = tab
3-
tab_width = unset
2+
indent_style = tab
3+
tab_width = unset
44
max_line_length = 140

0 commit comments

Comments
 (0)