Merge branch 'develop'

stefanseifert · stefanseifert · commit 81d14a987b4c · 2022-08-15T13:15:24.000+02:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <img src="https://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for AEM
 ======
 [![Build](https://github.com/wcm-io-devops/conga-aem-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-aem-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem)
+[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem)](https://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/io.wcm.devops.conga.plugins.aem)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-aem-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-aem-plugin)
 
 Documentation: https://devops.wcm.io/conga/plugins/aem/<br/>
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,15 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.18.4" date="2022-08-15">
+      <action type="update" dev="sseifert">
+        conga-aem-maven-plugin: Check bundle status before package manager install status as the latter may report errors if certain bundles are restarted.
+      </action>
+      <action type="fix" dev="sseifert">
+        conga-aem-maven-plugin: Ensure last modification dates for content package ZIP file entries are kept the same when rebuilding the "all" package.
+      </action>
+    </release>
+
     <release version="2.18.2" date="2022-06-20">
       <action type="fix" dev="sseifert">
         conga-aem-maven-plugin: Add explicit handling for responses with invalid JSON payload for packager manager install status and bundle status calls.
diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.18.2</version>
+    <version>2.18.4</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>2.18.2</version>
+  <version>2.18.4</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-  <version>2.18.2</version>
+  <version>2.18.4</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -75,7 +75,7 @@
       <dependency>
         <groupId>io.wcm.tooling.commons</groupId>
         <artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.4</version>
       </dependency>
 
       <dependency>
diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.18.2</version>
+    <version>2.18.4</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>2.18.2</version>
+  <version>2.18.4</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -2,7 +2,7 @@
 
 wcm.io DevOps CONGA Plugin for [Adobe Experience Manager (AEM)][aem].
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem)
+[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem)](https://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/io.wcm.devops.conga.plugins.aem)
 
 
 ### Documentation
diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.18.2</version>
+    <version>2.18.4</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>2.18.2</version>
+  <version>2.18.4</version>
 
   <name>CONGA AEM Crypto Command Line Interface</name>
   <description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.18.2</version>
+      <version>2.18.4</version>
       <scope>compile</scope>
       <exclusions>
         <!-- Exclude all deps - only crypto util classes are used -->
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.18.2</version>
+    <version>2.18.4</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>2.18.2</version>
+  <version>2.18.4</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.18.2</version>
+      <version>2.18.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java
@@ -557,7 +557,7 @@ private List<TemporaryContentPackageFile> processContentPackage(ContentPackageFi
                   props.put(NAME_PACKAGE_TYPE, packageType);
                 }
 
-                ZipEntry zipOutEntry = new ZipEntry(zipInEntry.getName());
+                ZipEntry zipOutEntry = newZipEntry(zipInEntry);
                 zipOut.putNextEntry(zipOutEntry);
                 props.storeToXML(zipOut, null);
                 processedEntry = true;
@@ -589,7 +589,7 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
 
               // otherwise transfer the binary data 1:1
               if (!processedEntry) {
-                ZipEntry zipOutEntry = new ZipEntry(zipInEntry.getName());
+                ZipEntry zipOutEntry = newZipEntry(zipInEntry);
                 zipOut.putNextEntry(zipOutEntry);
                 IOUtils.copy(is, zipOut);
               }
@@ -615,6 +615,17 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
     return result;
   }
 
+  private static ZipEntry newZipEntry(ZipEntry in) {
+    ZipEntry out = new ZipEntry(in.getName());
+    if (in.getCreationTime() != null) {
+      out.setCreationTime(in.getCreationTime());
+    }
+    if (in.getLastModifiedTime() != null) {
+      out.setLastModifiedTime(in.getLastModifiedTime());
+    }
+    return out;
+  }
+
   /**
    * Add dependency information to dependencies string in properties (if it does not exist already).
    * @param props Properties
