Skip to content

Commit 3115758

Browse files
authored
Merge pull request #3009 from hazendaz/master
[pom] Rework 'derby' and allow java 11 again
2 parents eb7fae2 + 810155b commit 3115758

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
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: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@
132132

133133
<properties>
134134
<clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
135+
<derby.version>10.17.1.0</derby.version>
135136
<log4j.version>2.21.1</log4j.version>
137+
<mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
136138

137139
<!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
138140
<!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -224,19 +226,19 @@
224226
<dependency>
225227
<groupId>org.apache.derby</groupId>
226228
<artifactId>derby</artifactId>
227-
<version>10.16.1.1</version>
229+
<version>${derby.version}</version>
228230
<scope>test</scope>
229231
</dependency>
230232
<dependency>
231233
<groupId>org.apache.derby</groupId>
232234
<artifactId>derbyshared</artifactId>
233-
<version>10.16.1.1</version>
235+
<version>${derby.version}</version>
234236
<scope>test</scope>
235237
</dependency>
236238
<dependency>
237239
<groupId>org.apache.derby</groupId>
238240
<artifactId>derbyoptionaltools</artifactId>
239-
<version>10.16.1.1</version>
241+
<version>${derby.version}</version>
240242
<scope>test</scope>
241243
</dependency>
242244
<dependency>
@@ -316,7 +318,7 @@
316318
<dependency>
317319
<groupId>com.microsoft.sqlserver</groupId>
318320
<artifactId>mssql-jdbc</artifactId>
319-
<version>12.4.2.jre11</version>
321+
<version>${mssql-jdbc.version}</version>
320322
<scope>provided</scope>
321323
</dependency>
322324
<dependency>
@@ -427,6 +429,10 @@
427429
<activation>
428430
<jdk>(,16)</jdk>
429431
</activation>
432+
<properties>
433+
<derby.version>10.15.2.0</derby.version>
434+
<mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
435+
</properties>
430436
<build>
431437
<pluginManagement>
432438
<plugins>
@@ -456,13 +462,32 @@
456462
<jdk>[16,)</jdk>
457463
</activation>
458464
<properties>
465+
<derby.version>10.15.2.0</derby.version>
459466
<java.version>16</java.version>
460467
<java.release.version>16</java.release.version>
461468
<java.test.version>16</java.test.version>
462469
<java.test.release.version>16</java.test.release.version>
463470
<excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
464471
</properties>
465472
</profile>
473+
<profile>
474+
<id>17</id>
475+
<activation>
476+
<jdk>[17,)</jdk>
477+
</activation>
478+
<properties>
479+
<derby.version>10.16.1.1</derby.version>
480+
</properties>
481+
</profile>
482+
<profile>
483+
<id>19</id>
484+
<activation>
485+
<jdk>[19,)</jdk>
486+
</activation>
487+
<properties>
488+
<derby.version>10.17.1.0</derby.version>
489+
</properties>
490+
</profile>
466491
</profiles>
467492

468493
</project>

0 commit comments

Comments
 (0)