Merge branch 'trunk' of git@ashardalon.com:bjc-utils2.git into trunk

3 files changed, 7 insertions, 6 deletions

diff --git a/base/.classpath b/base/.classpath
index 4015e42..09c1dfa 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/base/.settings/org.eclipse.jdt.core.prefs
index 2e3b411..5e248a8 100644
--- a/base/.settings/org.eclipse.jdt.core.prefs
+++ b/base/.settings/org.eclipse.jdt.core.prefs
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=16

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=11

+org.eclipse.jdt.core.compiler.compliance=16

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

@@ -75,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=info
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=info

 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=info

-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore

+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning

 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled

@@ -114,5 +114,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=info

 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.release=disabled

-org.eclipse.jdt.core.compiler.source=11

+org.eclipse.jdt.core.compiler.release=enabled

+org.eclipse.jdt.core.compiler.source=16

diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java
index 1032ce5..525eb53 100644
--- a/base/src/main/java/module-info.java
+++ b/base/src/main/java/module-info.java
@@ -37,4 +37,5 @@ module bjc.utils {
 	requires transitive java.desktop;
 	requires java.logging;
 	requires junit;
+	requires java.sql;
 }
\ No newline at end of file