Skip to content

Commit 4621b85

Browse files
committed
Adding support for java 25 build
1 parent b1a7dfd commit 4621b85

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

.github/workflows/linux.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,29 @@ jobs:
5454
run: |
5555
find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
5656
57+
openjdk25:
58+
runs-on: [ubuntu-22.04]
59+
steps:
60+
- uses: actions/checkout@v4
61+
- name: Set up JDK 25
62+
uses: actions/setup-java@v3
63+
with:
64+
java-version: 25
65+
distribution: 'temurin'
66+
- name: Maven repository caching
67+
uses: actions/cache@v3
68+
with:
69+
path: ~/.m2/repository
70+
key: gwc-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
71+
restore-keys: |
72+
${{ runner.os }}-maven-
73+
- name: Build with Maven
74+
run: mvn -B clean install -Dspotless.apply.skip=true -Dall -T2 --file geowebcache/pom.xml
75+
- name: Remove SNAPSHOT jars from repository
76+
run: |
77+
find .m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
78+
79+
5780
QA:
5881
runs-on: [ubuntu-22.04]
5982
steps:

geowebcache/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<lint>deprecation,unchecked</lint>
8181
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
8282
<jclouds.version>2.3.0</jclouds.version>
83-
<mockito.version>5.15.2</mockito.version>
83+
<mockito.version>5.20.0</mockito.version>
8484
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8585
<skipITs>${skipTests}</skipITs>
8686
</properties>
@@ -193,7 +193,7 @@
193193
<dependency>
194194
<groupId>org.easymock</groupId>
195195
<artifactId>easymock</artifactId>
196-
<version>5.5.0</version>
196+
<version>5.6.0</version>
197197
<scope>test</scope>
198198
</dependency>
199199
<dependency>
@@ -397,7 +397,7 @@
397397
<plugin>
398398
<groupId>com.diffplug.spotless</groupId>
399399
<artifactId>spotless-maven-plugin</artifactId>
400-
<version>2.43.0</version>
400+
<version>3.0.0</version>
401401
</plugin>
402402

403403
<plugin>
@@ -615,7 +615,7 @@
615615
<configuration>
616616
<java>
617617
<palantirJavaFormat>
618-
<version>2.50.0</version>
618+
<version>2.74.0</version>
619619
<formatJavadoc>true</formatJavadoc>
620620
</palantirJavaFormat>
621621
</java>

geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public enum HintsLevel {
163163
HintsLevel(int numHint, String mode) {
164164
this.mode = mode;
165165
switch (numHint) {
166-
// QUALITY HINTS
166+
// QUALITY HINTS
167167
case 0:
168168
hints = new RenderingHints(
169169
RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
@@ -180,7 +180,7 @@ public enum HintsLevel {
180180
hints.add(new RenderingHints(
181181
RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE));
182182
break;
183-
// DEFAULT HINTS
183+
// DEFAULT HINTS
184184
case 1:
185185
hints = new RenderingHints(
186186
RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_DEFAULT);
@@ -198,7 +198,7 @@ public enum HintsLevel {
198198
hints.add(
199199
new RenderingHints(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_DEFAULT));
200200
break;
201-
// SPEED HINTS
201+
// SPEED HINTS
202202
case 2:
203203
hints = new RenderingHints(
204204
RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_SPEED);

0 commit comments

Comments
 (0)