Merge remote-tracking branch 'origin/develop' into feature/init

01_impl/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>component-project-template-for-flow-parent</artifactId>
     <groupId>org.rapidpm.vaadin</groupId>
-    <version>00.00.01-RPM-SNAPSHOT</version>
+    <version>00.00.02-alpha</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

02_test/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>component-project-template-for-flow-parent</artifactId>
     <groupId>org.rapidpm.vaadin</groupId>
-    <version>00.00.01-RPM-SNAPSHOT</version>
+    <version>00.00.02-alpha</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

03_demo/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <artifactId>component-project-template-for-flow-parent</artifactId>
     <groupId>org.rapidpm.vaadin</groupId>
-    <version>00.00.01-RPM-SNAPSHOT</version>
+    <version>00.00.02-alpha</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -23,14 +23,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.rapidpm</groupId>
+    <groupId>org.rapidpm.vaadin</groupId>
     <artifactId>rapidpm-vaadin-dependencies-v14</artifactId>
-    <version>04.06.01-RPM-SNAPSHOT</version>
+    <version>05.00.00-alpha-b2</version>
   </parent>
 
   <groupId>org.rapidpm.vaadin</groupId>
   <artifactId>component-project-template-for-flow-parent</artifactId>
-  <version>00.00.01-RPM-SNAPSHOT</version>
+  <version>00.00.02-alpha</version>
 
   <packaging>pom</packaging>
 
@@ -85,33 +85,62 @@
   <properties>
     <!--technical-->
     <jdk.version>1.8</jdk.version>
+    <deploy-repo-url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release</deploy-repo-url>
+    <deploy-repo-snapshots-url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot</deploy-repo-snapshots-url>
   </properties>
 
   <repositories>
     <repository>
-      <id>sven-ruppert</id>
-      <name>Dev Repo with SNAPSHOTS</name>
-      <layout>default</layout>
-      <url>http://repo.sven-ruppert.de/repository/maven-public/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>libs-release</name>
+      <!--      <url>${deploy-repo-url}</url>-->
+      <url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release</url>
+    </repository>
+    <repository>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>snapshots</id>
+      <name>libs-snapshot</name>
+      <url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>libs-release</name>
+      <url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release</url>
+      <!--      <url>${deploy-repo-url}</url>-->
+    </pluginRepository>
+    <pluginRepository>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>snapshots</id>
+      <name>libs-snapshot</name>
+      <url>http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot</url>
+    </pluginRepository>
+  </pluginRepositories>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.rapidpm.vaadin</groupId>
         <artifactId>component-project-template-for-flow</artifactId>
-        <version>00.00.01-RPM-SNAPSHOT</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.rapidpm.vaadin</groupId>
         <artifactId>nano-vaadin-undertow</artifactId>
-        <version>01.00.05-RPM-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.appreciated</groupId>
-        <artifactId>vaadin-css-grid</artifactId>
-        <version>2.0.0.beta3</version>
+        <version>01.01.00-alpha-b3</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

version-number-rules.xml

@@ -0,0 +1,46 @@
+<ruleset comparisonMethod="maven"
+         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+  <ignoreVersions>
+    <ignoreVersion type="regex">(?i).*[-_\.]CR[0-9\.]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]rc[0-9\.]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]beta[0-9\.-]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]alpha[0-9\.-]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]Alpha</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]nightly[0-9\.]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*[-_\.]jboss[0-9\.]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*-atlassian-[0-9\.]*</ignoreVersion>
+    <ignoreVersion type="regex">(?i).*-jenkins-[0-9\.]*</ignoreVersion>
+    <ignoreVersion type="regex">.*[-\.]redhat-[0-9]+</ignoreVersion>
+    <ignoreVersion type="regex">\d{4,}.*</ignoreVersion>  <!-- z.B. commons-collections:commons-collections ... 3.2.1.redhat-7 -> 20040117.000000 -->
+  </ignoreVersions>
+  <rules>
+    <rule groupId="org.cache2k">
+      <ignoreVersions>
+        <ignoreVersion>1.3.1.Alpha</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.slf4j" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">.*-xwiki</ignoreVersion>
+        <ignoreVersion type="regex">.*-alpha*</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.apache.maven.plugins" artifactId="maven-surefire-plugin" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion>9c6abc2</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="org.codehaus.mojo" artifactId="properties-maven-plugin" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">.*-tc</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+    <rule groupId="javax.portlet" artifactId="portlet-api" comparisonMethod="maven">
+      <ignoreVersions>
+        <ignoreVersion type="regex">.*-r\d+</ignoreVersion>
+        <ignoreVersion type="regex">.*-Draft\d+</ignoreVersion>
+      </ignoreVersions>
+    </rule>
+  </rules>
+</ruleset>