Merge pull request #643 from hazendaz/master

Restore java 11 and rework derby to be selected per version where renovate won't suggest again.
mybatis · Nov 12, 2023 · f331baf · f331baf
2 parents ad19b27 + 02b2f5c
commit f331baf
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [17, 21, 22-ea]
+        java: [11, 17, 21, 22-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4

diff --git a/pom.xml b/pom.xml
@@ -93,6 +93,7 @@
     <clirr.comparisonVersion>3.10</clirr.comparisonVersion>
     <spotbugs.onlyAnalyze>org.mybatis.guice.*</spotbugs.onlyAnalyze>
     <gcu.product>Guice</gcu.product>
+    <derby.version>10.17.1.0</derby.version>
     <guice.version>7.0.0</guice.version>
     <annotation-api.version>2.1.1</annotation-api.version>
     <ejb-api.version>4.0.1</ejb-api.version>
@@ -290,19 +291,19 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyshared</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyoptionaltools</artifactId>
-      <version>10.16.1.1</version>
+      <version>${derby.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -358,4 +359,34 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>pre16</id>
+      <activation>
+        <jdk>(,16)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.15.2.0</derby.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.16.1.1</derby.version>
+      </properties>
+    </profile>
+    <profile>
+      <id>19</id>
+      <activation>
+        <jdk>[19,)</jdk>
+      </activation>
+      <properties>
+          <derby.version>10.17.1.0</derby.version>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>