You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2022/09/21 13:34:13 UTC
[sling-org-apache-sling-distribution-journal] branch master updated: SLING-11560 - Vault error when importing a node with the same name and UUID as a pre-existing non-sibling node (#111)
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
The following commit(s) were added to refs/heads/master by this push:
new eb97069 SLING-11560 - Vault error when importing a node with the same name and UUID as a pre-existing non-sibling node (#111)
eb97069 is described below
commit eb9706986e07e39069a63ef95c5d9a1dc730e8b5
Author: Timothee Maret <tm...@adobe.com>
AuthorDate: Wed Sep 21 15:34:08 2022 +0200
SLING-11560 - Vault error when importing a node with the same name and UUID as a pre-existing non-sibling node (#111)
---
pom.xml | 5 +++++
.../distribution/journal/bookkeeper/ContentPackageExtractor.java | 3 +++
2 files changed, 8 insertions(+)
diff --git a/pom.xml b/pom.xml
index 528c16d..830d984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,6 +192,11 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.16.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault</artifactId>
+ <version>3.6.4</version>
+ </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
diff --git a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
index 90ead6d..a9690b9 100644
--- a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
+++ b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractor.java
@@ -20,6 +20,7 @@ package org.apache.sling.distribution.journal.bookkeeper;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
+import static org.apache.jackrabbit.vault.fs.api.IdConflictPolicy.LEGACY;
import java.io.IOException;
import java.util.List;
@@ -112,6 +113,8 @@ class ContentPackageExtractor {
private void installPackage(JcrPackage pack, ErrorListener listener) throws RepositoryException, PackageException, IOException {
ImportOptions opts = new ImportOptions();
+ opts.setIdConflictPolicy(LEGACY);
+ opts.setOverwritePrimaryTypesOfFolders(true);
opts.setListener(listener);
opts.setStrict(true);
if (packageHandling == PackageHandling.Extract) {