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

stefanseifert · stefanseifert · commit 4c1a4461b7b9 · 2019-05-08T11:32:03.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.1.4" date="2019-05-08">
+      <action type="update" dev="sseifert">
+        Update to global-parent 26.
+      </action>
+    </release>
+
     <release version="1.1.2" date="2019-03-14">
       <action type="update" dev="sseifert">
         Update to global-parent 25.
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>25</version>
+    <version>26</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.4</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -79,9 +79,9 @@
 
   <properties>
 
-    <!-- compiler settings -->
-    <build.compiler.source>1.8</build.compiler.source>
-    <build.compiler.target>1.8</build.compiler.target>
+    <!-- Java version -->
+    <java.version>1.8</java.version>
+    <build.compiler.release>8</build.compiler.release>
 
     <!-- site settings -->
     <site.url.module.prefix>tooling/parent_toplevel</site.url.module.prefix>
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.2</version>
     <relativePath>parent_toplevel/pom.xml</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.1.1-SNAPSHOT</version>
+    <version>1.1.2</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 
