From a5f77b8b8cd1bd7eb6e66814f7264df35730f3f4 Mon Sep 17 00:00:00 2001
From: Scott M Stark <starksm64@gmail.com>
Date: Tue, 12 Dec 2023 12:04:41 -0600
Subject: [PATCH 1/4] Update jakarta.el to 6.0.0-M1 and update osgi manifest
 export/imports, #732

Signed-off-by: Scott M Stark <starksm64@gmail.com>
---
 el/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/el/pom.xml b/el/pom.xml
index 89d31555..8045b25c 100644
--- a/el/pom.xml
+++ b/el/pom.xml
@@ -22,7 +22,7 @@
 	</licenses>
 
 	<properties>
-		<uel.api.version>5.0.0</uel.api.version>
+		<uel.api.version>6.0.0-M1</uel.api.version>
 	</properties>
 
 	<dependencyManagement>
@@ -94,10 +94,10 @@
 				<configuration>
 					<instructions>
 						<Export-Package>
-							jakarta.enterprise.inject.spi.el;version=4.1,
+							jakarta.enterprise.inject.spi.el;version="4.1";uses:="jakarta.el"
 						</Export-Package>
 						<Import-Package>
-							jakarta.el;version=5.0
+							jakarta.el;version="6.0",jakarta.enterprise.context,jakarta.enterprise.inject.spi
 						</Import-Package>
 					</instructions>
 				</configuration>

From 67e7caab1571462741077fbddfee7977afb75f76 Mon Sep 17 00:00:00 2001
From: Scott M Stark <starksm64@gmail.com>
Date: Tue, 12 Dec 2023 15:47:08 -0600
Subject: [PATCH 2/4] Avoid using SE 11 on el module since it now depends on a
 jar with SE 17 classes

Signed-off-by: Scott M Stark <starksm64@gmail.com>
---
 .github/workflows/ci-actions.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 45aa1805..3c411581 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -22,9 +22,13 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
-      - name: "Maven install"
+      - if: ${{ matrix.java != '11' }}
+        name: "Maven install"
         run: |
           mvn -Pstaging install -DskipTests=true -B -V
+      - if: ${{ matrix.java == '11' }}
+        run: |
+          mvn -Pstaging -pl '!el' install -DskipTests=true -B -V
       - name: "Maven test"
         run: |
           mvn -Pstaging test -B

From 637c0125dc07f3f934236c19efa3b5bb86fac7c8 Mon Sep 17 00:00:00 2001
From: Scott M Stark <starksm64@gmail.com>
Date: Tue, 12 Dec 2023 15:56:57 -0600
Subject: [PATCH 3/4] Avoid using SE 11 on el module since it now depends on a
 jar with SE 17 classes

Signed-off-by: Scott M Stark <starksm64@gmail.com>
---
 .github/workflows/ci-actions.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 3c411581..73708705 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -23,12 +23,18 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - if: ${{ matrix.java != '11' }}
-        name: "Maven install"
+        name: "Maven install > 11"
         run: |
           mvn -Pstaging install -DskipTests=true -B -V
       - if: ${{ matrix.java == '11' }}
+        name: "Maven install 11"
         run: |
           mvn -Pstaging -pl '!el' install -DskipTests=true -B -V
-      - name: "Maven test"
+      - if: ${{ matrix.java != '11' }}
+        name: "Maven test > 11"
         run: |
           mvn -Pstaging test -B
+      - if: ${{ matrix.java == '11' }}
+        name: "Maven install 11"
+        run: |
+          mvn -Pstaging -pl '!el' test -B

From dfd7507a88351a1e22bd34665d9056395173d9fd Mon Sep 17 00:00:00 2001
From: Scott M Stark <starksm64@gmail.com>
Date: Tue, 12 Dec 2023 15:59:34 -0600
Subject: [PATCH 4/4] Avoid using SE 11 on el module since it now depends on a
 jar with SE 17 classes

Signed-off-by: Scott M Stark <starksm64@gmail.com>
---
 .github/workflows/ci-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 73708705..ddc6db3b 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -35,6 +35,6 @@ jobs:
         run: |
           mvn -Pstaging test -B
       - if: ${{ matrix.java == '11' }}
-        name: "Maven install 11"
+        name: "Maven test 11"
         run: |
           mvn -Pstaging -pl '!el' test -B