Update to global-parent 12, update dependencies.

stefanseifert · stefanseifert · commit 30a1dd541969 · 2016-11-07T21:53:00.000+01:00
diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -23,6 +23,12 @@
     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.4" date="not released">
+      <action type="update" dev="sseifert">
+        Update to global-parent 12, update dependencies.
+      </action>
+    </release>
+
     <release version="1.0.2" date="2015-11-12">
       <action type="update" dev="sseifert">
         Update to global-parent 10, switch from cobertura to jacoco.
diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>10</version>
+    <version>12-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -140,7 +140,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>2.0.13-beta</version>
+        <version>2.2.12</version>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
