Merge pull request #3009 from hazendaz/master

[pom] Rework 'derby' and allow java 11 again
mybatis · Nov 12, 2023 · 3115758 · 3115758
2 parents eb7fae2 + 810155b
commit 3115758
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 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
@@ -132,7 +132,9 @@
 
   <properties>
     <clirr.comparisonVersion>3.4.6</clirr.comparisonVersion>
+    <derby.version>10.17.1.0</derby.version>
     <log4j.version>2.21.1</log4j.version>
+    <mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -d"excludedGroups=" -->
@@ -224,19 +226,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>
     <dependency>
@@ -316,7 +318,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>12.4.2.jre11</version>
+      <version>${mssql-jdbc.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -427,6 +429,10 @@
       <activation>
         <jdk>(,16)</jdk>
       </activation>
+      <properties>
+          <derby.version>10.15.2.0</derby.version>
+          <mssql-jdbc.version>12.4.2.jre8</mssql-jdbc.version>
+      </properties>
       <build>
         <pluginManagement>
           <plugins>
@@ -456,13 +462,32 @@
         <jdk>[16,)</jdk>
       </activation>
       <properties>
+        <derby.version>10.15.2.0</derby.version>
         <java.version>16</java.version>
         <java.release.version>16</java.release.version>
         <java.test.version>16</java.test.version>
         <java.test.release.version>16</java.test.release.version>
         <excludedGroups>TestcontainersTests,RequireIllegalAccess</excludedGroups>
       </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>