From c38c05c35d2c099f68e0ba5aeb3ecf3f9ee3ea10 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Sat, 21 Dec 2019 22:40:25 +0100 Subject: [PATCH 1/4] update parent --- 01_impl/pom.xml | 2 +- 02_test/pom.xml | 2 +- 03_demo/pom.xml | 4 ++-- pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/01_impl/pom.xml b/01_impl/pom.xml index a28fee8..6cac57f 100644 --- a/01_impl/pom.xml +++ b/01_impl/pom.xml @@ -23,7 +23,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.03-RPM + 01.00.04-RPM-SNAPSHOT 4.0.0 diff --git a/02_test/pom.xml b/02_test/pom.xml index facb205..22d7c57 100644 --- a/02_test/pom.xml +++ b/02_test/pom.xml @@ -22,7 +22,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.03-RPM + 01.00.04-RPM-SNAPSHOT 4.0.0 diff --git a/03_demo/pom.xml b/03_demo/pom.xml index 030b9ca..2340498 100644 --- a/03_demo/pom.xml +++ b/03_demo/pom.xml @@ -23,7 +23,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.03-RPM + 01.00.04-RPM-SNAPSHOT 4.0.0 @@ -46,7 +46,7 @@ org.rapidpm.vaadin nano-vaadin-undertow - 01.00.03-RPM + 01.00.04-RPM-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5185747..6624f6f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ org.rapidpm rapidpm-vaadin-dependencies-v14 - 04.05.02-RPM + 04.05.03-RPM org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.03-RPM + 01.00.04-RPM-SNAPSHOT pom From 6278c52870cda5b1ab09ac5af068ac69d1de9409 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Sun, 22 Dec 2019 11:49:21 +0100 Subject: [PATCH 2/4] update parent --- .../vaadin/nano/CoreUIServiceJava.java | 5 +- pom.xml | 66 +++++++++++++++---- 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/01_impl/src/main/java/org/rapidpm/vaadin/nano/CoreUIServiceJava.java b/01_impl/src/main/java/org/rapidpm/vaadin/nano/CoreUIServiceJava.java index 9ce68b8..fb65005 100644 --- a/01_impl/src/main/java/org/rapidpm/vaadin/nano/CoreUIServiceJava.java +++ b/01_impl/src/main/java/org/rapidpm/vaadin/nano/CoreUIServiceJava.java @@ -16,6 +16,7 @@ package org.rapidpm.vaadin.nano; import com.vaadin.flow.router.Route; +import com.vaadin.flow.server.Constants; import com.vaadin.flow.server.startup.RouteRegistryInitializer; import com.vaadin.flow.server.startup.ServletDeployer; import io.undertow.Undertow; @@ -66,7 +67,9 @@ public class CoreUIServiceJava public Result undertow = failure("not initialised so far"); public static void main(String[] args) throws ParseException { - //System.setProperty("vaadin.productionMode ", "true"); + System.setProperty(Constants.SERVLET_PARAMETER_ENABLE_DEV_SERVER, "false"); + System.setProperty("vaadin.compatibilityMode", "false"); + System.setProperty("vaadin.productionMode", "true"); new CoreUIServiceJava().executeCLI(args).startup(); } diff --git a/pom.xml b/pom.xml index 6624f6f..7bc07cb 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.rapidpm rapidpm-vaadin-dependencies-v14 - 04.05.03-RPM + 04.06.00-RPM org.rapidpm.vaadin @@ -82,8 +82,8 @@ - - + + 1.8 false @@ -93,15 +93,33 @@ - - - - - - - - + + + com.vaadin + flow-server + provided + + + com.vaadin + flow-push + provided + + + com.vaadin + flow-client + provided + + + com.vaadin + flow-html-components + provided + + + com.vaadin + flow-data + provided + io.undertow @@ -142,4 +160,30 @@ + + + + + com.vaadin + vaadin-maven-plugin + ${vaadin-v14.version} + + + none + + + + + com.github.eirslett + frontend-maven-plugin + + + none + + + + + + + From c281b67bd898fcd51817032645ce292496615aef Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Sun, 22 Dec 2019 11:50:53 +0100 Subject: [PATCH 3/4] prepare release 01.00.04-RPM --- 01_impl/pom.xml | 2 +- 02_test/pom.xml | 2 +- 03_demo/pom.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/01_impl/pom.xml b/01_impl/pom.xml index 6cac57f..11ea406 100644 --- a/01_impl/pom.xml +++ b/01_impl/pom.xml @@ -23,7 +23,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.04-RPM-SNAPSHOT + 01.00.04-RPM 4.0.0 diff --git a/02_test/pom.xml b/02_test/pom.xml index 22d7c57..6d9672e 100644 --- a/02_test/pom.xml +++ b/02_test/pom.xml @@ -22,7 +22,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.04-RPM-SNAPSHOT + 01.00.04-RPM 4.0.0 diff --git a/03_demo/pom.xml b/03_demo/pom.xml index 2340498..e193396 100644 --- a/03_demo/pom.xml +++ b/03_demo/pom.xml @@ -23,7 +23,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.04-RPM-SNAPSHOT + 01.00.04-RPM 4.0.0 @@ -46,7 +46,7 @@ org.rapidpm.vaadin nano-vaadin-undertow - 01.00.04-RPM-SNAPSHOT + 01.00.04-RPM diff --git a/pom.xml b/pom.xml index 7bc07cb..b877d00 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.rapidpm.vaadin nano-vaadin-undertow-parent - 01.00.04-RPM-SNAPSHOT + 01.00.04-RPM pom From f2dee3713066481b2200c35adef25991febb48e3 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Sun, 22 Dec 2019 12:12:30 +0100 Subject: [PATCH 4/4] removed unused lines fro compose file --- docker-compose.yml | 2 -- pom.xml | 3 --- 2 files changed, 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3adbcaf..4754e9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,8 +24,6 @@ services: volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - $PWD/:/usr/src/mymaven -# - ~/.m2/settings.xml:/root/.m2/settings.xml -# - ~/.gnupg/:/root/.gnupg/ working_dir: /usr/src/mymaven # command: 'mvn help:active-profiles command: 'mvn license:format clean deploy diff --git a/pom.xml b/pom.xml index b877d00..a216993 100644 --- a/pom.xml +++ b/pom.xml @@ -82,13 +82,10 @@ - - 1.8 false true - 2.0.28.Final