Merge branch 'develop'

wcm-io · Aug 15, 2022 · e0bb02c · e0bb02c
2 parents 700b7f2 + 93c608b
commit e0bb02c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <img src="https://wcm.io/images/[email protected]"/> CRX Package Manager Helper
 ======
 [![Build](https://github.com/wcm-io/io.wcm.tooling.commons.crx-packmgr-helper/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io/io.wcm.tooling.commons.crx-packmgr-helper/actions?query=workflow%3ABuild+branch%3Adevelop)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.tooling.commons/io.wcm.tooling.commons.crx-packmgr-helper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.tooling.commons/io.wcm.tooling.commons.crx-packmgr-helper)
+[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.tooling.commons/io.wcm.tooling.commons.crx-packmgr-helper)](https://repo1.maven.org/maven2/io/wcm/tooling/commons/io.wcm.tooling.commons.crx-packmgr-helper)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io_io.wcm.tooling.commons.crx-packmgr-helper&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io_io.wcm.tooling.commons.crx-packmgr-helper)
 
 Java Library for uploading and downloading AEM content packages via CRX Package Manager.

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="2.1.4" date="2022-08-15">
+      <action type="update" dev="sseifert">
+        Check bundle status before package manager install status as the latter may report errors if certain bundles are restarted.
+      </action>
+    </release>
+
     <release version="2.1.2" date="2022-06-20">
       <action type="fix" dev="sseifert">
         Add explicit handling for responses with invalid JSON payload for packager manager install status and bundle status calls.

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 
   <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>
   <packaging>jar</packaging>
 
   <name>CRX Package Manager Helper</name>
@@ -48,7 +48,7 @@
     <site.url.module.prefix>tooling/commons/crx-packmgr-helper</site.url.module.prefix>
 
     <!-- Enable reproducible builds -->
-    <project.build.outputTimestamp>2022-06-20T10:50:19Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2022-08-15T10:54:28Z</project.build.outputTimestamp>
   </properties>
 
   <dependencies>

diff --git a/src/main/java/io/wcm/tooling/commons/packmgr/install/PackageInstaller.java b/src/main/java/io/wcm/tooling/commons/packmgr/install/PackageInstaller.java
@@ -100,10 +100,10 @@ private void installFile(PackageFile packageFile, CloseableHttpClient httpClient
       throw new PackageManagerException("File does not exist: " + file.getAbsolutePath());
     }
 
-    // before install: if packages are still installing, wait for completion
-    pkgmgr.waitForPackageManagerInstallStatusFinished(httpClient, packageManagerHttpClientContext);
     // before install: if bundles are still stopping/starting, wait for completion
     pkgmgr.waitForBundlesActivation(httpClient, consoleHttpClientContext);
+    // before install: if packages are still installing, wait for completion
+    pkgmgr.waitForPackageManagerInstallStatusFinished(httpClient, packageManagerHttpClientContext);
 
     if (packageFile.isInstall()) {
       log.info("Upload and install {}{} to {}", packageFile.isForce() ? "(force) " : "", file.getName(), props.getPackageManagerUrl());

diff --git a/src/main/java/io/wcm/tooling/commons/packmgr/install/crx/CrxPackageInstaller.java b/src/main/java/io/wcm/tooling/commons/packmgr/install/crx/CrxPackageInstaller.java
@@ -131,10 +131,10 @@ public void installPackage(PackageFile packageFile, boolean replicate, PackageMa
         // delay further processing after install (if activated)
         delay(packageFile.getDelayAfterInstallSec());
 
-        // after install: if packages are still installing, wait for completion
-        pkgmgr.waitForPackageManagerInstallStatusFinished(httpClient, packageManagerHttpClientContext);
         // after install: if bundles are still stopping/starting, wait for completion
         pkgmgr.waitForBundlesActivation(httpClient, consoleHttpClientContext);
+        // after install: if packages are still installing, wait for completion
+        pkgmgr.waitForPackageManagerInstallStatusFinished(httpClient, packageManagerHttpClientContext);
       }
       else {
         log.info("Package uploaded successfully to {} (without installing).", path);

diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -2,7 +2,7 @@
 
 Java Library for uploading and downloading AEM content packages via CRX Package Manager.
 
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.tooling.commons/io.wcm.tooling.commons.crx-packmgr-helper/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.tooling.commons/io.wcm.tooling.commons.crx-packmgr-helper)
+[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.tooling.commons/io.wcm.tooling.commons.crx-packmgr-helper)](https://repo1.maven.org/maven2/io/wcm/tooling/commons/io.wcm.tooling.commons.crx-packmgr-helper)
 
 ### Documentation