You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/05/25 07:09:14 UTC
[sling-org-apache-sling-jcr-packageinit] branch master updated:
SLING-10339 revert workaround by updating to FileVault 3.5.0
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-packageinit.git
The following commit(s) were added to refs/heads/master by this push:
new c440bd0 SLING-10339 revert workaround by updating to FileVault 3.5.0
c440bd0 is described below
commit c440bd01c22e02be7d590c2c392273d422a6349b
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue May 25 09:09:01 2021 +0200
SLING-10339 revert workaround by updating to FileVault 3.5.0
clean up dependencies
---
pom.xml | 42 +++++++++++++---------
.../impl/ExecutionPlanRepoInitializer.java | 3 --
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3cfb143..4819161 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,12 +43,14 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -63,10 +65,12 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -75,21 +79,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.5.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>3.2.4</version>
+ <version>3.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -99,8 +91,14 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -108,7 +106,17 @@
<version>2.3.2</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.21.0</version>
diff --git a/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java b/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java
index eb18235..3bc93cb 100644
--- a/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java
+++ b/src/main/java/org/apache/sling/jcr/packageinit/impl/ExecutionPlanRepoInitializer.java
@@ -132,9 +132,6 @@ public class ExecutionPlanRepoInitializer implements SlingRepositoryInitializer
logger.info("Waiting for PackageRegistry.");
PackageRegistry registry = (PackageRegistry) st.waitForService(0);
logger.info("PackageRegistry found - starting execution of execution plan");
- // workaround until https://issues.apache.org/jira/browse/JCRVLT-517 is solved: registry.contains yields false value until initialized,
- // making the call ExecutionPlan.execute() later fail if a new package has a dependency on another package declared
- registry.packages();
ExecutionPlanBuilder builder = registry.createExecutionPlan();
@SuppressWarnings("deprecation")