Tweak for new setup

7 files changed, 33 insertions, 18 deletions

diff --git a/base/.classpath b/base/.classpath
index e9d3a7c..c80f1ca 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -9,9 +9,10 @@
 	<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="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>
diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/base/.settings/org.eclipse.jdt.core.prefs
index aeacc3c..2af1e7b 100644
--- a/base/.settings/org.eclipse.jdt.core.prefs
+++ b/base/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 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 509847a..ab1c4f9 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -52,11 +52,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>
 			<plugin>
diff --git a/dice/.classpath b/dice/.classpath
index 65e14b4..5a13661 100644
--- a/dice/.classpath
+++ b/dice/.classpath
@@ -14,7 +14,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/example/java"/>
-	<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>
@@ -24,5 +24,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/dice/.settings/org.eclipse.jdt.core.prefs b/dice/.settings/org.eclipse.jdt.core.prefs
index cf2cd45..2af1e7b 100644
--- a/dice/.settings/org.eclipse.jdt.core.prefs
+++ b/dice/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=11
diff --git a/dice/src/main/java/module-info.java b/dice/src/main/java/module-info.java
index ab1d3b4..fed289a 100644
--- a/dice/src/main/java/module-info.java
+++ b/dice/src/main/java/module-info.java
@@ -6,12 +6,12 @@
  */
 module dicelang.dice {
 	exports bjc.dicelang.neodice;
-	exports bjc.dicelang.neodice.statements;
+//	exports bjc.dicelang.neodice.statements;
 	exports bjc.dicelang.dicev2;
 	exports bjc.dicelang.dice;
-	exports bjc.dicelang.neodice.commands;
+//	exports bjc.dicelang.neodice.commands;
 
 	requires bjc.utils;
 	requires esodata;
 	requires junit;
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index 0aba55e..bbc2331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,11 +11,11 @@
 		<plugins>
 			<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>