Skip to content

Commit 822c9d2

Browse files
committed
[pom] Rework 'derby' and allow java 11 again
not doing this will have impact due to our java 16+ switching to require java 16.
1 parent eb7fae2 commit 822c9d2

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-latest, macos-latest, windows-latest]
11-
java: [17, 21, 22-ea]
11+
java: [11, 17, 21, 22-ea]
1212
distribution: ['temurin']
1313
fail-fast: false
1414
max-parallel: 4

pom.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132

133133
<properties>
134134
<clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
135+
<derby.version>10.16.1.1</derby.version>
135136
<log4j.version>2.21.1</log4j.version>
136137

137138
<!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
@@ -224,19 +225,19 @@
224225
<dependency>
225226
<groupId>org.apache.derby</groupId>
226227
<artifactId>derby</artifactId>
227-
<version>10.16.1.1</version>
228+
<version>${derby.version}</version>
228229
<scope>test</scope>
229230
</dependency>
230231
<dependency>
231232
<groupId>org.apache.derby</groupId>
232233
<artifactId>derbyshared</artifactId>
233-
<version>10.16.1.1</version>
234+
<version>${derby.version}</version>
234235
<scope>test</scope>
235236
</dependency>
236237
<dependency>
237238
<groupId>org.apache.derby</groupId>
238239
<artifactId>derbyoptionaltools</artifactId>
239-
<version>10.16.1.1</version>
240+
<version>${derby.version}</version>
240241
<scope>test</scope>
241242
</dependency>
242243
<dependency>
@@ -427,6 +428,9 @@
427428
<activation>
428429
<jdk>(,16)</jdk>
429430
</activation>
431+
<properties>
432+
<derby.version>10.15.2.0</derby.version>
433+
</properties>
430434
<build>
431435
<pluginManagement>
432436
<plugins>
@@ -463,6 +467,15 @@
463467
<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
464468
</properties>
465469
</profile>
470+
<profile>
471+
<id>19</id>
472+
<activation>
473+
<jdk>[19,)</jdk>
474+
</activation>
475+
<properties>
476+
<derby.version>10.17.1.0</derby.version>
477+
</properties>
478+
</profile>
466479
</profiles>
467480

468481
</project>

0 commit comments

Comments
 (0)