Merge branch 'release/01.00.03-RPM'

svenruppert · Dec 21, 2019 · 056ee39 · 056ee39
2 parents 9ac5595 + 0067450
commit 056ee39
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 node/*
 node_modules/*
+*/node/*
+*/node_modules/*
+
 package.json
 package-lock.json
 webpack.config.js

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.02-RPM</version>
+    <version>01.00.03-RPM</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
         <executions>
           <execution>
             <phase>package</phase>

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
@@ -66,6 +66,8 @@ 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");
+
     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.02-RPM</version>
+    <version>01.00.03-RPM</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/03_demo/pom.xml b/03_demo/pom.xml
@@ -20,11 +20,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
   <parent>
     <groupId>org.rapidpm.vaadin</groupId>
     <artifactId>nano-vaadin-undertow-parent</artifactId>
-    <version>01.00.02-RPM</version>
+    <version>01.00.03-RPM</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -47,8 +46,9 @@
     <dependency>
       <groupId>org.rapidpm.vaadin</groupId>
       <artifactId>nano-vaadin-undertow</artifactId>
-      <version>01.00.02-RPM</version>
+      <version>01.00.03-RPM</version>
     </dependency>
+
     <!--For Core Vaadin Components-->
     <dependency>
       <groupId>com.vaadin</groupId>
@@ -71,12 +71,22 @@
       <groupId>com.vaadin</groupId>
       <artifactId>vaadin-tabs-flow</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-grid-flow</artifactId>
+    </dependency>
 
 <!--    external -->
     <dependency>
       <groupId>com.github.appreciated</groupId>
       <artifactId>vaadin-css-grid</artifactId>
-      <version>2.0.0.beta2</version>
+      <version>2.0.0.beta3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.vaadin</groupId>
+          <artifactId>vaadin-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
@@ -109,4 +119,43 @@
       </plugin>
     </plugins>
   </build>
+
+<!--  <profiles>-->
+<!--    <profile>-->
+<!--      <id>vaadin-productionMode</id>-->
+<!--      <activation>-->
+<!--        <activeByDefault>false</activeByDefault>-->
+<!--        <property>-->
+<!--          <name>vaadin-productionMode</name>-->
+<!--        </property>-->
+<!--      </activation>-->
+<!--      <properties>-->
+<!--        <vaadin.productionMode>true</vaadin.productionMode>-->
+<!--      </properties>-->
+<!--      <dependencies>-->
+<!--        <dependency>-->
+<!--          <groupId>com.vaadin</groupId>-->
+<!--          <artifactId>flow-server-production-mode</artifactId>-->
+<!--        </dependency>-->
+<!--      </dependencies>-->
+<!--      <build>-->
+<!--        <plugins>-->
+<!--          <plugin>-->
+<!--            <groupId>com.vaadin</groupId>-->
+<!--            <artifactId>vaadin-maven-plugin</artifactId>-->
+<!--            <version>${vaadin-v14.version}</version>-->
+<!--            <executions>-->
+<!--              <execution>-->
+
+<!--                <goals>-->
+<!--                  <goal>copy-production-files</goal>-->
+<!--                  <goal>package-for-production</goal>-->
+<!--                </goals>-->
+<!--              </execution>-->
+<!--            </executions>-->
+<!--          </plugin>-->
+<!--        </plugins>-->
+<!--      </build>-->
+<!--    </profile>-->
+<!--  </profiles>-->
 </project>
diff --git a/03_demo/src/main/kotlin/org/rapidpm/vaadin/nano/demo/views/DashboardView.kt b/03_demo/src/main/kotlin/org/rapidpm/vaadin/nano/demo/views/DashboardView.kt
@@ -15,17 +15,18 @@
  */
 package org.rapidpm.vaadin.nano.demo.views
 
+import com.github.appreciated.css.grid.GridLayoutComponent
 import com.github.appreciated.css.grid.GridLayoutComponent.AutoFlow.ROW_DENSE
-import com.github.appreciated.css.grid.GridLayoutComponent.Overflow.AUTO
+import com.github.appreciated.css.grid.sizes.Repeat.RepeatMode.AUTO_FIT
 import com.github.appreciated.css.grid.sizes.Flex
 import com.github.appreciated.css.grid.sizes.Length
 import com.github.appreciated.css.grid.sizes.MinMax
-import com.github.appreciated.css.grid.sizes.Repeat.RepeatMode.AUTO_FIT
 import com.github.appreciated.layout.FlexibleGridLayout
 import com.vaadin.flow.component.Composite
 import com.vaadin.flow.component.dependency.CssImport
 import com.vaadin.flow.component.dependency.JsModule
 import com.vaadin.flow.component.html.Div
+import com.vaadin.flow.component.html.Span
 import com.vaadin.flow.router.PageTitle
 import com.vaadin.flow.router.Route
 import com.vaadin.flow.router.RouteAlias
@@ -49,11 +50,12 @@ class DashboardView : Composite<Div>(), HasLogger {
       .withPadding(true)
       .withSpacing(true)
       .withAutoFlow(ROW_DENSE)
-      .withOverflow(AUTO)
+      .withOverflow(GridLayoutComponent.Overflow.AUTO)
 
   init {
     setId("dashboard-view")
 
+    content.add(Span("HEllo Span"))
     content.add(gridLayout)
     gridLayout.withItems(
         ServiceHealtCard(),

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,19 +18,19 @@ version: '3.5'
 
 services:
   deploy:
-    image: svenruppert/maven-3.6.2-adopt:1.8.212-04
+    image: svenruppert/deploy:1.8.0-222
     container_name: deploy_nano_vaadin_undertow
     hostname: deploy_nano_vaadin_undertow
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - $PWD/:/usr/src/mymaven
-      - ~/.m2/settings.xml:/root/.m2/settings.xml
-      - ~/.gnupg/:/root/.gnupg/
+#      - ~/.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
                     -P_release_prepare
                     -P_release
-                    -P_release_sign_artifacts
+                    -P_release_sign-artifacts
                     -Pvaadin-install-nodejs
                     -Dmaven.test.skip=true '
diff --git a/pom.xml b/pom.xml
@@ -24,13 +24,12 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-vaadin-dependencies-v14</artifactId>
-    <version>04.04.00-RPM</version>
+    <version>04.05.02-RPM</version>
   </parent>
 
-
   <groupId>org.rapidpm.vaadin</groupId>
   <artifactId>nano-vaadin-undertow-parent</artifactId>
-  <version>01.00.02-RPM</version>
+  <version>01.00.03-RPM</version>
 
   <packaging>pom</packaging>
 
@@ -85,15 +84,12 @@
   <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>
-    <!--    <frontend-maven-plugin.installDirectory>_data</frontend-maven-plugin.installDirectory>-->
 
-    <undertow.version>2.0.26.Final</undertow.version>
+    <undertow.version>2.0.28.Final</undertow.version>
   </properties>