Merge pull request #625 from hazendaz/master

Require java 11 now and update resource api and derby
mybatis · Nov 4, 2023 · ed64951 · ed64951
2 parents 32edf1a + 9ecb9b5
commit ed64951
Show file tree

Hide file tree

Showing 2 changed files with 8 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: [11, 17, 21, 22-ea]
+        java: [17, 21, 22-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4

diff --git a/pom.xml b/pom.xml
@@ -87,6 +87,9 @@
   </distributionManagement>
 
   <properties>
+    <java.version>11</java.version>
+    <java.release.version>11</java.release.version>
+
     <clirr.comparisonVersion>3.10</clirr.comparisonVersion>
     <spotbugs.onlyAnalyze>org.mybatis.guice.*</spotbugs.onlyAnalyze>
     <gcu.product>Guice</gcu.product>
@@ -131,7 +134,7 @@
     <dependency>
       <groupId>jakarta.resource</groupId>
       <artifactId>jakarta.resource-api</artifactId>
-      <version>2.0.0</version>
+      <version>2.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -312,19 +315,19 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.15.2.0</version>
+      <version>10.16.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyshared</artifactId>
-      <version>10.15.2.0</version>
+      <version>10.16.1.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derbyoptionaltools</artifactId>
-      <version>10.15.2.0</version>
+      <version>10.16.1.1</version>
       <scope>test</scope>
     </dependency>