clean up

lucee · Dec 11, 2024 · c740cfa · c740cfa
1 parent 0351d12
commit c740cfa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -51,23 +51,6 @@ jobs:
     strategy:
       matrix:
         lucee: ${{ fromJSON(vars.LUCEE_TEST_VERSIONS) }}
-    services:
-      redis:
-        # Docker Hub image
-        image: redis
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps port 6379 on service container to the host
-          - 6379:6379
-      minio:
-        image: fclairamb/minio-github-actions
-        ports:
-          - 9000:9000
     steps:
       - uses: actions/checkout@v4
 
@@ -85,7 +68,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: redis-lex-${{ matrix.lucee.version }}
+          name: lucene-lex-${{ matrix.lucee.version }}
           path: target/*.lex
 
       - name: Checkout Lucee
@@ -103,10 +86,8 @@ jobs:
           luceeVersionQuery: ${{ matrix.lucee.query }}
           extensionDir: ${{ github.workspace }}/target
         env:
-          testLabels: redis
+          testLabels: lucene
           testAdditional: ${{ github.workspace }}/tests
-          REDIS_PORT: 6379
-          REDIS_SERVER: localhost
 
   deploy:
     runs-on: ubuntu-latest

diff --git a/source/java/.classpath b/source/java/.classpath
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="optional" value="true"/>
+			<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-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="libs/javax.servlet.jar"/>
@@ -21,5 +26,10 @@
 	<classpathentry kind="lib" path="libs/org.apache.commons.logging-1.2.0.jar"/>
 	<classpathentry kind="lib" path="libs/org.lucee.pdfbox-fontbox-3.0.0.RC1.jar"/>
 	<classpathentry kind="lib" path="libs/org.lucee.pdfbox-3.0.0.RC102.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/source/java/.project b/source/java/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>