diff options
| author | Ben Culkin <scorpress@gmail.com> | 2023-11-08 19:47:27 -0500 |
|---|---|---|
| committer | Ben Culkin <scorpress@gmail.com> | 2023-11-08 19:47:27 -0500 |
| commit | f902e4ed803d98e5bb8914be377e78e6e0739d82 (patch) | |
| tree | e64ca840e3eef6e30dfd23548e4924dcdba4c89c /base | |
| parent | 4e6854faa5706d02a74e0c04dc84a81aca58169a (diff) | |
| parent | bdad2e9c2f286469519ba8ad3197e1a9b1e9190f (diff) | |
Merge branch 'trunk' of git@ashardalon.com:bjc-utils2.git into trunk
Diffstat (limited to 'base')
| -rw-r--r-- | base/.classpath | 10 | ||||
| -rw-r--r-- | base/.settings/org.eclipse.jdt.core.prefs | 6 | ||||
| -rw-r--r-- | base/pom.xml | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/base/.classpath b/base/.classpath index a1c34bd..4015e42 100644 --- a/base/.classpath +++ b/base/.classpath @@ -9,6 +9,7 @@ <classpathentry excluding="**" kind="src" output="target/classes" path="data"> <attributes> <attribute name="maven.pomderived" value="true"/> + <attribute name="optional" value="true"/> </attributes> </classpathentry> <classpathentry kind="src" output="target/test-classes" path="src/test/java"> @@ -24,10 +25,17 @@ <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-17"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> <attributes> <attribute name="maven.pomderived" 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/base/.settings/org.eclipse.jdt.core.prefs b/base/.settings/org.eclipse.jdt.core.prefs index f8c3027..2e3b411 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=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -115,4 +115,4 @@ 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=17
+org.eclipse.jdt.core.compiler.source=11
diff --git a/base/pom.xml b/base/pom.xml index 29744b6..cae055c 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -65,11 +65,11 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>3.8.0</version> <configuration> - <source>1.17</source> - <target>1.17</target> + <source>11</source> + <target>11</target> </configuration> </plugin> </plugins> |