You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2019/07/29 10:11:37 UTC
svn commit: r1863927 - in /jackrabbit/commons/filevault/trunk: parent/
vault-core/
vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/
Author: angela
Date: Mon Jul 29 10:11:37 2019
New Revision: 1863927
URL: http://svn.apache.org/viewvc?rev=1863927&view=rev
Log:
JCRVLT-344 : update version of jackrabbit and oak dependencies
Modified:
jackrabbit/commons/filevault/trunk/parent/pom.xml
jackrabbit/commons/filevault/trunk/vault-core/pom.xml
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java
Modified: jackrabbit/commons/filevault/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/parent/pom.xml?rev=1863927&r1=1863926&r2=1863927&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/parent/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/parent/pom.xml Mon Jul 29 10:11:37 2019
@@ -40,8 +40,8 @@
</description>
<properties>
- <jackrabbit.version>2.16.4</jackrabbit.version>
- <oak.version>1.6.1</oak.version>
+ <jackrabbit.version>2.18.2</jackrabbit.version>
+ <oak.version>1.16.0</oak.version>
<slf4j.version>1.7.6</slf4j.version>
<test.oak>false</test.oak>
<test.vm.options>-Doak=$test.oak}</test.vm.options>
@@ -259,8 +259,8 @@
<!-- jackrabbit -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${jackrabbit.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
+ <version>${oak.version}</version>
</dependency>
<dependency>
Modified: jackrabbit/commons/filevault/trunk/vault-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/pom.xml?rev=1863927&r1=1863926&r2=1863927&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/pom.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/pom.xml Mon Jul 29 10:11:37 2019
@@ -123,7 +123,7 @@
<!-- jackrabbit -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
+ <artifactId>oak-jackrabbit-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -242,7 +242,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-segment</artifactId>
+ <artifactId>oak-segment-tar</artifactId>
<version>${oak.version}</version>
<scope>test</scope>
</dependency>
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1863927&r1=1863926&r2=1863927&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Mon Jul 29 10:11:37 2019
@@ -62,11 +62,13 @@ import org.apache.jackrabbit.core.securi
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.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.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.security.SecurityProviderImpl;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
@@ -191,10 +193,10 @@ public class IntegrationTestBase {
if (useFileStore()) {
BlobStore blobStore = createBlobStore();
DIR_DATA_STORE.mkdirs();
- fileStore = FileStore.builder(DIR_DATA_STORE)
+ fileStore = FileStoreBuilder.fileStoreBuilder(DIR_DATA_STORE)
.withBlobStore(blobStore)
.build();
- SegmentNodeStore nodeStore = SegmentNodeStore.builder(fileStore).build();
+ SegmentNodeStore nodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
jcr = new Jcr(nodeStore);
} else {
jcr = new Jcr();
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java?rev=1863927&r1=1863926&r2=1863927&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java Mon Jul 29 10:11:37 2019
@@ -318,7 +318,7 @@ public class TestFSPackageRegistry exten
@SuppressWarnings("deprecation")
@Test
- public void testInstallExternalUnScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException {
+ public void testInstallExternalUnScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
File file = getTempFile("testpackages/mixed_package.zip");
cleanPaths(APPLICATION_PATHS);
@@ -339,7 +339,7 @@ public class TestFSPackageRegistry exten
@SuppressWarnings("deprecation")
@Test
- public void testInstallExternalContentScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException {
+ public void testInstallExternalContentScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
File file = getTempFile("testpackages/mixed_package.zip");
cleanPaths(APPLICATION_PATHS);
@@ -358,7 +358,7 @@ public class TestFSPackageRegistry exten
}
@SuppressWarnings("deprecation")
- private void cleanPaths(String[] paths) throws IOException, RepositoryException, org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException {
+ private void cleanPaths(String[] paths) throws IOException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
for (String path : paths) {
clean(path);
}
@@ -366,7 +366,7 @@ public class TestFSPackageRegistry exten
@SuppressWarnings("deprecation")
@Test
- public void testInstallExternalApplicationScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException {
+ public void testInstallExternalApplicationScoped() throws IOException, PackageException, RepositoryException, org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException {
File file = getTempFile("testpackages/mixed_package.zip");
cleanPaths(APPLICATION_PATHS);