Make it compile with and for Java 11.

ecki · May 24, 2024 · a2d7672 · a2d7672
1 parent 4c0d55a
commit a2d7672
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 target/
 .settings/
-
+.vscode/
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.seeburger.vfs2</groupId>
     <artifactId>seeburger-vfs2-parent</artifactId>
-    <version>1.7.9-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SEEBURGER VFS2 Parent</name>
@@ -19,10 +19,11 @@
     <properties>
         <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <maven.compiler.compilerVersion>${maven.compiler.source}</maven.compiler.compilerVersion>
+        <maven.compiler.release>11</maven.compiler.release>
         <version.commons-vfs2>2.2</version.commons-vfs2>
+        <!-- surefire for Java11+ -->
+        <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
+        <forkCount>1</forkCount>
     </properties>
 
     <modules>
@@ -48,7 +49,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
+                    <version>3.13.0</version>
                     <inherited>true</inherited>
                     <configuration>
                         <compilerArgument>-Xlint:all</compilerArgument>

diff --git a/vfs2provider-digestarc/.classpath b/vfs2provider-digestarc/.classpath
@@ -23,5 +23,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/vfs2provider-digestarc/pom.xml b/vfs2provider-digestarc/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.seeburger.vfs2</groupId>
     <artifactId>seeburger-vfs2-parent</artifactId>
-    <version>1.7.9-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>vfs2provider-digestarc</artifactId>

diff --git a/vfs2provider-jdbctable/.classpath b/vfs2provider-jdbctable/.classpath
@@ -17,6 +17,7 @@
 		<attributes>
 			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@@ -29,5 +30,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/vfs2provider-jdbctable/pom.xml b/vfs2provider-jdbctable/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.seeburger.vfs2</groupId>
         <artifactId>seeburger-vfs2-parent</artifactId>
-        <version>1.7.9-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>vfs2provider-jdbctable</artifactId>