Merge pull request #197 from OpenLiberty/staging

Merge staging to prod: Update to MP6 and JEE10
OpenLiberty · May 16, 2023 · 5fa5a13 · 5fa5a13
2 parents a804858 + 8760921
commit 5fa5a13
Show file tree

Hide file tree

Showing 30 changed files with 418 additions and 328 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,10 +45,10 @@ jobs:
         working-directory: finish
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
     - run: unset _JAVA_OPTIONS
     - name: Run tests
       run: sudo ../scripts/testApp.sh

diff --git a/LICENSE b/LICENSE
diff --git a/finish/frontend/pom.xml b/finish/frontend/pom.xml
@@ -10,8 +10,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <liberty.var.default.http.port>9090</liberty.var.default.http.port>
         <liberty.var.default.https.port>9091</liberty.var.default.https.port>
     </properties>
@@ -20,20 +20,20 @@
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>9.1.0</version>
+            <version>10.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>5.0</version>
+            <version>6.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>com.ibm.websphere.appserver.api</groupId>
           <artifactId>com.ibm.websphere.appserver.api.jwt</artifactId>
-          <version>1.1.58</version>
+          <version>1.1.75</version>
           <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/finish/frontend/src/main/java/io/openliberty/guides/frontend/ApplicationBean.java b/finish/frontend/src/main/java/io/openliberty/guides/frontend/ApplicationBean.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.frontend;

diff --git a/finish/frontend/src/main/java/io/openliberty/guides/frontend/LoginBean.java b/finish/frontend/src/main/java/io/openliberty/guides/frontend/LoginBean.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.frontend;

diff --git a/finish/frontend/src/main/java/io/openliberty/guides/frontend/client/SystemClient.java b/finish/frontend/src/main/java/io/openliberty/guides/frontend/client/SystemClient.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.frontend.client;

diff --git a/finish/frontend/src/main/java/io/openliberty/guides/frontend/filters/NoCacheFilter.java b/finish/frontend/src/main/java/io/openliberty/guides/frontend/filters/NoCacheFilter.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.frontend.filters;

diff --git a/finish/frontend/src/main/java/io/openliberty/guides/frontend/models/SystemModel.java b/finish/frontend/src/main/java/io/openliberty/guides/frontend/models/SystemModel.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2020, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.frontend.models;

diff --git a/finish/frontend/src/main/java/io/openliberty/guides/frontend/util/SessionUtils.java b/finish/frontend/src/main/java/io/openliberty/guides/frontend/util/SessionUtils.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2018, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 // tag::jwt[]

diff --git a/finish/frontend/src/main/liberty/config/server.xml b/finish/frontend/src/main/liberty/config/server.xml
@@ -2,15 +2,15 @@
 <server description="Sample Liberty server">
 
     <featureManager>
-        <feature>restfulWS-3.0</feature>
-        <feature>jsonb-2.0</feature>
-        <feature>jsonp-2.0</feature>
-        <feature>faces-3.0</feature>
-        <feature>cdi-3.0</feature>
+        <feature>restfulWS-3.1</feature>
+        <feature>jsonb-3.0</feature>
+        <feature>jsonp-2.1</feature>
+        <feature>faces-4.0</feature>
+        <feature>cdi-4.0</feature>
         <!-- FOR SECURITY -->
-        <feature>appSecurity-4.0</feature>
-        <feature>servlet-5.0</feature>
-        <feature>mpJwt-2.0</feature>
+        <feature>appSecurity-5.0</feature>
+        <feature>servlet-6.0</feature>
+        <feature>mpJwt-2.1</feature>
         <feature>mpConfig-3.0</feature>
         <feature>mpRestClient-3.0</feature>
 

diff --git a/finish/frontend/src/main/webapp/index.xhtml b/finish/frontend/src/main/webapp/index.xhtml
@@ -28,12 +28,17 @@
         <p>
             For more information about the features used in this application, see the Open Liberty documentation:
             <ul>
-                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-3.3.html" target="_blank" rel="noopener noreferrer">MicroProfile 3.3</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#mpOpenTracing-1.3.html" target="_blank" rel="noopener noreferrer">MicroProfile OpenTracing 1.3</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-2.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 2.0</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jaxrs-2.1.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 2.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-1.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 1.1</a></li>
-                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-2.0.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Binding 2.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpJwt-2.1.html" target="_blank" rel="noopener noreferrer">MicroProfile JSON Web Token 2.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#faces-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Faces 4.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#servlet-6.0.html" target="_blank" rel="noopener noreferrer">Jakarta Servlet 6.0</a></li>
+                <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security) 5.0</a></li>
             </ul>
         </p>
     </div>

diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -13,8 +13,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <!-- Liberty configuration -->
         <liberty.var.default.hostname>localhost</liberty.var.default.hostname>
         <liberty.var.default.http.port>8080</liberty.var.default.http.port>
@@ -27,15 +27,15 @@
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>9.1.0</version>
+            <version>10.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <!-- tag::microprofile[] -->
             <artifactId>microprofile</artifactId>
             <!-- end::microprofile[] -->
-            <version>5.0</version>
+            <version>6.0</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
@@ -49,19 +49,19 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
              <artifactId>resteasy-client</artifactId>
-             <version>6.0.0.Final</version>
+             <version>6.2.3.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
              <artifactId>resteasy-json-binding-provider</artifactId>
-             <version>6.0.0.Final</version>
+             <version>6.2.3.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,7 +73,14 @@
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-auth-jwt</artifactId>
-            <version>4.0.3</version>
+            <version>4.4.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <version>4.1.91.Final</version>
+            <classifier>osx-x86_64</classifier>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -90,7 +97,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0</version>
             </plugin>
             <!-- Enable liberty-maven plugin -->
             <plugin>
@@ -102,7 +109,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0</version>
                 <configuration>
                     <systemPropertyVariables>
                         <hostname>${liberty.var.default.hostname}</hostname>

diff --git a/finish/system/src/main/java/io/openliberty/guides/system/SystemApplication.java b/finish/system/src/main/java/io/openliberty/guides/system/SystemApplication.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.system;

diff --git a/finish/system/src/main/java/io/openliberty/guides/system/SystemResource.java b/finish/system/src/main/java/io/openliberty/guides/system/SystemResource.java
@@ -2,12 +2,11 @@
 /*******************************************************************************
  * Copyright (c) 2017, 2022 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-2.0/
  *
- * Contributors:
- *     IBM Corporation - Initial implementation
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 // end::copyright[]
 package io.openliberty.guides.system;

diff --git a/finish/system/src/main/liberty/config/server.xml b/finish/system/src/main/liberty/config/server.xml
@@ -1,16 +1,16 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-    <feature>restfulWS-3.0</feature>
-    <feature>jsonb-2.0</feature>
-    <feature>jsonp-2.0</feature>
-    <feature>cdi-3.0</feature>
+    <feature>restfulWS-3.1</feature>
+    <feature>jsonb-3.0</feature>
+    <feature>jsonp-2.1</feature>
+    <feature>cdi-4.0</feature>
     <feature>mpConfig-3.0</feature>
     <feature>mpRestClient-3.0</feature>
-    <feature>appSecurity-4.0</feature>
-    <feature>servlet-5.0</feature>
+    <feature>appSecurity-5.0</feature>
+    <feature>servlet-6.0</feature>
     <!-- tag::mpJwt[] -->
-    <feature>mpJwt-2.0</feature>
+    <feature>mpJwt-2.1</feature>
     <!-- end::mpJwt[] -->
   </featureManager>
 

diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016, 2022 IBM Corp.
+  Copyright (c) 2016, 2023 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -30,13 +30,16 @@ <h2>Eclipse MicroProfile</h2>
     <p>
         For more information about the features used in this application, see the Open Liberty documentation:
         <ul>
-            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-5.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 5.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.0.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpJwt-2.1.html" target="_blank" rel="noopener noreferrer">MicroProfile JSON Web Token 2.1</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 3.0</a></li>
             <li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.0.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#cdi-3.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.0.html" target="_blank" rel="noopener noreferrer">Java RESTful Services 3.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.0.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 2.0</a></li>
-            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-2.0.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Binding 2.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing 2.1</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#servlet-6.0.html" target="_blank" rel="noopener noreferrer">Jakarta Servlet 6.0</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#appSecurity-5.0.html" target="_blank" rel="noopener noreferrer">Application Security (Jakarta Security) 5.0</a></li>
         </ul>
     </p>
 </div>