Merge branch '6.0' of https://github.com/lucee/Lucee into LDEV_4116

# Conflicts: # core/src/main/cfml/context/admin/resources/language/de.json # core/src/main/cfml/context/admin/resources/language/en.json
MitrahSoft · Mar 27, 2024 · ce958e7 · ce958e7
2 parents 8b1ca8c + 6569771
commit ce958e7
Show file tree

Hide file tree

Showing 1,157 changed files with 38,537 additions and 15,313 deletions.
diff --git a/.github/workflows/main-java-18.yml b/.github/workflows/main-java-18.yml
diff --git a/.github/workflows/main-java-21.yml b/.github/workflows/main-java-21.yml
@@ -0,0 +1,10 @@
+name: Build with Java 21
+
+on: [workflow_dispatch]
+
+jobs:
+  build:
+    uses: ./.github/workflows/main.yml
+    with:
+      LUCEE_TEST_JAVA_VERSION: '21'
+      LUCEE_BUILD_JAVA_VERSION: '21'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,10 +25,16 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      DO_DEPLOY: "${{ github.event_name == 'push' && github.ref == 'refs/heads/6.0' }}"
+      DO_DEPLOY: "${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/6.0') }}"
       LUCEE_BUILD_JAVA_VERSION: 8
       LUCEE_TEST_JAVA_VERSION: ''
     services:
+      ldap:
+        #  image: kwart/ldap-server
+           image: rroemhild/test-openldap
+           ports:
+             - 10389:10389
+             - 10636:10636
       sql-server:
         # Docker Hub image
         image: mcr.microsoft.com/mssql/server:2019-latest
@@ -61,12 +67,6 @@ jobs:
           - 3993:3993 #IMAPS
           - 3995:3995 #POP3S
           - 8080:8080 #API
-      ldap:
-      #  image: kwart/ldap-server
-         image: rroemhild/test-openldap
-         ports:
-           - 10389:10389
-           - 10636:10636
     steps:
     # when workflow is run via a workflow_call, these vars are found under input, which doesn't exist otherwise
     # so lets copy them over to the normal env vars
@@ -181,11 +181,13 @@ jobs:
         POP_PASSWORD: doesntmatter
         LDAP_SERVER: localhost
         LDAP_PORT: 10389
+        LDAP_PORT_SECURE: 10636
         LDAP_BASE_DN: dc=planetexpress,dc=com
         LDAP_USERNAME: cn=admin,dc=planetexpress,dc=com
         LDAP_PASSWORD: GoodNewsEveryone
         S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_ID_TEST }}
         S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY_TEST }}
+        S3_BUCKET_PREFIX: lucee-ldev-6-
         # DO_DEPLOY: ${{ github.event_name == 'push' }}
         # for uploading successful builds
         S3_ACCESS_ID_DOWNLOAD: ${{ secrets.S3_ACCESS_ID_DOWNLOAD }}
@@ -195,6 +197,7 @@ jobs:
         CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
         CI_DEPLOY_PASSPHRASE: ${{ secrets.CI_DEPLOY_PASSPHRASE }}
         LUCEE_DOCKER_FILES_PAT_TOKEN: ${{ secrets.LUCEE_DOCKER_FILES_PAT_TOKEN }}
+        LUCEE_BUILD_FAIL_CONFIGURED_SERVICES_FATAL: true
       #run: ant -noinput -buildfile loader/build.xml
       run: |
         if [ "${{ env.DO_DEPLOY }}" == "true" ]; then
@@ -218,6 +221,9 @@ jobs:
       with:
         name: Lucee-${{ steps.cleanrefname.outputs.value }}-junit-test-results-${{ github.run_number }}
         path: test/reports/*.xml
+    - name: Remove Lucee build artifacts from local maven cache (avoid growing cache)
+      run: |
+        rm -rfv ~/.m2/repository/org/lucee/lucee/
     - name: Publish Test Results
       uses: EnricoMi/publish-unit-test-result-action@v2
       if: always()

diff --git a/.github/workflows/osv-scanner.yml b/.github/workflows/osv-scanner.yml
@@ -16,7 +16,9 @@ jobs:
     - name: Build Lucee without using a Maven cache
       run: ant -noinput -buildfile loader/build.xml fast
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
+      with: 
+        go-version: '>=1.21.6'
     - name: Install Google OSV Scanner
       run: go install github.com/google/osv-scanner/cmd/osv-scanner@v1
     - name: Run OSV vulnerabilities Scanner

diff --git a/.github/workflows/update-provider.yml b/.github/workflows/update-provider.yml
@@ -10,17 +10,17 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      luceeVersion: light-6.0.0.294-SNAPSHOT
+      luceeVersion: zero-6.0.0.495-SNAPSHOT
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
-        distribution: 'adopt'
+        distribution: 'temurin'
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2
         key: lucee-script-runner-maven-cache
@@ -30,3 +30,5 @@ jobs:
         webroot: ${{ github.workspace }}/test
         execute: /update-provider.cfm
         luceeVersion: ${{ env.luceeVersion }}
+        extensions:
+        extensionDir:
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,14 +5,26 @@
     "version": "0.2.0",
         "configurations": [{
             "type": "java",
-            "name": "Attach Lucee Tomcat port 8000",
+            "name": "Attach java debugger on port 5000 for tests",
             "request": "attach",
             "hostName": "localhost",
-            "port": "8000",
+            "port": "5000",
             "sourcePaths" :[
                 "${workspaceFolder}/core",
                 "${workspaceFolder}/loader",
             ]
-        }   
+        },
+        {
+            "type": "java",
+            "name": "Build and attach java debugger on port 5000 for tests",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": "5000",
+            "sourcePaths" :[
+                "${workspaceFolder}/core",
+                "${workspaceFolder}/loader",
+            ],
+            "preLaunchTask": "buildLucee"
+        }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,29 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "buildLucee",
+            "type": "shell",
+            "options": {
+                "cwd": "${workspaceFolder}/loader",
+            },
+            "command": "mvn test -DtestDebugger='true' -DtestDebug='true'",
+            "isBackground": true,
+            "problemMatcher": [{
+                "pattern": [{
+                    "regexp": "\\b\\B",
+                    "file": 1,
+                    "location": 2,
+                    "message": 3
+                }],
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^.*",
+                    "endsPattern": "^.*Listening for transport dt_socket at address.*"
+                }
+            }]
+        }
+    ]
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -28,14 +28,18 @@ Please read our docs on working with the Lucee source code: https://docs.lucee.o
 
 6.0 is the active development branch, any new cool stuff should be done against this branch
 
-5.3 is our LTS branch, mainly only bugfixes
+5.4 is our LTS branch, mainly only bugfixes
+
+5.3 is EOL
 
 4.5 is totally EOL
 
 # Java Version
 
 Java 8 is still our base line, we recommend Java 11 for production, but as long as we can support Java 8, we will.
 
+Java 17 is a work in progress, it's mostly working, see https://luceeserver.atlassian.net/browse/LDEV-3807
+
 # Submission guidelines
 
 * Please do not send pull requests to the `master` branch.