Merge branch 'develop' into feature/java11

stefanseifert · stefanseifert · commit 07f778407457 · 2019-03-10T17:33:43.000+01:00
diff --git a/changes.xml b/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.8.14" date="not released">
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+    </release>
+
     <release version="1.8.12" date="2018-10-17">
       <action type="update" dev="sseifert">
         conga-aem-maven-plugin: Fix display of active bundles when checking bundle display.
diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.9.2</version>
+      <version>1.10.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.9.2</version>
+        <version>1.10.3-SNAPSHOT</version>
         <extensions>true</extensions>
         <dependencies>
 
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath />
   </parent>
 
diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath />
   </parent>
 
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga</groupId>
       <artifactId>io.wcm.devops.conga.generator</artifactId>
-      <version>1.9.2</version>
+      <version>1.10.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
