Merge pull request #3 from lucee/LDEV-6189

zspitzer · web-flow · commit 689f5c51105a · 2026-03-24T13:48:08.000+11:00
LDEV-6189 fix malformed Require-Bundle symbolic name
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,24 +1,36 @@
 name: Java CI Combined
 
-on: [push, pull_request, workflow_dispatch]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      lucee-versions:
+        description: 'JSON array of Lucee versions to test'
+        default: '["7.0/snapshot/light","7.0/stable/light","6.2/snapshot/light","6.2/stable/light"]'
+      dry-run:
+        description: 'Dry run - skip deploy to Maven'
+        type: boolean
+        default: false
 
 jobs:
   setup:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.extract-version.outputs.VERSION }}
+      lucee-matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '11'
 
       - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -29,10 +41,20 @@ 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: Set Lucee test matrix
+        id: set-matrix
+        run: |
+          DEFAULT='["7.0/snapshot/light","7.0/stable/light","6.2/snapshot/light","6.2/stable/light"]'
+          MATRIX="${{ inputs.lucee-versions || '' }}"
+          if [ -z "$MATRIX" ]; then
+            MATRIX="$DEFAULT"
+          fi
+          echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
 
       - name: Cache Lucee files
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
           key: lucee-downloads
@@ -43,68 +65,92 @@ jobs:
         env:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
 
-  build-and-test:
+  build:
     runs-on: ubuntu-latest
-    needs: setup
-    env:
-      LUCEE_TEST_VERSIONS_JAKARTA: ${{ vars.LUCEE_TEST_VERSIONS_JAKARTA }}
-    strategy:
-      matrix:
-        lucee: ${{ fromJSON(vars.LUCEE_TEST_VERSIONS_JAKARTA) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'adopt'
 
+      - name: Cache Maven packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
       - name: Build and Install with Maven
         run: |
           echo "------- Maven Install -------";
           mvn -B -e -f pom.xml clean install
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: websocketclient-lex-${{ matrix.lucee.version }}
+          name: websocketclient-lex
           path: target/*.lex
 
+  test:
+    runs-on: ubuntu-latest
+    needs: [setup, build]
+    strategy:
+      fail-fast: false
+      matrix:
+        lucee: ${{ fromJSON(needs.setup.outputs.lucee-matrix) }}
+        java: [ 11, 21 ]
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v8
+        with:
+          name: websocketclient-lex
+          path: target
+
       - name: Checkout Lucee
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: lucee/lucee
           path: lucee
 
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v5
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'adopt'
+
       - name: Run Lucee Test Suite
         uses: lucee/script-runner@main
         with:
           webroot: ${{ github.workspace }}/lucee/test
           execute: /bootstrap-tests.cfm
-          luceeVersion: ${{ matrix.lucee.version }}
-          luceeVersionQuery: ${{ matrix.lucee.query }}
+          luceeVersion: ${{ matrix.lucee }}
           extensionDir: ${{ github.workspace }}/target
         env:
           testLabels: websocketclient
           testAdditional: ${{ github.workspace }}/tests
 
   deploy:
     runs-on: ubuntu-latest
-    needs: [build-and-test]
-    if: always() && needs.build-and-test.result == 'success'
+    needs: [setup, test]
+    if: always() && needs.test.result == 'success' && github.ref == 'refs/heads/master' && !inputs.dry-run
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '11'
 
       - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,6 @@ target
 target/*
 *.lock
 *.DS_Store
-/cache
+/cache
+/.claude
+/.vscode
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,20 @@
+# Changelog
+
+## 2.3.0.9
+
+- [LDEV-6189](https://luceeserver.atlassian.net/browse/LDEV-6189) — fix malformed `Require-Bundle` symbolic name in MANIFEST.MF, was using Maven coordinates instead of OSGi `Bundle-SymbolicName`, causing flaky OSGi resolution failures on Lucee 7.0 cold start
+
+## 2.3.0.8
+
+- [LDEV-6100](https://luceeserver.atlassian.net/browse/LDEV-6100) — Jakarta compatibility, use reflection for `createPageContext`
+- Add README
+- Initial Maven build
+
+## 2.3.0.7
+
+- Switch to Maven build
+- Add Sonatype deployment
+
+## 1.0.0.0 (2017-10-25)
+
+- Initial commit
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.lucee</groupId>
     <artifactId>websocket-client-extension</artifactId>
-    <version>2.3.0.8-SNAPSHOT</version>
+    <version>2.3.0.9-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WebSockets Client Extension</name>
 
diff --git a/source/java/src/META-INF/MANIFEST.MF b/source/java/src/META-INF/MANIFEST.MF
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
 Export-Package: org.lucee.extension.function
-Import-Package: com.neovisionaries.ws.client
-Require-Bundle: com.neovisionaries:nv-websocket-client;bundle-version=2.3.0
+Require-Bundle: com.neovisionaries.ws.client;bundle-version=2.3.0
 Bundle-ManifestVersion: 2
diff --git a/tests/TestPlaceholder.cfc b/tests/TestPlaceholder.cfc
diff --git a/tests/WebSocketClientTest.cfc b/tests/WebSocketClientTest.cfc
@@ -0,0 +1,15 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="websocketclient" {
+
+	function testCreateWebSocketClientLoads() {
+		try {
+			ws = CreateWebSocketClient( "ws://localhost:9999/nope", new WebSocketListener() );
+			fail( "Expected connection error" );
+		}
+		catch ( any e ) {
+			// connection refused is expected - means the class loaded and OSGi resolved OK
+			expect( e.message ).notToInclude( "osgi.wiring.package" );
+			expect( e.message ).notToInclude( "Unable to resolve" );
+		}
+	}
+
+}
diff --git a/tests/WebSocketListener.cfc b/tests/WebSocketListener.cfc
@@ -0,0 +1,11 @@
+component {
+
+	function onMessage( message ) {
+		systemOutput( "onMessage: " & message, true );
+	}
+
+	function onError( type, cause ) {
+		systemOutput( "onError: " & type, true );
+	}
+
+}
