This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-packages.git
commit a0ad33a442ae9c653d08062b7787dd722c35aff4 Author: Konrad Windszus <[email protected]> AuthorDate: Thu Jun 29 13:57:05 2017 +0000 SLING-6484 remove workaround as FileVault 3.1.40 fixed the bug with JcrPackage.isInstalled() git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1800283 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../factory/packages/impl/PackageTransformer.java | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 8936434..699121c 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ <dependency> <groupId>org.apache.jackrabbit.vault</groupId> <artifactId>org.apache.jackrabbit.vault</artifactId> - <version>3.1.30</version> + <version>3.1.40</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java b/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java index ee49568..b3fabbf 100644 --- a/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java +++ b/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java @@ -215,16 +215,12 @@ public class PackageTransformer implements ResourceTransformer, InstallTaskFacto return; } - // if this is a SNAPSHOT version we always trigger a reinstall - // (this workaround can be removed once https://issues.apache.org/jira/browse/JCRVLT-155 is implemented) - if (!pkgId.getVersionString().endsWith("-SNAPSHOT")) { - // check if package was installed previously by some other means (or even by a previous run of the installer) - if (pkg.isInstalled()) { - String message = MessageFormat.format("Package {0} was installed externally. Marking as installed.", pkgId); - logger.info(message); - this.setFinishedState(ResourceState.INSTALLED, null, message); - return; - } + // check if package was installed previously by some other means (or even by a previous run of the installer) + if (pkg.isInstalled()) { + String message = MessageFormat.format("Package {0} was installed externally. Marking as installed.", pkgId); + logger.info(message); + this.setFinishedState(ResourceState.INSTALLED, null, message); + return; } // check if dependencies are installed -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
