Index: vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java	(revision 1863697)
+++ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java	(date 1564045873000)
@@ -62,9 +62,11 @@
 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.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.security.user.RandomAuthorizableNodeName;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -84,7 +86,6 @@
 import org.apache.jackrabbit.vault.fs.io.ZipArchive;
 import org.apache.jackrabbit.vault.fs.io.ZipStreamArchive;
 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.PackageId;
 import org.apache.jackrabbit.vault.packaging.VaultPackage;
@@ -191,10 +192,10 @@
             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();
Index: vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java	(revision 1863697)
+++ vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFSPackageRegistry.java	(date 1564045873000)
@@ -318,7 +318,7 @@
 
     @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 @@
 
     @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 @@
     }
 
     @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 @@
 
     @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);
Index: vault-core/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- vault-core/pom.xml	(revision 1863697)
+++ vault-core/pom.xml	(date 1564041719000)
@@ -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>
Index: parent/pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- parent/pom.xml	(revision 1863697)
+++ parent/pom.xml	(date 1564046273000)
@@ -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>
@@ -52,7 +52,7 @@
     <!-- S C M  D E F I N I T I O N                                             -->
     <!-- ====================================================================== -->
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/parent</connection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filev9ault/trunk/parent</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk/parent</developerConnection>
         <url>http://svn.apache.org/viewvc/asf/jackrabbit/commons/filevault/trunk/parent</url>
     </scm>
@@ -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>