[jgitflow-maven-plugin] merging 'release/io.wcm.devops.parent_toplevel-1.0.6' into 'master'

stefanseifert · stefanseifert · commit 3248ae4e2656 · 2017-04-04T10:20:06.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ pom.xml.versionsBackup
 pom.xml.next
 release.properties
 maven-eclipse.xml
+infinitest.filters
 
 node_modules/
 npm-debug.log
@@ -17,11 +18,12 @@ npm-debug.log
 .pmd
 .checkstyle
 .idea
-.iml
+.vagrant
 *.iml
 .DS_Store
 .rubygems
 .sass-cache
 .rubygems-gem-maven-plugin
 *.sublime-*
+*nbactions*.xml
 .temp/
diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -23,6 +23,15 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.0.6" date="2017-04-04">
+      <action type="update" dev="sseifert">
+        maven-release-plugin: Enable OddEvenVersionPolicy.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to global-parent 14.
+      </action>
+    </release>
+
     <release version="1.0.4" date="2017-02-09">
       <action type="update" dev="sseifert">
         Update to global-parent 13, update dependencies.
diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>13</version>
+    <version>14</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.6</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -247,6 +247,21 @@
           </configuration>
         </plugin>
 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <projectVersionPolicyId>OddEvenVersionPolicy</projectVersionPolicyId>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.release</groupId>
+              <artifactId>maven-release-oddeven-policy</artifactId>
+              <version>2.5.3</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
       </plugins>
 
     </pluginManagement>
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>13</version>
+    <version>14</version>
     <relativePath />
   </parent>
 
diff --git a/public_site/pom.xml b/public_site/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.5-SNAPSHOT</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 
