diff --git a/.github/workflows/test-2.3.14.yaml b/.github/workflows/test-2.3.14.yaml new file mode 100644 index 0000000000..47040f2027 --- /dev/null +++ b/.github/workflows/test-2.3.14.yaml @@ -0,0 +1,50 @@ +name: Build and Test Mojarra 2.3.14.SP + +on: + workflow_dispatch: + branches: + - 2.3.14.SP + push: + branches: + - 2.3.14.SP + pull_request: + branches: + - 2.3.14.SP + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + matrix: + java-version: [ 8, 17, 21 ] + + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java-version }} + cache: 'maven' + + - name: Restore cached Maven packages + id: cache-maven-packages + uses: actions/cache/restore@v3 + with: + path: | + ~/.m2 + ~/.local/share/containers + key: ${{ runner.os }}-m2-${{ matrix.java-version }}-${{ hashFiles('**/pom.xml') }} + + - name: Clean and build + run: mvn -B -fae clean package -Dgithub=true + + - name: Cache Maven packages + uses: actions/cache/save@v3 + with: + path: | + ~/.m2 + ~/.local/share/containers + key: ${{ runner.os }}-m2-${{ matrix.java-version }}-${{ hashFiles('**/pom.xml') }} diff --git a/impl/pom.xml b/impl/pom.xml index 7fd5f112c7..d46f4ed7ea 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -168,32 +168,32 @@ 2.2.3 test - + org.easymock - easymockclassextension - 3.1 + easymock + 5.2.0 test - + org.powermock powermock-api-easymock - 1.4.11 + 2.0.9 test org.powermock powermock-module-junit4 - 1.4.11 + 2.0.9 test commons-beanutils commons-beanutils - 1.8.3 + 1.9.4 test @@ -302,7 +302,7 @@ org.apache.felix maven-bundle-plugin - 4.0.0 + 5.1.9 true diff --git a/impl/src/test/java/com/sun/faces/mock/MockResultSet.java b/impl/src/test/java/com/sun/faces/mock/MockResultSet.java index 5dd4f61f0b..6973e37e67 100644 --- a/impl/src/test/java/com/sun/faces/mock/MockResultSet.java +++ b/impl/src/test/java/com/sun/faces/mock/MockResultSet.java @@ -139,9 +139,11 @@ public Object getObject(String columnName) throws SQLException { if (columnName.equals("writeOnlyProperty") && (beans[row - 1] instanceof BeanTestImpl)) { return (((BeanTestImpl) beans[row - 1]).getWriteOnlyPropertyValue()); - } else { + } else if (!columnName.equals("class")) { return (PropertyUtils.getSimpleProperty(beans[row - 1], columnName)); + } else { + return null; } } catch (Exception e) { throw new SQLException(e.getMessage()); diff --git a/pom.xml b/pom.xml index 3f99045c17..cbcf2e7d54 100644 --- a/pom.xml +++ b/pom.xml @@ -112,29 +112,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java-version - - enforce - - - - - - - - - To build this project, JDK 1.8 is required. Please install it. - - [1.8,1.9) - - - - org.apache.maven.plugins maven-release-plugin @@ -168,5 +145,35 @@ - + + + + java-modules + + [9,] + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + --add-opens=java.base/java.lang=ALL-UNNAMED + + + + + + + + javax.xml.bind + jaxb-api + 2.3.1 + test + + + +