Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9b94c6f
OAK-11267: imported diffs from https://github.com/seropian/jackrabbit…
reschke Jul 29, 2025
91d53fa
OAK-11267: restore line breaks
reschke Jul 30, 2025
8785c85
OAK-11299: Missing Segments With Oak Run Segment Copy (#1892)
lweitzendorf Jul 29, 2025
ee62c83
Fix a typo in builtin_nodetypes.cnd: @peop -> @prop (#2373)
karollewandowski Jul 29, 2025
388e9d8
OAK-11834 - Cleanups to reduce changeset in OAK-11814 (#2411)
nfsantos Jul 29, 2025
629423a
OAK-11801 : removed Guava's fluent iterable with Apache's (#2408)
rishabhdaim Jul 30, 2025
0497ffd
OAK-11267: use SystemProperty Supplier
reschke Jul 30, 2025
5cc9084
Revert "OAK-11801 : removed Guava's fluent iterable with Apache's (#2…
reschke Jul 30, 2025
1297d4e
Revert "OAK-11834 - Cleanups to reduce changeset in OAK-11814 (#2411)"
reschke Jul 30, 2025
02891d3
Revert "Fix a typo in builtin_nodetypes.cnd: @peop -> @prop (#2373)"
reschke Jul 30, 2025
054d713
Revert "OAK-11299: Missing Segments With Oak Run Segment Copy (#1892)"
reschke Jul 30, 2025
d9ed807
OAK-11267: integrate https://github.com/seropian/jackrabbit-oak/commi…
reschke Sep 15, 2025
e7727d9
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 16, 2025
6ed4cce
Upgrade azure sdk 12 (#2514)
seropian Sep 16, 2025
1e75097
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 17, 2025
9722e17
test
reschke Sep 17, 2025
4671419
Merge pull request #2517 from seropian/upgrade_azure_sdk_12
reschke Sep 17, 2025
41e3f63
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 17, 2025
59d6422
Merge pull request #2518 from seropian/upgrade_azure_sdk_12
reschke Sep 17, 2025
171590b
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 18, 2025
2e57824
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 18, 2025
a31558b
Merge pull request #2520 from seropian/upgrade_azure_sdk_12
reschke Sep 18, 2025
fa42a8a
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 19, 2025
bf9d3c7
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 20, 2025
682a763
Merge pull request #2521 from seropian/upgrade_azure_sdk_12
reschke Sep 20, 2025
cabd191
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 24, 2025
1dc25c5
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 24, 2025
17300fa
Merge pull request #2535 from seropian/upgrade_azure_sdk_12
reschke Sep 24, 2025
984c72a
Merge branch 'OAK-11267' into upgrade_azure_sdk_12
seropian Sep 24, 2025
0f82bb9
Merge pull request #2536 from seropian/upgrade_azure_sdk_12
reschke Sep 25, 2025
a412bc2
OAK-11267: Upgrade Azure SDK V8 to V12 for oak-blob-azure
seropian Sep 29, 2025
be6a998
Merge branch 'OAK-11267' into upgrade_azure_sdk_12
seropian Sep 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions oak-blob-cloud-azure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,15 @@
com.fasterxml.jackson.annotation;resolution:=optional,
com.fasterxml.jackson.databind*;resolution:=optional,
com.fasterxml.jackson.dataformat.xml;resolution:=optional,
com.fasterxml.jackson.dataformat.xml.annotation;resolution:=optional,
com.fasterxml.jackson.datatype*;resolution:=optional,
com.azure.identity.broker.implementation;resolution:=optional,
com.azure.xml;resolution:=optional,
com.azure.storage.common*;resolution:=optional,
com.azure.storage.internal*;resolution:=optional,
com.microsoft.aad.*;resolution:=optional,
com.microsoft.aad.msal4jextensions*;resolution:=optional,
com.microsoft.aad.msal4jextensions.persistence*;resolution:=optional,
com.sun.net.httpserver;resolution:=optional,
sun.misc;resolution:=optional,
net.jcip.annotations;resolution:=optional,
Expand All @@ -68,6 +73,13 @@
azure-core,
azure-identity,
azure-json,
azure-xml,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exporting these could cause problems; see the current tickets about oak-segment-azure.

Copy link
Author

@seropian seropian Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have read the referenced jira discussions about microsoft exports, indeed in the older version of oak-segment-azure there were some microsoft exports, however in this oak-blob-cloud-azure PR there is no such exported package. The references to azure packages are only within the embed section and is not exported in anyway. It lives only inside the module's classloader and it is not influencing other parts of the runtime.

azure-storage-blob,
azure-storage-common,
azure-storage-internal-avro,
com.microsoft.aad,
com.microsoft.aad.msal4jextensions,
com.microsoft.aad.msal4jextensions.persistence,
guava,
jsr305,
reactive-streams,
Expand Down Expand Up @@ -170,6 +182,11 @@
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage</artifactId>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.27.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage;

import org.apache.jackrabbit.core.data.DataIdentifier;
import org.apache.jackrabbit.core.data.DataRecord;
import org.apache.jackrabbit.core.data.DataStoreException;
import org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess.DataRecordDownloadOptions;
import org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess.DataRecordUpload;
import org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess.DataRecordUploadException;
import org.apache.jackrabbit.oak.plugins.blob.datastore.directaccess.DataRecordUploadOptions;
import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend;
import org.jetbrains.annotations.NotNull;

import java.net.URI;
import java.util.Properties;


public abstract class AbstractAzureBlobStoreBackend extends AbstractSharedBackend {

protected abstract DataRecordUpload initiateHttpUpload(long maxUploadSizeInBytes, int maxNumberOfURIs, @NotNull final DataRecordUploadOptions options);
protected abstract DataRecord completeHttpUpload(@NotNull String uploadTokenStr) throws DataRecordUploadException, DataStoreException;
protected abstract void setHttpDownloadURIExpirySeconds(int seconds);
protected abstract void setHttpUploadURIExpirySeconds(int seconds);
protected abstract void setHttpDownloadURICacheSize(int maxSize);
protected abstract URI createHttpDownloadURI(@NotNull DataIdentifier identifier, @NotNull DataRecordDownloadOptions downloadOptions);
public abstract void setProperties(final Properties properties);

}
Loading
Loading