add support for javax

Author: michaeloffner

.github/workflows/main.yml

@@ -16,11 +16,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: lucee-script-runner-maven-cache
+
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
@@ -33,7 +29,7 @@ jobs:
         id: extract-version
         run: |
           VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo "::set-output name=VERSION::$VERSION"
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Cache Lucee files
         uses: actions/cache@v4
@@ -53,10 +49,11 @@ jobs:
     env:
       testLabels: image
       testAdditional: ${{ github.workspace }}/tests
-      LUCEE_TEST_VERSIONS: '[ {"version": " 7.0.0.242-RC", "query": "7.0/all/light"}]'
+      LUCEE_TEST_VERSIONS_JAKARTA: ${{ vars.LUCEE_TEST_VERSIONS_JAKARTA }}
     strategy:
+      fail-fast: false
       matrix:
-        lucee: [ {"version": " 7.0.0.242-RC", "query": "7.0/all/light"}]
+        lucee: ${{ fromJSON(vars.LUCEE_TEST_VERSIONS_JAKARTA) }}
         java: [ 11, 21 ]
     services:
       minio:
@@ -94,7 +91,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
           distribution: 'adopt'
-  
+
       - name: Run Lucee Test Suite
         uses: lucee/script-runner@main
         with:
@@ -111,7 +108,7 @@ jobs:
 
   deploy:
     runs-on: ubuntu-latest
-    needs: [build-and-test]
+    needs: [setup, build-and-test]
     if: always() && needs.build-and-test.result == 'success'
     steps:
       - name: Checkout repository
@@ -149,4 +146,4 @@ jobs:
           else
             echo "------- Maven Deploy release on ${{ github.event_name }} -------";
             mvn -B -e -f pom.xml clean deploy -DperformRelease=true --settings maven-settings.xml
-          fi
+          fi

build.xml

@@ -112,6 +112,7 @@ destdir="${build}" debug="true" debuglevel="lines,vars,source">
     <copy todir="${dist}/extension/jars">
       <fileset dir="${lib}">
         <include name="**/*.jar"/>
+        <exclude name="**/javax.*"/>
         <exclude name="**/javax.servlet-api-*"/>
         <exclude name="**/javax.el-api-*"/>
         <exclude name="**/jakarta*"/>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.lucee</groupId>
     <artifactId>image-extension</artifactId>
-    <version>3.0.0.9</version>
+    <version>3.0.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Image Extension</name>
 

source/java/.classpath

@@ -34,5 +34,6 @@
 	<classpathentry kind="lib" path="libs/org.lucee.xmpcore-6.1.11.jar"/>
 	<classpathentry kind="lib" path="libs/org.lucee.gotson-webp-0.2.2.jar"/>
 	<classpathentry kind="lib" path="libs/jakarta.jakartaee-api-10.0.0.jar"/>
+	<classpathentry kind="lib" path="libs/javax.servlet.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

source/java/libs/javax.servlet.jar

@@ -1,4 +1,4 @@
-package org.lucee.extension.image.tag;
+package org.lucee.extension.image.tag.jakarta;
 
 import java.awt.Color;
 import java.io.IOException;

…org/lucee/extension/image/tag/Image.java …e/extension/image/tag/jakarta/Image.javasource/java/src/org/lucee/extension/image/tag/Image.java renamed to source/java/src/org/lucee/extension/image/tag/jakarta/Image.java source/java/src/org/lucee/extension/image/tag/Image.java renamed to source/java/src/org/lucee/extension/image/tag/jakarta/Image.java

@@ -1,4 +1,4 @@
-package org.lucee.extension.image.tag;
+package org.lucee.extension.image.tag.jakarta;
 
 import jakarta.servlet.jsp.tagext.Tag;
 import lucee.loader.engine.CFMLEngine;