Skip to content

Commit 296b7ab

Browse files
committed
[derby] Restore java 11 and adjust derby to change per jdk version
1 parent 8741b17 commit 296b7ab

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
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: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<java.version>17</java.version>
110110
<java.release.version>17</java.release.version>
111111

112+
<derby.version>10.17.1.0</derby.version>
112113
<mybatis.version>3.5.14</mybatis.version>
113114
<spring.version>6.0.13</spring.version>
114115
<spring-batch.version>5.0.3</spring-batch.version>
@@ -167,7 +168,7 @@
167168
<dependency>
168169
<groupId>org.apache.derby</groupId>
169170
<artifactId>derby</artifactId>
170-
<version>10.16.1.1</version>
171+
<version>${derby.version}</version>
171172
<scope>test</scope>
172173
</dependency>
173174

@@ -460,4 +461,34 @@
460461
</plugin>
461462
</plugins>
462463
</build>
464+
465+
<profiles>
466+
<profile>
467+
<id>pre16</id>
468+
<activation>
469+
<jdk>(,16)</jdk>
470+
</activation>
471+
<properties>
472+
<derby.version>10.15.2.0</derby.version>
473+
</properties>
474+
</profile>
475+
<profile>
476+
<id>17</id>
477+
<activation>
478+
<jdk>[17,)</jdk>
479+
</activation>
480+
<properties>
481+
<derby.version>10.16.1.1</derby.version>
482+
</properties>
483+
</profile>
484+
<profile>
485+
<id>19</id>
486+
<activation>
487+
<jdk>[19,)</jdk>
488+
</activation>
489+
<properties>
490+
<derby.version>10.17.1.0</derby.version>
491+
</properties>
492+
</profile>
493+
</profiles>
463494
</project>

0 commit comments

Comments
 (0)