Merge pull request #83 from OpenLiberty/automation/3f216c0ef0964964a7…

…dad15ac9c296f1 Automation: Update Feature Versions
OpenLiberty · May 14, 2020 · 9946f38 · 9946f38
2 parents 9c93956 + c444c41
commit 9946f38
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 270 deletions.
diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
@@ -15,11 +15,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <!-- Plugin versions -->
-        <version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
-        <version.maven-failsafe-plugin>2.22.2</version.maven-failsafe-plugin>
-        <version.maven-war-plugin>3.2.3</version.maven-war-plugin>
-        <version.maven-surefire-plugin>2.22.2</version.maven-surefire-plugin>
         <!-- Default test properties -->
         <test.http.port>9080</test.http.port>
         <test.system.node.port>31000</test.system.node.port>
@@ -32,18 +27,24 @@
 
     <dependencies>
         <!-- Provided dependencies -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>8.0.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.0</version>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -55,13 +56,13 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.2.6</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.2.6</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
         <!-- Support for Java 9 and above -->
@@ -78,25 +79,25 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${version.maven-war-plugin}</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable liberty-maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>${version.liberty-maven-plugin}</version>
+                <version>3.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${version.maven-surefire-plugin}</version>
+                <version>2.22.2</version>
             </plugin>
             <!-- Plugin to run functional tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${version.maven-failsafe-plugin}</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemPropertyVariables>
                         <http.port>${test.http.port}</http.port>

diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml
@@ -3,8 +3,8 @@
   <featureManager>
     <feature>jaxrs-2.1</feature>
     <feature>cdi-2.0</feature>
-    <feature>mpRestClient-1.3</feature>
-    <feature>mpConfig-1.3</feature>
+    <feature>mpRestClient-1.4</feature>
+    <feature>mpConfig-1.4</feature>
     <feature>jsonp-1.1</feature>
   </featureManager>
 

diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright (c) 2016 IBM Corp.
+  Copyright (c) 2016, 2020 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,64 +15,29 @@
 -->
 <html>
 <body>
-    <h1>Welcome to your Liberty Application</h1>
-    <p>Thanks for generating this project using the app accelerator.  Please see below for some extra information on each of the technologies you chose</p>
-<!--
-  Copyright (c) 2016 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+    <h1>Welcome to your Open Liberty application</h1>
+    <p>Open Liberty is a lightweight open framework for building fast and efficient cloud-native Java microservices. Find out more at <a href="http://openliberty.io/" target="_blank" rel="noopener noreferrer">openliberty.io</a>.</p>
 <div>
-	<h2>REST</h2>
-	<p>
-		For the complete feature documentation, see the <a
-			href="http://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_feature_jaxrs-2.0.html">jaxrs-2.0</a>
-		feature description in IBM Knowledge Center.
-	</p>
-</div>
-<!--
-  Copyright (c) 2016 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<div>
-    <h2>MicroProfile</h2>
+    <h2>Eclipse MicroProfile</h2>
     <p>
-        The <a href="http://microprofile.io/">MicroProfile project</a> is an open
-        community with the aim of optimizing Enterprise Java for a microservices
-        architecture.  MicroProfile will be evolving with guidance from the community.
+        The <a href="https://microprofile.io/" target="_blank" rel="noopener noreferrer">Eclipse MicroProfile project</a> is an open community with the aim of optimizing enterprise Java for a microservices architecture.
+        MicroProfile evolves with guidance from the community.
     </p>
     <p>
-        For the complete feature documentation, see the
-        <a href="http://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_feature_microProfile-1.0.html">microProfile-1.0</a>
-        feature description in IBM Knowledge Center.
+        If you want to share your thoughts, you can post straight to the
+        <a href="https://groups.google.com/forum/#!forum/microprofile" target="_blank" rel="noopener noreferrer">MicroProfile Google group</a>.
     </p>
     <p>
-        If you want to share your thoughts you can post straight to the
-        <a href="https://groups.google.com/forum/#!forum/microprofile">MicroProfile Google group</a>.
+        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/#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/#mpConfig-1.4.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 1.4</a></li>
+            <li><a href="https://openliberty.io/docs/ref/feature/#mpRestClient-1.4.html" target="_blank" rel="noopener noreferrer">MicroProfile Rest Client 1.4</a></li>
+        </ul>
     </p>
 </div>
-<div id="technologies">
-</div>
 </body>
-</html>
+</html>
diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -15,11 +15,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <!-- Plugin versions -->
-        <version.maven-war-plugin>3.2.3</version.maven-war-plugin>
-        <version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
-        <version.maven-surefire-plugin>2.22.2</version.maven-surefire-plugin>
-        <version.maven-failsafe-plugin>2.22.2</version.maven-failsafe-plugin>
         <!-- Liberty configuration -->
         <liberty.var.default.http.port>9080</liberty.var.default.http.port>
         <liberty.var.default.https.port>9443</liberty.var.default.https.port>
@@ -30,30 +25,36 @@
 
     <dependencies>
         <!-- Provided dependencies -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>8.0.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>
         <!-- For tests-->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.0</version>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>3.3.5</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>3.3.5</version>
+            <version>3.3.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -64,25 +65,25 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>${version.maven-war-plugin}</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- Enable liberty-maven plugin -->
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>${version.liberty-maven-plugin}</version>
+                <version>3.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${version.maven-surefire-plugin}</version>
+                <version>2.22.2</version>
             </plugin>
             <!-- Plugin to run functional tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${version.maven-failsafe-plugin}</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemPropertyVariables>
                         <cluster.ip>${test.cluster.ip}</cluster.ip>

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 IBM Corp.
+  Copyright (c) 2016, 2020 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,64 +15,27 @@
 -->
 <html>
 <body>
-    <h1>Welcome to your Liberty Application</h1>
-    <p>Thanks for generating this project using the app accelerator.  Please see below for some extra information on each of the technologies you chose</p>
-<!--
-  Copyright (c) 2016 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+    <h1>Welcome to your Open Liberty application</h1>
+    <p>Open Liberty is a lightweight open framework for building fast and efficient cloud-native Java microservices. Find out more at <a href="http://openliberty.io/" target="_blank" rel="noopener noreferrer">openliberty.io</a>.</p>
 <div>
-	<h2>REST</h2>
-	<p>
-		For the complete feature documentation, see the <a
-			href="http://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_feature_jaxrs-2.0.html">jaxrs-2.0</a>
-		feature description in IBM Knowledge Center.
-	</p>
-</div>
-<!--
-  Copyright (c) 2016 IBM Corp.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<div>
-    <h2>MicroProfile</h2>
+    <h2>Eclipse MicroProfile</h2>
     <p>
-        The <a href="http://microprofile.io/">MicroProfile project</a> is an open
-        community with the aim of optimizing Enterprise Java for a microservices
-        architecture.  MicroProfile will be evolving with guidance from the community.
+        The <a href="https://microprofile.io/" target="_blank" rel="noopener noreferrer">Eclipse MicroProfile project</a> is an open community with the aim of optimizing enterprise Java for a microservices architecture.
+        MicroProfile evolves with guidance from the community.
     </p>
     <p>
-        For the complete feature documentation, see the
-        <a href="http://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_feature_microProfile-1.0.html">microProfile-1.0</a>
-        feature description in IBM Knowledge Center.
+        If you want to share your thoughts, you can post straight to the
+        <a href="https://groups.google.com/forum/#!forum/microprofile" target="_blank" rel="noopener noreferrer">MicroProfile Google group</a>.
     </p>
     <p>
-        If you want to share your thoughts you can post straight to the
-        <a href="https://groups.google.com/forum/#!forum/microprofile">MicroProfile Google group</a>.
+        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/#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>
+        </ul>
     </p>
 </div>
-<div id="technologies">
-</div>
 </body>
-</html>
+</html>