Merge branch 'develop'

wcm-io · Mar 30, 2022 · e0a5eb1 · e0a5eb1
2 parents cb43406 + 2450914
commit e0a5eb1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     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="2.0.2" date="not released">
+      <action type="update" dev="sseifert">
+        Set OddEvenVersionPolicy for gitflow-maven-plugin.
+      </action>
+      <action type="update" dev="sseifert">
+        Update to global-parent 43.
+      </action>
+      <action type="update" dev="sseifert">
+        Update testing dependencies.
+      </action>
+    </release>
+
     <release version="2.0.0" date="2022-01-25">
       <action type="update" dev="sseifert">
         Use io.wcm.maven.global-parent instead of io.wcm.parent_toplevel as parent.

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>42</version>
+    <version>43</version>
     <relativePath/>
   </parent>
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.parent</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.2</version>
   <packaging>pom</packaging>
 
   <name>Maven Tooling</name>
@@ -128,12 +128,12 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>4.2.0</version>
+        <version>4.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-junit-jupiter</artifactId>
-        <version>4.2.0</version>
+        <version>4.4.0</version>
       </dependency>
 
       <!-- Maven Plugin Tooling -->
@@ -288,6 +288,21 @@
            </dependencies>
         </plugin>
 
+        <plugin>
+          <groupId>com.amashchenko.maven.plugin</groupId>
+          <artifactId>gitflow-maven-plugin</artifactId>
+          <configuration>
+            <projectVersionPolicyId>OddEvenVersionPolicy</projectVersionPolicyId>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.release</groupId>
+              <artifactId>maven-release-oddeven-policy</artifactId>
+              <version>${maven-release-plugin.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
       </plugins>
 
     </pluginManagement>