Merge branch 'develop' into master

stefanseifert · stefanseifert · commit 4ec87571e23b · 2021-06-27T15:07:42.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.2.8" date="2021-06-27">
+      <action type="update" dev="sseifert">
+        Update to global-parent 38.
+      </action>
+    </release>
+
     <release version="1.2.6" date="2021-03-15">
       <action type="update" dev="sseifert">
         Update to global-parent 37.
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>37</version>
+    <version>38</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.2.6</version>
+  <version>1.2.8</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
diff --git a/parent_toplevel/src/site/site.xml b/parent_toplevel/src/site/site.xml
@@ -116,9 +116,9 @@
       <item name="Maven Repositories" href="https://devops.wcm.io/maven.html" />
       <item name="GitHub project" href="http://github.com/wcm-io-devops" />
       <item name="Subprojects" href="https://wcm.io/subprojects.html" />
-      <item name="License" href="https://devops.wcm.io/license.html" />
+      <item name="License" href="http://www.apache.org/licenses/LICENSE-2.0.txt" />
       <item name="Commercial Support" href="https://wcm.io/commercial-support.html" />
-      <item name="Imprint" href="https://wcm.io/imprint.html" />
+      <item name="Imprint" href="https://diva-e.com/en/imprint/" />
       <item name="Privacy Policy" href="https://wcm.io/privacy.html" />
     </menu>
     <menu name="Categories" inherit="top">
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.2.5-SNAPSHOT</version>
+    <version>1.2.6</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.2.5-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 
