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

stefanseifert · stefanseifert · commit 9818b02f3065 · 2017-10-19T22:34:02.000+02: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.8" date="2017-10-19">
+      <action type="update" dev="sseifert">
+        Update to global-parent 17, update mockito.
+      </action>
+    </release>
+
     <release version="1.0.6" date="2017-04-04">
       <action type="update" dev="sseifert">
         maven-release-plugin: Enable OddEvenVersionPolicy.
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>14</version>
+    <version>17</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.8</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -87,7 +87,7 @@
     <site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
     <site.url>http://devops.wcm.io</site.url>
     <site.deploy.id>ssh-wcm.io</site.deploy.id>
-    <site.deploy.url>scp://wcmio@wcm.io:222/var/www/devops.wcm.io/www/</site.deploy.url>
+    <site.deploy.url />
 
   </properties>
 
@@ -150,13 +150,23 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>2.3.7</version>
+        <version>2.11.0</version>
       </dependency>
 
     </dependencies>
   </dependencyManagement>
 
   <build>
+    <extensions>
+
+      <!-- Add wcm.io file header to code templates -->
+      <extension>
+        <groupId>io.wcm.maven</groupId>
+        <artifactId>io.wcm.maven.global-build-tools-mixin</artifactId>
+        <version>1</version>
+      </extension>
+
+    </extensions>
     <plugins>
 
       <!-- license check -->
diff --git a/pom.xml b/pom.xml
@@ -24,10 +24,10 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>io.wcm.maven</groupId>
-    <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>14</version>
-    <relativePath />
+    <groupId>io.wcm.devops</groupId>
+    <artifactId>io.wcm.devops.parent_toplevel</artifactId>
+    <version>1.0.7-SNAPSHOT</version>
+    <relativePath>parent_toplevel/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops</groupId>
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.5-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 
