diff --git parent/pom.xml parent/pom.xml index 37db997..a54e8b8 100644 --- parent/pom.xml +++ parent/pom.xml @@ -40,8 +40,8 @@ - 2.14.0 - 1.6.0 + 2.13.7 + 1.5.9 @@ -362,7 +362,7 @@ commons-io commons-io - 2.5 + 2.4 commons-collections diff --git vault-core/pom.xml vault-core/pom.xml index 9ce6e35..9305804 100644 --- vault-core/pom.xml +++ vault-core/pom.xml @@ -213,7 +213,7 @@ org.apache.jackrabbit - oak-segment-tar + oak-segment ${oak.version} test diff --git vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java index befddd2..a157691 100644 --- vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java +++ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java @@ -59,11 +59,9 @@ import org.apache.jackrabbit.core.security.principal.EveryonePrincipal; import org.apache.jackrabbit.core.security.principal.PrincipalImpl; import org.apache.jackrabbit.oak.jcr.Jcr; import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore; -import org.apache.jackrabbit.oak.segment.SegmentNodeStore; -import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; -import org.apache.jackrabbit.oak.segment.file.FileStore; -import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; -import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; +import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.plugins.segment.file.FileStore; +import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.security.SecurityProviderImpl; import org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName; import org.apache.jackrabbit.oak.spi.blob.BlobStore; @@ -80,6 +78,7 @@ import org.apache.jackrabbit.vault.fs.api.ProgressTrackerListener; import org.apache.jackrabbit.vault.fs.io.FileArchive; import org.apache.jackrabbit.vault.fs.io.ImportOptions; import org.apache.jackrabbit.vault.packaging.JcrPackage; +import org.apache.jackrabbit.vault.packaging.JcrPackageManager; import org.apache.jackrabbit.vault.packaging.PackageException; import org.apache.jackrabbit.vault.packaging.VaultPackage; import org.apache.jackrabbit.vault.packaging.events.impl.PackageEventDispatcherImpl; @@ -153,11 +152,10 @@ public class IntegrationTestBase { if (useFileStore()) { BlobStore blobStore = createBlobStore(); DIR_DATA_STORE.mkdirs(); - fileStore = FileStoreBuilder.fileStoreBuilder(DIR_DATA_STORE) + fileStore = FileStore.builder(DIR_DATA_STORE) .withBlobStore(blobStore) .build(); - - SegmentNodeStore nodeStore = SegmentNodeStoreBuilders.builder(fileStore).build(); + SegmentNodeStore nodeStore = SegmentNodeStore.builder(fileStore).build(); jcr = new Jcr(nodeStore); } else { jcr = new Jcr();