diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml index 7d1cdf42f1..39e9ddabb4 100644 --- a/.github/workflows/ci-actions.yml +++ b/.github/workflows/ci-actions.yml @@ -12,7 +12,7 @@ on: jobs: # builds Weld snapshot, downloads WFLY and upgrades it, prepares ENV variable - build-jdk11: + initial-build: name: "Initial JDK 11 Weld Build + WildFly patch" runs-on: ubuntu-latest steps: @@ -20,7 +20,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4.2.1 with: - java-version: 11 + java-version: 17 distribution: 'temurin' - name: Download WildFly run: | @@ -80,7 +80,7 @@ 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 @@ -154,7 +154,7 @@ 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 @@ -221,7 +221,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,7 +293,7 @@ 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 @@ -343,7 +343,7 @@ 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 @@ -403,7 +403,7 @@ 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 @@ -453,7 +453,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/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java index c8c679d4ad..b2e4148b5b 100644 --- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java +++ b/environments/servlet/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 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/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/util/TransparentELResolver.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/util/TransparentELResolver.java index 22509d109b..35f782a58b 100644 --- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/servlet/util/TransparentELResolver.java +++ b/environments/servlet/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 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 index 73c68fa2b6..d5cc888c33 100644 --- 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 getFeatureDescriptors(ELContext context, Object base) { - return null; - } - @Override public Class getType(ELContext context, Object base, Object property) { return null;