Author: kwin Date: Thu Jun 29 13:57:05 2017 New Revision: 1800283 URL: http://svn.apache.org/viewvc?rev=1800283&view=rev Log: SLING-6484 remove workaround as FileVault 3.1.40 fixed the bug with JcrPackage.isInstalled()
Modified: sling/trunk/installer/factories/packages/pom.xml sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java Modified: sling/trunk/installer/factories/packages/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/packages/pom.xml?rev=1800283&r1=1800282&r2=1800283&view=diff ============================================================================== --- sling/trunk/installer/factories/packages/pom.xml (original) +++ sling/trunk/installer/factories/packages/pom.xml Thu Jun 29 13:57:05 2017 @@ -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> Modified: sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java?rev=1800283&r1=1800282&r2=1800283&view=diff ============================================================================== --- sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java (original) +++ sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java Thu Jun 29 13:57:05 2017 @@ -215,16 +215,12 @@ public class PackageTransformer implemen 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