WW-5533 Add compilation support for Jakarta EE 11

apache · Feb 24, 2025 · b247751 · b247751
1 parent ed111da
commit b247751
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -30,18 +30,25 @@ env:
 
 jobs:
   build:
-    name: Build and Test
+    name: Build and Test${{ matrix.profile == '-Pjakartaee11' && ' with Jakarta EE 11' || matrix.profile }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '21' ]
+        include:
+          - java: '17'
+            profile: ''
+          - java: '21'
+            profile: ''
+          - java: '21'
+            profile: '-Pjakartaee11'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - name: Setup Java ${{ matrix.java }}
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
           cache: 'maven'
-      - name: Build with Maven on Java ${{ matrix.java }}
-        run: mvn -B -V -DskipAssembly verify --no-transfer-progress
+      - name: Build with Maven on Java ${{ matrix.java }}${{ matrix.profile == '-Pjakartaee11' && ' (Jakarta EE 11)' || matrix.profile }}
+        run: mvn -B -V -DskipAssembly verify ${{ matrix.profile }} --no-transfer-progress
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java b/core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
@@ -417,7 +417,7 @@ public void mismatchCharset() throws IOException {
         assertThat(JakartaServletDiskFileUpload.isMultipartContent(mockRequest)).isTrue();
 
         // when
-        mockRequest.setCharacterEncoding(null);
+        mockRequest.setCharacterEncoding((String) null);
         multiPart.setDefaultEncoding(StandardCharsets.ISO_8859_1.name());
         multiPart.parse(mockRequest, tempDir);
 

diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java b/plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java
@@ -57,7 +57,7 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
     /**
      * {@inheritDoc}
      */
-    @Override
+    // @Override
     public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
         if (base != null) {
             return Collections.emptyIterator();

diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
@@ -47,7 +47,7 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
     }
 
     /** {@inheritDoc} */
-    @Override
+    // @Override
     public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
         List<FeatureDescriptor> list = new ArrayList<>();
 

diff --git a/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java b/plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
@@ -70,7 +70,7 @@ public Class<?> getCommonPropertyType(ELContext context, Object base) {
     /**
      * {@inheritDoc}
      */
-    @Override
+    // @Override
     public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context,
                                                              Object base) {
         // only resolve at the root of the context

diff --git a/pom.xml b/pom.xml
@@ -147,6 +147,13 @@
                 <module>assembly</module>
             </modules>
         </profile>
+        <profile>
+            <id>jakartaee11</id>
+            <properties>
+                <jakarta-ee.version>11.0.0-M5</jakarta-ee.version>
+                <spring.version>7.0.0-M2</spring.version>
+            </properties>
+        </profile>
         <profile>
             <id>dependency-check</id>
             <build>