Update to MP6 and JEE10 (#117)

* update versions * Fix for skills network * Updating copyright * fixing super linter failure * fixing superlinter --------- Co-authored-by: Jakub Pomykala <[email protected]>
OpenLiberty · May 11, 2023 · 1488b34 · 1488b34
1 parent 61a6ef2
commit 1488b34
Show file tree

Hide file tree

Showing 13 changed files with 289 additions and 221 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/pom.xml b/finish/pom.xml
@@ -11,24 +11,24 @@
     <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>
     </properties>
 
     <dependencies>
         <!-- Provided dependencies -->
         <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>

diff --git a/finish/src/main/java/io/openliberty/guides/consumingrest/service/ArtistApplication.java b/finish/src/main/java/io/openliberty/guides/consumingrest/service/ArtistApplication.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.consumingrest.service;

diff --git a/finish/src/main/java/io/openliberty/guides/consumingrest/service/ArtistResource.java b/finish/src/main/java/io/openliberty/guides/consumingrest/service/ArtistResource.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.consumingrest.service;

diff --git a/finish/src/main/java/io/openliberty/guides/consumingrest/service/Reader.java b/finish/src/main/java/io/openliberty/guides/consumingrest/service/Reader.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.consumingrest.service;

diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml
@@ -1,9 +1,9 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-      <feature>restfulWS-3.0</feature>
-      <feature>jsonb-2.0</feature>
-      <feature>jsonp-2.0</feature>
+      <feature>restfulWS-3.1</feature>
+      <feature>jsonb-3.0</feature>
+      <feature>jsonp-2.1</feature>
   </featureManager>
 
   <variable name="default.http.port" defaultValue="9080"/>

diff --git a/finish/src/main/webapp/index.html b/finish/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!-- tag::copyright[] -->
 <!--
-  Copyright (c) 2016 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.
@@ -23,37 +23,37 @@
         <!-- tag::AngularJS[] -->
         <!-- tag::angular-script[] -->
         <script 
-            src='http://ajax.googleapis.com/ajax/libs/angularjs/1.6.6/angular.js'/>
+            src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.6/angular.js">
         </script>
         <!-- end::angular-script[] -->
         <!-- tag::angular-resource-script[] -->
         <script 
-           src='http://ajax.googleapis.com/ajax/libs/angularjs/1.6.6/angular-resource.js'>
+           src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.6/angular-resource.js">
         </script>
         <!-- end::angular-resource-script[] -->
         <!-- end::AngularJS[] -->
         <!-- tag::consume-rest[] -->
-        <script src='./js/consume-rest.js'></script>
+        <script src="./js/consume-rest.js"></script>
         <!-- end::consume-rest[] -->
     </head>
     <!-- end::head[] -->
     <!-- tag::body[] -->
     <!-- tag::consumeRestApp[] -->
-    <body ng-app='consumeRestApp'>
+    <body ng-app="consumeRestApp">
     <!-- end::consumeRestApp[] -->
         <!-- tag::controller[] -->
         <!-- tag::ArtistCtrl[] -->
-        <div ng-controller='ArtistsCtrl'>
+        <div ng-controller="ArtistsCtrl">
         <!-- end::ArtistCtrl[] -->
             <!-- tag::repeat[] -->
             <!-- tag::Artists[]-->
-            <div ng-repeat='artist in artists'>
+            <div ng-repeat="artist in artists">
             <!-- end::Artists[] -->
                 <!-- tag::artist-info[] -->
                 <p>{{ artist.name }} wrote {{ artist.albums.length }} albums:</p>
                 <!-- end::artist-info[] -->
-                <div ng-repeat='album in artist.albums'>
-                    <p style='text-indent: 20px'>
+                <div ng-repeat="album in artist.albums">
+                    <p style="text-indent: 20px">
                         Album titled <b>{{ album.title }}</b> by 
                                      <b>{{ album.artist }}</b> contains 
                                      <b>{{ album.ntracks }}</b> tracks

diff --git a/start/pom.xml b/start/pom.xml
@@ -11,24 +11,24 @@
     <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>
     </properties>
 
     <dependencies>
         <!-- Provided dependencies -->
         <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>

diff --git a/start/src/main/java/io/openliberty/guides/consumingrest/service/ArtistApplication.java b/start/src/main/java/io/openliberty/guides/consumingrest/service/ArtistApplication.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.consumingrest.service;

diff --git a/start/src/main/java/io/openliberty/guides/consumingrest/service/ArtistResource.java b/start/src/main/java/io/openliberty/guides/consumingrest/service/ArtistResource.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.consumingrest.service;

diff --git a/start/src/main/java/io/openliberty/guides/consumingrest/service/Reader.java b/start/src/main/java/io/openliberty/guides/consumingrest/service/Reader.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.consumingrest.service;

diff --git a/start/src/main/liberty/config/server.xml b/start/src/main/liberty/config/server.xml
@@ -1,9 +1,9 @@
 <server description="Sample Liberty server">
 
   <featureManager>
-      <feature>restfulWS-3.0</feature>
-      <feature>jsonb-2.0</feature>
-      <feature>jsonp-2.0</feature>
+      <feature>restfulWS-3.1</feature>
+      <feature>jsonb-3.0</feature>
+      <feature>jsonp-2.1</feature>
   </featureManager>
 
   <variable name="default.http.port" defaultValue="9080"/>