Hi Tomek,
The {{asCloseable}} should also be changed to not take in the
CachingDataStore but either the AbstractSharedCachingDataStore or
S3DataStore instead and subsequently the import for CachingDataStore also
removed.
Thanks
Amit
On Fri, Sep 1, 2017 at 1:00 PM, <[email protected]> wrote:
> Author: tomekr
> Date: Fri Sep 1 07:30:49 2017
> New Revision: 1806894
>
> URL: http://svn.apache.org/viewvc?rev=1806894&view=rev
> Log:
> OAK-6604: Oak Blob Cloud is not used by oak-upgrade
>
> Modified:
> jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
>
> Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-
> upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/
> cli/blob/S3DataStoreFactory.java?rev=1806894&r1=1806893&
> r2=1806894&view=diff
> ============================================================
> ==================
> --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java (original)
> +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java Fri Sep 1
> 07:30:49 2017
> @@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
> import org.apache.commons.io.IOUtils;
> import org.apache.jackrabbit.core.data.CachingDataStore;
> import org.apache.jackrabbit.core.data.DataStoreException;
> -import org.apache.jackrabbit.oak.blob.cloud.aws.s3.S3DataStore;
> +import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
> import org.apache.jackrabbit.oak.plugins.blob.datastore.
> DataStoreBlobStore;
> import org.apache.jackrabbit.oak.spi.blob.BlobStore;
> import org.slf4j.Logger;
>
>
>
