build: Updated project Eclipse settings for slightly improved Maven i…

…ntegration
baraverkstad · Mar 24, 2024 · 4fcdfdc · 4fcdfdc
1 parent 728ee61
commit 4fcdfdc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 44 deletions.
diff --git a/.classpath b/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="src/plugin/http/src"/>
 	<classpathentry kind="src" path="src/plugin/cmdline/src"/>
+	<classpathentry kind="src" path="src/plugin/http/src"/>
 	<classpathentry kind="src" path="src/plugin/jdbc/src"/>
 	<classpathentry kind="src" output="target/test-classes" path="test/src/java">
 		<attributes>
@@ -15,52 +15,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/commons-cli-1.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.16.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-fileupload-1.5.jar"/>
-	<classpathentry kind="lib" path="lib/commons-io-2.15.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang3-3.13.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool2-2.12.0.jar"/>
-	<classpathentry kind="lib" path="lib/commons-text-1.11.0.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-server-12.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlet-api-4.0.6.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util-12.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-ee8-nested-12.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-ee8-servlet-12.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/rhino-1.7.14.jar"/>
-	<classpathentry kind="lib" path="lib/snakeyaml-engine-2.7.jar"/>
-	<classpathentry kind="lib" path="test/lib/junit-4.13.2.jar"/>
-	<classpathentry kind="lib" path="test/lib/hamcrest-2.2.jar"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<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="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<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.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="test/lib/junit-4.13.2.jar"/>
+	<classpathentry kind="lib" path="test/lib/hamcrest-2.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -114,7 +114,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16

diff --git a/Makefile b/Makefile
@@ -41,6 +41,7 @@ clean:
 setup: clean
 	npm install --omit=optional
 	mvn dependency:copy-dependencies -DoutputDirectory=lib/
+	mvn dependency:copy-dependencies # for Eclipse project
 
 
 # Compile source and build plug-ins

diff --git a/pom.xml b/pom.xml
@@ -11,6 +11,7 @@
   <name>RapidContext</name>
 
   <properties>
+    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8