Remove deprecated method from AbstractWeldELResolver

CI - change initial build to use JDK 17
weld · May 6, 2024 · 0b806e8 · 0b806e8
1 parent 09fb797
commit 0b806e8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 54 deletions.
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
@@ -12,15 +12,15 @@ on:
 
 jobs:
   # builds Weld snapshot, downloads WFLY and upgrades it, prepares ENV variable
-  build-jdk11:
-    name: "Initial JDK 11 Weld Build + WildFly patch"
+  initial-build:
+    name: "Initial JDK 17 Weld Build + WildFly patch"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/[email protected]
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Download WildFly
         run: |
@@ -80,15 +80,12 @@ jobs:
   incontainer-tests:
     name: "Weld In-container Tests - JDK ${{matrix.java.name}}"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
         java:
-          - { name: "11",
-              java-version: 11,
-          }
           - {
             name: "17",
             java-version: 17,
@@ -119,18 +116,11 @@ jobs:
           path: .
       - name: Extract WildFly
         run: unzip wildfly.zip
-      - if: ${{ matrix.java.name != '11' }}
-        name: Build with Maven
+      - name: Build with Maven
         run: |
           JBOSS_HOME=`pwd`'/wildfly'
           export JBOSS_HOME=`echo $JBOSS_HOME`
           mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -pl '!jboss-tck-runner'
-      - if: ${{ matrix.java.name == '11' }}
-        name: Build with Maven; skipping incontainer servlet tests due to JDK 11
-        run: |
-          JBOSS_HOME=`pwd`'/wildfly'
-          export JBOSS_HOME=`echo $JBOSS_HOME`
-          mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -pl '!environments/servlet/tests/tomcat,!jboss-tck-runner'
       - name: Prepare failure archive (if maven failed)
         if: failure()
         shell: bash
@@ -154,15 +144,12 @@ jobs:
   CDI-TCK:
     name: "CDI TCK - JDK ${{matrix.java.name}}"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
         java:
-          - { name: "11",
-              java-version: 11,
-          }
           - {
             name: "17",
             java-version: 17,
@@ -221,7 +208,7 @@ jobs:
   relaxed-mode-test:
     name: "Relaxed mode testing - JDK ${{matrix.java.name}}"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 120
     strategy:
       fail-fast: false
@@ -293,15 +280,12 @@ jobs:
   no-container-tests:
     name: "Weld Tests w/o Container - JDK ${{matrix.java.name}}"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
         java:
-          - { name: "11",
-              java-version: 11,
-          }
           - {
             name: "17",
             java-version: 17,
@@ -343,11 +327,11 @@ jobs:
   examples-tests:
     name: "Weld Examples build and test - JDK 17}"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 120
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/[email protected]
         with:
           java-version: 17
@@ -403,15 +387,12 @@ jobs:
   CDI-TCK-SE:
     name: "CDI TCK SE - JDK ${{matrix.java.name}}"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
         java:
-          - { name: "11",
-              java-version: 11,
-          }
           - {
             name: "17",
             java-version: 17,
@@ -453,7 +434,7 @@ jobs:
   weld-se-servlet-coop:
     name: "Weld SE-Servlet Cooperation"
     runs-on: ubuntu-latest
-    needs: build-jdk11
+    needs: initial-build
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4

diff --git a/...vlet/core/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java b/...vlet/core/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java
@@ -16,9 +16,6 @@
  */
 package org.jboss.weld.environment.servlet.util;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-
 import jakarta.el.ELContext;
 import jakarta.el.ELResolver;
 
@@ -35,11 +32,6 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
         return delegate().getCommonPropertyType(context, base);
     }
 
-    @Override
-    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-        return delegate().getFeatureDescriptors(context, base);
-    }
-
     @Override
     public Class<?> getType(ELContext context, Object base, Object property) {
         return delegate().getType(context, base, property);

diff --git a/...let/core/src/main/java/org/jboss/weld/environment/servlet/util/TransparentELResolver.java b/...let/core/src/main/java/org/jboss/weld/environment/servlet/util/TransparentELResolver.java
@@ -1,8 +1,5 @@
 package org.jboss.weld.environment.servlet.util;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-
 import jakarta.el.ELContext;
 import jakarta.el.ELResolver;
 
@@ -19,11 +16,6 @@ public Class<?> getCommonPropertyType(ELContext arg0, Object arg1) {
         return null;
     }
 
-    @Override
-    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext arg0, Object arg1) {
-        return null;
-    }
-
     @Override
     public Class<?> getType(ELContext arg0, Object arg1, Object arg2) {
         return null;

diff --git a/modules/web/src/main/java/org/jboss/weld/module/web/el/AbstractWeldELResolver.java b/modules/web/src/main/java/org/jboss/weld/module/web/el/AbstractWeldELResolver.java
@@ -16,9 +16,7 @@
  */
 package org.jboss.weld.module.web.el;
 
-import java.beans.FeatureDescriptor;
 import java.lang.annotation.Annotation;
-import java.util.Iterator;
 
 import jakarta.el.ELContext;
 import jakarta.el.ELResolver;
@@ -42,11 +40,6 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
         return null;
     }
 
-    @Override
-    public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-        return null;
-    }
-
     @Override
     public Class<?> getType(ELContext context, Object base, Object property) {
         return null;