Skip to content

Commit

Permalink
Remove deprecated method from AbstractWeldELResolver
Browse files Browse the repository at this point in the history
CI - change initial build to use JDK 17
  • Loading branch information
manovotn committed May 3, 2024
1 parent 51d9a4d commit 7b11b53
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 32 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ 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:
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v4.2.1
with:
java-version: 11
java-version: 17
distribution: 'temurin'
- name: Download WildFly
run: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 7b11b53

Please sign in to comment.