From 58ae880a06708dda77ee64d221acdc75fd84e74d Mon Sep 17 00:00:00 2001 From: GuidesBot <42877064+GuidesBot@users.noreply.github.com> Date: Thu, 9 Apr 2020 18:24:44 -0400 Subject: [PATCH 1/5] Update finish/inventory/src/main/liberty/config/server.xml --- finish/inventory/src/main/liberty/config/server.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/finish/inventory/src/main/liberty/config/server.xml b/finish/inventory/src/main/liberty/config/server.xml index 3747edc9..06f13a14 100755 --- a/finish/inventory/src/main/liberty/config/server.xml +++ b/finish/inventory/src/main/liberty/config/server.xml @@ -3,8 +3,8 @@ jaxrs-2.1 cdi-2.0 - mpRestClient-1.3 - mpConfig-1.3 + mpRestClient-1.4 + mpConfig-1.4 jsonp-1.1 From e6a936ff3f520b9262750feb6d03713492e48dcb Mon Sep 17 00:00:00 2001 From: GuidesBot <42877064+GuidesBot@users.noreply.github.com> Date: Thu, 9 Apr 2020 18:24:46 -0400 Subject: [PATCH 2/5] Update start/inventory/src/main/liberty/config/server.xml --- start/inventory/src/main/liberty/config/server.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start/inventory/src/main/liberty/config/server.xml b/start/inventory/src/main/liberty/config/server.xml index 3747edc9..06f13a14 100755 --- a/start/inventory/src/main/liberty/config/server.xml +++ b/start/inventory/src/main/liberty/config/server.xml @@ -3,8 +3,8 @@ jaxrs-2.1 cdi-2.0 - mpRestClient-1.3 - mpConfig-1.3 + mpRestClient-1.4 + mpConfig-1.4 jsonp-1.1 From 4b1d6cecc751b9c83213c29e268749c663ddddd3 Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Tue, 12 May 2020 01:02:57 -0400 Subject: [PATCH 3/5] index.html --- finish/inventory/src/main/webapp/index.html | 71 ++++++--------------- finish/system/src/main/webapp/index.html | 69 +++++--------------- start/inventory/src/main/webapp/index.html | 71 ++++++--------------- start/system/src/main/webapp/index.html | 69 +++++--------------- 4 files changed, 68 insertions(+), 212 deletions(-) diff --git a/finish/inventory/src/main/webapp/index.html b/finish/inventory/src/main/webapp/index.html index 74ec6c74..01e20137 100755 --- a/finish/inventory/src/main/webapp/index.html +++ b/finish/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@ -

Welcome to your Liberty Application

-

Thanks for generating this project using the app accelerator. Please see below for some extra information on each of the technologies you chose

- +

Welcome to your Open Liberty application

+

Open Liberty is a lightweight open framework for building fast and efficient cloud-native Java microservices. Find out more at openliberty.io.

-

REST

-

- For the complete feature documentation, see the jaxrs-2.0 - feature description in IBM Knowledge Center. -

-
- -
-

MicroProfile

+

Eclipse MicroProfile

- The MicroProfile project 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 Eclipse MicroProfile project is an open community with the aim of optimizing enterprise Java for a microservices architecture. + MicroProfile evolves with guidance from the community.

- For the complete feature documentation, see the - microProfile-1.0 - feature description in IBM Knowledge Center. + If you want to share your thoughts, you can post straight to the + MicroProfile Google group.

- If you want to share your thoughts you can post straight to the - MicroProfile Google group. + For more information about the features used in this application, see the Open Liberty documentation: +

-
-
- + \ No newline at end of file diff --git a/finish/system/src/main/webapp/index.html b/finish/system/src/main/webapp/index.html index 74ec6c74..c3f1c3c1 100755 --- a/finish/system/src/main/webapp/index.html +++ b/finish/system/src/main/webapp/index.html @@ -1,5 +1,5 @@ -

Welcome to your Liberty Application

-

Thanks for generating this project using the app accelerator. Please see below for some extra information on each of the technologies you chose

- +

Welcome to your Open Liberty application

+

Open Liberty is a lightweight open framework for building fast and efficient cloud-native Java microservices. Find out more at openliberty.io.

-

REST

-

- For the complete feature documentation, see the jaxrs-2.0 - feature description in IBM Knowledge Center. -

-
- -
-

MicroProfile

+

Eclipse MicroProfile

- The MicroProfile project 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 Eclipse MicroProfile project is an open community with the aim of optimizing enterprise Java for a microservices architecture. + MicroProfile evolves with guidance from the community.

- For the complete feature documentation, see the - microProfile-1.0 - feature description in IBM Knowledge Center. + If you want to share your thoughts, you can post straight to the + MicroProfile Google group.

- If you want to share your thoughts you can post straight to the - MicroProfile Google group. + For more information about the features used in this application, see the Open Liberty documentation: +

-
-
- + \ No newline at end of file diff --git a/start/inventory/src/main/webapp/index.html b/start/inventory/src/main/webapp/index.html index 74ec6c74..01e20137 100755 --- a/start/inventory/src/main/webapp/index.html +++ b/start/inventory/src/main/webapp/index.html @@ -1,5 +1,5 @@ -

Welcome to your Liberty Application

-

Thanks for generating this project using the app accelerator. Please see below for some extra information on each of the technologies you chose

- +

Welcome to your Open Liberty application

+

Open Liberty is a lightweight open framework for building fast and efficient cloud-native Java microservices. Find out more at openliberty.io.

-

REST

-

- For the complete feature documentation, see the jaxrs-2.0 - feature description in IBM Knowledge Center. -

-
- -
-

MicroProfile

+

Eclipse MicroProfile

- The MicroProfile project 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 Eclipse MicroProfile project is an open community with the aim of optimizing enterprise Java for a microservices architecture. + MicroProfile evolves with guidance from the community.

- For the complete feature documentation, see the - microProfile-1.0 - feature description in IBM Knowledge Center. + If you want to share your thoughts, you can post straight to the + MicroProfile Google group.

- If you want to share your thoughts you can post straight to the - MicroProfile Google group. + For more information about the features used in this application, see the Open Liberty documentation: +

-
-
- + \ No newline at end of file diff --git a/start/system/src/main/webapp/index.html b/start/system/src/main/webapp/index.html index 74ec6c74..c3f1c3c1 100755 --- a/start/system/src/main/webapp/index.html +++ b/start/system/src/main/webapp/index.html @@ -1,5 +1,5 @@ -

Welcome to your Liberty Application

-

Thanks for generating this project using the app accelerator. Please see below for some extra information on each of the technologies you chose

- +

Welcome to your Open Liberty application

+

Open Liberty is a lightweight open framework for building fast and efficient cloud-native Java microservices. Find out more at openliberty.io.

-

REST

-

- For the complete feature documentation, see the jaxrs-2.0 - feature description in IBM Knowledge Center. -

-
- -
-

MicroProfile

+

Eclipse MicroProfile

- The MicroProfile project 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 Eclipse MicroProfile project is an open community with the aim of optimizing enterprise Java for a microservices architecture. + MicroProfile evolves with guidance from the community.

- For the complete feature documentation, see the - microProfile-1.0 - feature description in IBM Knowledge Center. + If you want to share your thoughts, you can post straight to the + MicroProfile Google group.

- If you want to share your thoughts you can post straight to the - MicroProfile Google group. + For more information about the features used in this application, see the Open Liberty documentation: +

-
-
- + \ No newline at end of file From 391cbcc9b4995c61bf89c457c82b42f159fbaeed Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Tue, 12 May 2020 01:22:44 -0400 Subject: [PATCH 4/5] update pom.xml --- finish/inventory/pom.xml | 21 ++++++++------------- finish/system/pom.xml | 23 +++++++++-------------- start/inventory/pom.xml | 21 ++++++++------------- start/system/pom.xml | 23 +++++++++-------------- 4 files changed, 34 insertions(+), 54 deletions(-) diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index a9685965..cf5379ff 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -15,11 +15,6 @@ UTF-8 1.8 1.8 - - 3.2 - 2.22.2 - 3.2.3 - 2.22.2 9080 31000 @@ -35,7 +30,7 @@ org.eclipse.microprofile microprofile - 3.2 + 3.3 pom provided @@ -43,7 +38,7 @@ org.junit.jupiter junit-jupiter - 5.6.0 + 5.6.2 test @@ -55,13 +50,13 @@ org.apache.cxf cxf-rt-rs-extension-providers - 3.2.6 + 3.3.6 test org.apache.cxf cxf-rt-rs-client - 3.2.6 + 3.3.6 test @@ -78,25 +73,25 @@ org.apache.maven.plugins maven-war-plugin - ${version.maven-war-plugin} + 3.2.3 io.openliberty.tools liberty-maven-plugin - ${version.liberty-maven-plugin} + 3.2 org.apache.maven.plugins maven-surefire-plugin - ${version.maven-surefire-plugin} + 2.22.2 org.apache.maven.plugins maven-failsafe-plugin - ${version.maven-failsafe-plugin} + 2.22.2 ${test.http.port} diff --git a/finish/system/pom.xml b/finish/system/pom.xml index eb206ebf..b5f9d403 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -15,11 +15,6 @@ UTF-8 1.8 1.8 - - 3.2.3 - 3.2 - 2.22.2 - 2.22.2 9080 9443 @@ -33,27 +28,27 @@ org.eclipse.microprofile microprofile - 3.2 + 3.3 pom provided org.junit.jupiter - junit-jupiter-engine - 5.6.0 + junit-jupiter + 5.6.2 test org.apache.cxf cxf-rt-rs-client - 3.3.5 + 3.3.6 test org.apache.cxf cxf-rt-rs-extension-providers - 3.3.5 + 3.3.6 test @@ -64,25 +59,25 @@ org.apache.maven.plugins maven-war-plugin - ${version.maven-war-plugin} + 3.2.3 io.openliberty.tools liberty-maven-plugin - ${version.liberty-maven-plugin} + 3.2 org.apache.maven.plugins maven-surefire-plugin - ${version.maven-surefire-plugin} + 2.22.2 org.apache.maven.plugins maven-failsafe-plugin - ${version.maven-failsafe-plugin} + 2.22.2 ${test.cluster.ip} diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index a9685965..cf5379ff 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -15,11 +15,6 @@ UTF-8 1.8 1.8 - - 3.2 - 2.22.2 - 3.2.3 - 2.22.2 9080 31000 @@ -35,7 +30,7 @@ org.eclipse.microprofile microprofile - 3.2 + 3.3 pom provided @@ -43,7 +38,7 @@ org.junit.jupiter junit-jupiter - 5.6.0 + 5.6.2 test @@ -55,13 +50,13 @@ org.apache.cxf cxf-rt-rs-extension-providers - 3.2.6 + 3.3.6 test org.apache.cxf cxf-rt-rs-client - 3.2.6 + 3.3.6 test @@ -78,25 +73,25 @@ org.apache.maven.plugins maven-war-plugin - ${version.maven-war-plugin} + 3.2.3 io.openliberty.tools liberty-maven-plugin - ${version.liberty-maven-plugin} + 3.2 org.apache.maven.plugins maven-surefire-plugin - ${version.maven-surefire-plugin} + 2.22.2 org.apache.maven.plugins maven-failsafe-plugin - ${version.maven-failsafe-plugin} + 2.22.2 ${test.http.port} diff --git a/start/system/pom.xml b/start/system/pom.xml index eb206ebf..b5f9d403 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -15,11 +15,6 @@ UTF-8 1.8 1.8 - - 3.2.3 - 3.2 - 2.22.2 - 2.22.2 9080 9443 @@ -33,27 +28,27 @@ org.eclipse.microprofile microprofile - 3.2 + 3.3 pom provided org.junit.jupiter - junit-jupiter-engine - 5.6.0 + junit-jupiter + 5.6.2 test org.apache.cxf cxf-rt-rs-client - 3.3.5 + 3.3.6 test org.apache.cxf cxf-rt-rs-extension-providers - 3.3.5 + 3.3.6 test @@ -64,25 +59,25 @@ org.apache.maven.plugins maven-war-plugin - ${version.maven-war-plugin} + 3.2.3 io.openliberty.tools liberty-maven-plugin - ${version.liberty-maven-plugin} + 3.2 org.apache.maven.plugins maven-surefire-plugin - ${version.maven-surefire-plugin} + 2.22.2 org.apache.maven.plugins maven-failsafe-plugin - ${version.maven-failsafe-plugin} + 2.22.2 ${test.cluster.ip} From c444c4179fd18d261125ff39eeb41dbec3e11537 Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Wed, 13 May 2020 00:12:03 -0400 Subject: [PATCH 5/5] add jakarta.jakartaee-api dependency to the pom --- finish/inventory/pom.xml | 6 ++++++ finish/system/pom.xml | 6 ++++++ start/inventory/pom.xml | 6 ++++++ start/system/pom.xml | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index cf5379ff..299cb612 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -27,6 +27,12 @@ + + jakarta.platform + jakarta.jakartaee-api + 8.0.0 + provided + org.eclipse.microprofile microprofile diff --git a/finish/system/pom.xml b/finish/system/pom.xml index b5f9d403..a0fceadf 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -25,6 +25,12 @@ + + jakarta.platform + jakarta.jakartaee-api + 8.0.0 + provided + org.eclipse.microprofile microprofile diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index cf5379ff..299cb612 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -27,6 +27,12 @@ + + jakarta.platform + jakarta.jakartaee-api + 8.0.0 + provided + org.eclipse.microprofile microprofile diff --git a/start/system/pom.xml b/start/system/pom.xml index b5f9d403..a0fceadf 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -25,6 +25,12 @@ + + jakarta.platform + jakarta.jakartaee-api + 8.0.0 + provided + org.eclipse.microprofile microprofile