Merge pull request #251 from hazendaz/master

Raising to java 11
mybatis · Sep 25, 2024 · 67e21de · 67e21de
2 parents 2e76718 + 6a17835
commit 67e21de
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 28 deletions.
diff --git a/NOTICE b/NOTICE
@@ -2,7 +2,7 @@ iBATIS
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
 
-   Copyright 2010 The Apache Software Foundation
+   Copyright 2010-2024 The Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -62,17 +62,21 @@
   </distributionManagement>
 
   <properties>
+    <!-- Maven compiler options -->
+    <java.version>11</java.version>
+    <java.release.version>11</java.release.version>
+
     <clirr.comparisonVersion>2.4.4</clirr.comparisonVersion>
     <derby.version>10.17.1.0</derby.version>
-    <java.version>8</java.version>
-    <java.release.version>8</java.release.version>
-    <java.test.version>8</java.test.version>
-    <java.test.release.version>8</java.test.release.version>
+    <slf4j.version>2.0.16</slf4j.version>
+
     <module.name>org.mybatis.mybatis2</module.name>
     <osgi.export>org.ibatis.*;version=${project.version};-noimport:=true</osgi.export>
     <osgi.import>*;resolution:=optional</osgi.import>
     <osgi.dynamicImport>*</osgi.dynamicImport>
 
+    <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+
     <!-- Reproducible Builds -->
     <project.build.outputTimestamp>1670182719</project.build.outputTimestamp>
   </properties>
@@ -81,19 +85,19 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.16</version>
+      <version>${slf4j.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.16</version>
+      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>2.0.16</version>
+      <version>${slf4j.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -192,34 +196,15 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>pre16</id>
-      <activation>
-        <jdk>(,16)</jdk>
-      </activation>
-      <properties>
-          <derby.version>10.15.2.0</derby.version>
-      </properties>
-    </profile>
     <profile>
       <id>jdk17on</id>
       <activation>
-        <jdk>[17,)</jdk>
+        <jdk>[17,19]</jdk>
       </activation>
       <properties>
-        <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
         <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>