Merge pull request #19 from RapidPM/release/04.05.01-RPM

Release/04.05.01 rpm
svenruppert · Nov 23, 2019 · 507854d · 507854d
2 parents c017799 + 4fe951b
commit 507854d
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 24 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,33 @@
+#
+# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+#
+# 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.
+#
+
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Maven
+      run: mvn -B license:format clean install -Pvaadin-install-nodejs -Dmaven.test.skip=true --file pom.xml
diff --git a/core-properties/pom.xml b/core-properties/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>rapidpm-dependencies</artifactId>
 		<groupId>org.rapidpm</groupId>
-		<version>04.05.00-RPM</version>
+		<version>04.05.01-RPM</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>rapidpm-dependencies</artifactId>
     <groupId>org.rapidpm</groupId>
-    <version>04.05.00-RPM</version>
+    <version>04.05.01-RPM</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/deploy.sh b/deploy.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 #
 
-docker rm deploy
-docker-compose up
+docker rm deploy-rpm-dependencies
+docker-compose up
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,14 +18,12 @@ version: '3.5'
 
 services:
   deploy:
-    image: svenruppert/maven-3.6.2-adopt:1.8.212-04
-    container_name: deploy
-    hostname: deploy
+    image: svenruppert/deploy:1.8.0-222
+    container_name: deploy-rpm-dependencies
+    hostname: deploy-rpm-dependencies
     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
@@ -27,7 +27,7 @@
   <packaging>pom</packaging>
 
   <!-- !!!Change the properties with rapidpm version too !!! -->
-  <version>04.05.00-RPM</version>
+  <version>04.05.01-RPM</version>
 
 
   <inceptionYear>2013</inceptionYear>
@@ -79,7 +79,7 @@
 <!--    <deploy-repo-url>https://api.bintray.com/maven/rapidpm/maven/rapidpm-dependencies/;publish=1</deploy-repo-url>-->
     <deploy-repo-snapshots-url></deploy-repo-snapshots-url>
 
-    <rapidpm-dependencies.version>04.05.00-RPM</rapidpm-dependencies.version>
+    <rapidpm-dependencies.version>04.05.01-RPM</rapidpm-dependencies.version>
     <rapidpm-functional-reactive.version>01.00.04-RPM</rapidpm-functional-reactive.version>
     <rapidpm-logger-adapter.version>01.00.04-RPM</rapidpm-logger-adapter.version>
 
@@ -97,7 +97,7 @@
 
     <!--Kotlin-->
     <kotlin.compiler.jvmTarget>${jdk.version}</kotlin.compiler.jvmTarget>
-    <kotlin.version>1.3.50</kotlin.version>
+    <kotlin.version>1.3.60</kotlin.version>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
 
 
@@ -115,7 +115,7 @@
     <pitest-prod-classes>org.rapidpm.*</pitest-prod-classes>
     <pitest-test-classes>junit.org.rapidpm*</pitest-test-classes>
 
-    <jmh.version>1.21</jmh.version>
+    <jmh.version>1.22</jmh.version>
 
     <!--TDD jUnit5-->
     <junit.jupiter.version>5.5.2</junit.jupiter.version>
@@ -125,7 +125,7 @@
     <opentracing-api.version>0.33.0</opentracing-api.version>
     <asm.version>7.1</asm.version>
 
-    <testcontainers.version>1.12.2</testcontainers.version>
+    <testcontainers.version>1.12.3</testcontainers.version>
 
     <junit-platform-maven-plugin.timeout>300</junit-platform-maven-plugin.timeout>
   </properties>
@@ -232,7 +232,7 @@
       <dependency>
         <groupId>net.oneandone.reflections8</groupId>
         <artifactId>reflections8</artifactId>
-        <version>0.11.6</version>
+        <version>0.11.7</version>
       </dependency>
 
       <dependency>
@@ -404,7 +404,7 @@
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
-        <version>3.13.2</version>
+        <version>3.14.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -450,7 +450,7 @@
       <dependency>
         <groupId>io.gatling.highcharts</groupId>
         <artifactId>gatling-charts-highcharts</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.1</version>
         <scope>test</scope>
       </dependency>
       <!--tdd-->
@@ -888,7 +888,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.25</version> <!-- Checkstyle version -->
+            <version>8.26</version> <!-- Checkstyle version -->
           </dependency>
         </dependencies>
         <executions>

diff --git a/vaadin-dependencies/pom.xml b/vaadin-dependencies/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-dependencies</artifactId>
-    <version>04.05.00-RPM</version>
+    <version>04.05.01-RPM</version>
   </parent>
 
   <artifactId>rapidpm-vaadin-dependencies</artifactId>
   <packaging>pom</packaging>
-  <version>04.05.00-RPM</version>
+  <version>04.05.01-RPM</version>
 
   <modules>
     <module>vaadin-flow-commons</module>
@@ -38,7 +38,7 @@
   </modules>
 
   <properties>
-    <vaadin-v14.version>14.0.10</vaadin-v14.version>
+    <vaadin-v14.version>14.0.13</vaadin-v14.version>
     <vaadin-testbench-v14.version>6.2.0</vaadin-testbench-v14.version>
 
     <vaadin-vXX.version>15.0.0.alpha1</vaadin-vXX.version>

diff --git a/vaadin-dependencies/vaadin-flow-commons/pom.xml b/vaadin-dependencies/vaadin-flow-commons/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>rapidpm-vaadin-dependencies</artifactId>
     <groupId>org.rapidpm</groupId>
-    <version>04.05.00-RPM</version>
+    <version>04.05.01-RPM</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/vaadin-dependencies/vaadin-v14/pom.xml b/vaadin-dependencies/vaadin-v14/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-vaadin-dependencies</artifactId>
-    <version>04.05.00-RPM</version>
+    <version>04.05.01-RPM</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
@@ -235,6 +235,9 @@
           <name>vaadin-productionMode</name>
         </property>
       </activation>
+      <properties>
+        <vaadin.productionMode>true</vaadin.productionMode>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>com.vaadin</groupId>

diff --git a/vaadin-dependencies/vaadin-vXX/pom.xml b/vaadin-dependencies/vaadin-vXX/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-vaadin-dependencies</artifactId>
-    <version>04.05.00-RPM</version>
+    <version>04.05.01-RPM</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -203,6 +203,9 @@
           <name>vaadin-productionMode</name>
         </property>
       </activation>
+      <properties>
+        <vaadin.productionMode>true</vaadin.productionMode>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>com.vaadin</groupId>