Merge pull request #1236 from lukasj/version

set version to 11.0.0-SNAPSHOT, set src level to 17
jakartaee · Mar 4, 2024 · 6c86c55 · 6c86c55
2 parents eb11c54 + 13a8e74
commit 6c86c55
Show file tree

Hide file tree

Showing 74 changed files with 574 additions and 655 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -32,19 +32,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [11]
+        java: [17]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
 
@@ -62,7 +62,7 @@ jobs:
         run: ./mvnw -e -ntp install:install-file -Dfile=./lib/javatest.jar -DgroupId=javatest -DartifactId=javatest -Dversion=5.0 -Dpackaging=jar
 
       - name: Build & Run TCK Servlet TCK
-        run: ./mvnw -e -V -B -U clean install -Pglassfish-runner -Pjaxrs-tck -Dmaven.test.failure.ignore=true
+        run: ./mvnw -e -V -B -U clean install -Pglassfish-runner -Pjaxrs-tck -Dmaven.test.failure.ignore=true -Pstaging
 
 #      - name: Publish Test Report
 #        uses: ScaCap/[email protected]

diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakartatck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta-annotations-tck</artifactId>

diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>appclient</artifactId>

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>assembly</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>common</artifactId>

diff --git a/connector/pom.xml b/connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>connector</artifactId>

diff --git a/core-profile-tck/ca-sigtest/pom.xml b/core-profile-tck/ca-sigtest/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.ee.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>common-annotations</artifactId>
 

diff --git a/core-profile-tck/cdi-tck-suite/pom.xml b/core-profile-tck/cdi-tck-suite/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.ee.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cdi-lite-tck-suite</artifactId>

diff --git a/core-profile-tck/jsonp-tck-ext/pom.xml b/core-profile-tck/jsonp-tck-ext/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>jakarta.ee.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>core-tck-jsonp-extension</artifactId>

diff --git a/core-profile-tck/pom.xml b/core-profile-tck/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>jakarta.ee.tck.coreprofile</groupId>

diff --git a/core-profile-tck/restful-tck-suite/pom.xml b/core-profile-tck/restful-tck-suite/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.ee.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>rest-tck-suite</artifactId>

diff --git a/core-profile-tck/tck-dist/pom.xml b/core-profile-tck/tck-dist/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.ee.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core-profile-tck/tck/pom.xml b/core-profile-tck/tck/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>jakarta.ee.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>core-profile-tck-impl</artifactId>
     <name>Jakarta Core Profile TCK Test Suite</name>

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
 
    This program and the accompanying materials are made available under the
    terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +24,7 @@
   -->
   <parent>
     <groupId>jakarta.tck</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <artifactId>project</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/ejb/pom.xml b/ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb</artifactId>

diff --git a/ejb30-ws/pom.xml b/ejb30-ws/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb30-ws</artifactId>

diff --git a/ejb30/pom.xml b/ejb30/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb30</artifactId>

diff --git a/ejb32/pom.xml b/ejb32/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb32</artifactId>

diff --git a/el/pom.xml b/el/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.tck</groupId>
         <artifactId>project</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta-expression-language-tck</artifactId>
@@ -108,12 +108,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/glassfish-runner/annotations-tck/pom.xml b/glassfish-runner/annotations-tck/pom.xml
@@ -5,13 +5,13 @@
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
     http://www.eclipse.org/legal/epl-2.0.
-    
+
     This Source Code may also be made available under the following Secondary
     Licenses when the conditions for such availability set forth in the
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
     https://www.gnu.org/software/classpath/license.html.
-    
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.glassfish</groupId>
         <artifactId>standalone-tck</artifactId>
-        <version>10.0.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>jakarta</groupId>
     <artifactId>glassfish.annotations-tck</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>