Merge pull request #5 from Nano-Vaadin-Demos/release/01.00.04-RPM

Release/01.00.04 rpm
Nano-Vaadin-Demos · Dec 22, 2019 · e966ad5 · e966ad5
2 parents 056ee39 + f2dee37
commit e966ad5
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 20 deletions.
diff --git a/01_impl/pom.xml b/01_impl/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.rapidpm.vaadin</groupId>
     <artifactId>nano-vaadin-undertow-parent</artifactId>
-    <version>01.00.03-RPM</version>
+    <version>01.00.04-RPM</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

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
@@ -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> 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/02_test/pom.xml b/02_test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.rapidpm.vaadin</groupId>
     <artifactId>nano-vaadin-undertow-parent</artifactId>
-    <version>01.00.03-RPM</version>
+    <version>01.00.04-RPM</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/03_demo/pom.xml b/03_demo/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.rapidpm.vaadin</groupId>
     <artifactId>nano-vaadin-undertow-parent</artifactId>
-    <version>01.00.03-RPM</version>
+    <version>01.00.04-RPM</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.rapidpm.vaadin</groupId>
       <artifactId>nano-vaadin-undertow</artifactId>
-      <version>01.00.03-RPM</version>
+      <version>01.00.04-RPM</version>
     </dependency>
 
     <!--For Core Vaadin Components-->

diff --git 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
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-vaadin-dependencies-v14</artifactId>
-    <version>04.05.02-RPM</version>
+    <version>04.06.00-RPM</version>
   </parent>
 
   <groupId>org.rapidpm.vaadin</groupId>
   <artifactId>nano-vaadin-undertow-parent</artifactId>
-  <version>01.00.03-RPM</version>
+  <version>01.00.04-RPM</version>
 
   <packaging>pom</packaging>
 
@@ -82,26 +82,41 @@
   </modules>
 
   <properties>
-<!--    <deploy-repo-url></deploy-repo-url>-->
-<!--    <deploy-repo-snapshots-url></deploy-repo-snapshots-url>-->
     <jdk.version>1.8</jdk.version>
     <!--Vaadin-->
     <vaadin-productionMode>false</vaadin-productionMode>
     <vaadin-install-nodejs>true</vaadin-install-nodejs>
-
     <undertow.version>2.0.28.Final</undertow.version>
   </properties>
 
 
-
-
-  <dependencyManagement>
-    <dependencies>
-
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
+    <!--    exclude from jar-->
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>flow-server</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>flow-push</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>flow-client</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>flow-html-components</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>flow-data</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <!--Infrastructure-->
     <dependency>
       <groupId>io.undertow</groupId>
@@ -142,4 +157,30 @@
     </dependency>
   </dependencies>
 
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-maven-plugin</artifactId>
+        <version>${vaadin-v14.version}</version>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
 </project>