(jackrabbit-oak) branch trunk updated: OAK-10905 | Add license header to AsyncCheckpointService (#1579)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 7f1243ce24 OAK-10905 | Add license header to AsyncCheckpointService (#1579) 7f1243ce24 is described below commit 7f1243ce24a8da8adc385fde9a78cfc65c7efe1d Author: nit0906 AuthorDate: Fri Jul 12 15:43:50 2024 +0530 OAK-10905 | Add license header to AsyncCheckpointService (#1579) --- .../oak/plugins/index/AsyncCheckpointService.java| 16 1 file changed, 16 insertions(+) diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointService.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointService.java index 4bc3f90bda..460e5fe93f 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointService.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointService.java @@ -1,3 +1,19 @@ +/* + * 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.plugins.index; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
(jackrabbit-oak) branch trunk updated: OAK-10905 | Add a configurable async checkpoint creator service (#1560)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new ca6785716f OAK-10905 | Add a configurable async checkpoint creator
service (#1560)
ca6785716f is described below
commit ca6785716f136b8e082eb4e06fa1c69f1e2026f5
Author: nit0906
AuthorDate: Fri Jul 12 08:31:31 2024 +0530
OAK-10905 | Add a configurable async checkpoint creator service (#1560)
---
.../oak/plugins/index/AsyncCheckpointCreator.java | 143 +
.../oak/plugins/index/AsyncCheckpointService.java | 104 +++
.../jackrabbit/oak/plugins/index/IndexUtils.java | 45 +++
.../plugins/index/AsyncCheckpointCreatorTest.java | 60 +
.../plugins/index/AsyncCheckpointServiceTest.java | 131 +++
.../oak/plugins/index/IndexUtilsTest.java | 99 +-
6 files changed, 579 insertions(+), 3 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointCreator.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointCreator.java
new file mode 100644
index 00..d4a1ab6de8
--- /dev/null
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointCreator.java
@@ -0,0 +1,143 @@
+/*
+ * 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.plugins.index;
+
+
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+
+/**
+ * This class is responsible for creating and deleting checkpoints
asynchronously.
+ * The number of minimum concurrent checkpoints to keep in the system, along
with the default lifetime of a checkpoint
+ * can be configured.
+ * When executed, this class should create one checkpoint in a single run with
a configurable name.
+ * Following the creation of the checkpoint, it should try to delete
checkpoints with the given name,
+ * in case the total number of such checkpoints is greater than the configured
minimum concurrent checkpoints.
+ * By default, this task is registered using AsyncCheckpointService
+ */
+public class AsyncCheckpointCreator implements Runnable {
+
+/**
+ * Name of service property which determines the name of this Async task
+ */
+public static final String PROP_ASYNC_NAME = "oak.checkpoint.async";
+
+private final String name;
+private final long checkpointLifetimeInSeconds;
+private final long minConcurrentCheckpoints;
+private final long maxConcurrentCheckpoints;
+private final NodeStore store;
+public static final String CHECKPOINT_CREATOR_KEY = "creator";
+public static final String CHECKPOINT_CREATED_KEY = "created";
+public static final String CHECKPOINT_CREATED_TIMESTAMP_KEY=
"created-epoch";
+public static final String CHECKPOINT_THREAD_KEY = "thread";
+public static final String CHECKPOINT_NAME_KEY = "name";
+private static final Logger log = LoggerFactory
+.getLogger(AsyncCheckpointCreator.class);
+
+public AsyncCheckpointCreator(@NotNull NodeStore store, @NotNull String
name, long checkpointLifetimeInSeconds, long minConcurrentCheckpoints, long
maxConcurrentCheckpoints) {
+this.store = store;
+this.name = name;
+this.checkpointLifetimeInSeconds = checkpointLifetimeInSeconds;
+this.minConcurrentCheckpoints = minConcurrentCheckpoints;
+// maxConcurrentCheckpoints should at least be 1 more than
minConcurrentCheckpoints
+if (maxConcurrentCheckpoints <= minConcurrentCheckpoints) {
+log.warn("[{}] Max concurrent checkpoints is less than or equal to
min concurrent checkpoints. " +
+"Setting max concurrent checkpoints to min concurrent
checkp
(jackrabbit-oak) branch trunk updated: OAK-10867 | Add service principal support while deleting container in oak-run-commons (#1542)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 65e2ac78fb OAK-10867 | Add service principal support while deleting
container in oak-run-commons (#1542)
65e2ac78fb is described below
commit 65e2ac78fb618915d6783033c61cd724fac54b36
Author: Tushar <145645280+t-r...@users.noreply.github.com>
AuthorDate: Thu Jun 27 13:10:37 2024 +0530
OAK-10867 | Add service principal support while deleting container in
oak-run-commons (#1542)
Contributed by Tushar Rana (https://github.com/t-rana)
---
oak-run-commons/pom.xml| 7 +
.../jackrabbit/oak/fixture/DataStoreUtils.java | 91 ---
.../jackrabbit/oak/fixture/DataStoreUtilsTest.java | 262 +
3 files changed, 331 insertions(+), 29 deletions(-)
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
index fba04900e8..809cb1d57f 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -221,5 +221,12 @@
1.19.0
test
+
+org.apache.jackrabbit
+oak-blob-cloud-azure
+${project.version}
+test-jar
+test
+
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
index faa1fb5077..b58463ed3c 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/DataStoreUtils.java
@@ -18,32 +18,36 @@
*/
package org.apache.jackrabbit.oak.fixture;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.DeleteObjectsRequest;
import com.amazonaws.services.s3.model.ObjectListing;
import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.amazonaws.services.s3.transfer.TransferManager;
-import org.apache.jackrabbit.guava.common.base.Strings;
import com.microsoft.azure.storage.blob.CloudBlobContainer;
-
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.core.data.DataStore;
+import org.apache.jackrabbit.core.data.DataStoreException;
+import org.apache.jackrabbit.guava.common.base.Strings;
+import
org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureBlobContainerProvider;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureConstants;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureDataStore;
import org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants;
import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
import org.apache.jackrabbit.oak.blob.cloud.s3.Utils;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
* Extension to {@link DataStoreUtils} to enable S3 / AzureBlob extensions for
cleaning and initialization.
*/
@@ -59,7 +63,7 @@ public class DataStoreUtils {
public static boolean isAzureDataStore(String dsName) {
return (dsName != null) &&
- (dsName.equals(AZURE.getName()));
+(dsName.equals(AZURE.getName()));
}
public static DataStore configureIfCloudDataStore(String className,
DataStore ds,
@@ -93,8 +97,8 @@ public class DataStoreUtils {
* Clean directory and if S3 bucket/Azure container is configured delete
that.
*
* @param storeDir the local directory
- * @param config the datastore config
- * @param bucket the S3 bucket name / Azure container name
+ * @param config the datastore config
+ * @param bucket the S3 bucket name / Azure container name
* @throws Exception
*/
public static void cleanup(File storeDir, Map config, String
bucket) throws Exception {
@@ -104,7 +108,7 @@ public class DataStoreUtils {
deleteBucket(bucket, config, new Date());
}
} else if (config.containsKey(AzureConstants.AZURE_BLOB_CONTAINER_NAME)
-|| config.containsKey(AzureConstants.AZURE_CONNECTION_STRING)) {
+|| config.containsKey(AzureConstants.AZURE_CONNECTION_STRING))
{
deleteAzureContainer(config, bucket);
}
}
@@ -119,16 +123,16 @@ public class DataStoreUtils {
for (int i
(jackrabbit-oak) branch trunk updated: Oak-10874 | Add jmx function for bringing forward a delayed async lane to a latest checkpoint. (#1522)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new cf51f98e99 Oak-10874 | Add jmx function for bringing forward a delayed
async lane to a latest checkpoint. (#1522)
cf51f98e99 is described below
commit cf51f98e999c82bca2e456c58e58dd77c0903d09
Author: nit0906
AuthorDate: Tue Jun 18 10:29:12 2024 +0530
Oak-10874 | Add jmx function for bringing forward a delayed async lane to a
latest checkpoint. (#1522)
---
.../jackrabbit/oak/api/jmx/IndexStatsMBean.java| 10 +++
.../jackrabbit/oak/api/jmx/package-info.java | 2 +-
.../oak/plugins/index/AsyncIndexUpdate.java| 58 +++-
.../oak/plugins/index/AsyncIndexUpdateTest.java| 77 ++
4 files changed, 145 insertions(+), 2 deletions(-)
diff --git
a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
index 6ef4d8ed7d..10259a6731 100644
---
a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
+++
b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/IndexStatsMBean.java
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.api.jmx;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
@@ -127,6 +128,15 @@ public interface IndexStatsMBean {
*/
String getReferenceCheckpoint();
+@Description("Force update the indexing lane to a checkpoint created
during execution of this function. This will abort and pause the running lane,
release it's lease and set the reference checkpoint to a latest one." +
+"Any content changes between the old reference checkpoint and the
new one will be not be indexed and a reindexing would be required." +
+"Only use this operation if you are sure that the lane is stuck
and not updated since many days and cannot catch up on its own." +
+"Once this operation is completed, reindexing for all indexes on
the lane is required.")
+String forceIndexLaneCatchup(
+@Name("Confirmation Message")
+@Description("Enter 'CONFIRM' to confirm the operation")
+String confirmationMessage) throws CommitFailedException;
+
/**
* Returns the processed checkpoint used by the async indexer. If this
index
* round finishes successfully, the processed checkpoint will become the
diff --git
a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
index acabae990a..43d162d725 100644
--- a/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
+++ b/oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("4.12.0")
+@Version("4.13.0")
package org.apache.jackrabbit.oak.api.jmx;
import org.osgi.annotation.versioning.Version;
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
index 83fb5282ac..f6890e5a7c 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
@@ -117,7 +117,7 @@ public class AsyncIndexUpdate implements Runnable,
Closeable {
*/
static final String ASYNC = ":async";
-private static final long DEFAULT_LIFETIME = TimeUnit.DAYS.toMillis(1000);
+private static final long DEFAULT_LIFETIME = TimeUnit.DAYS.toMillis(100);
private static final CommitFailedException INTERRUPTED = new
CommitFailedException(
"Async", 1, "Indexing stopped forcefully");
@@ -1242,6 +1242,62 @@ public class AsyncIndexUpdate implements Runnable,
Closeable {
return referenceCp;
}
+@Override
+public String forceIndexLaneCatchup(String confirmMessage) throws
CommitFailedException {
+
+if (!"CONFIRM".equals(confirmMessage)) {
+String msg = "Please confirm that you want to force the lane
catch-up by passing 'CONFIRM' as argument";
+log.warn(msg);
+return msg;
+}
+
+if (!this.isFailing()) {
+String msg = "The lane is not failing. This operation should
only be performed if the lane is failing, it should first be allowed to catch
up o
(jackrabbit-oak) branch 1.22 updated: Release Oak 1.22.20 - adjust versions of non-reactor projects
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 9f5e3c7aa9 Release Oak 1.22.20 - adjust versions of non-reactor projects 9f5e3c7aa9 is described below commit 9f5e3c7aa92dc1f589671353776398ad0ccd5318 Author: Nitin Gupta AuthorDate: Mon May 13 15:31:02 2024 +0530 Release Oak 1.22.20 - adjust versions of non-reactor projects --- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-doc-railroad-macro/pom.xml b/oak-doc-railroad-macro/pom.xml index 107011e89f..22db3226cc 100644 --- a/oak-doc-railroad-macro/pom.xml +++ b/oak-doc-railroad-macro/pom.xml @@ -22,7 +22,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.21-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index 1adc11f7f4..e102941f09 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.21-SNAPSHOT ../oak-parent/pom.xml
(jackrabbit-oak) branch 1.22 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 2bf63cd013 [maven-release-plugin] prepare for next development iteration 2bf63cd013 is described below commit 2bf63cd013f6ccfb3a6be8b4a62247955e91f282 Author: Nitin Gupta AuthorDate: Fri May 10 14:16:21 2024 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +++--- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 2 +- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 312a2a0349..b6cd0d3c9e 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index f5cdb77ef0..17c6e95b84 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index b9a1b8554e..e476128b99 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 17103e869d..ec73b8ac53 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 3fedbb4294..10b94f815a 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 40bc0e9a93..e6a6198389 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 333746a4ab..8d96d14786 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.20 +1.22.21-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 09c5deb3fe..6eaba59fbd 100644 --- a/oak-blob
(jackrabbit-oak) annotated tag jackrabbit-oak-1.22.20 created (now 65d9ce4b25)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.22.20 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 65d9ce4b25 (tag) tagging cd7d9cbcc4acdc1e556eb7050e11b8a376aa0efb (commit) replaces jackrabbit-oak-1.22.19 by Nitin Gupta on Fri May 10 14:16:07 2024 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.22.20 --- No new revisions were added by this update.
(jackrabbit-oak) branch 1.22 updated: [maven-release-plugin] prepare release jackrabbit-oak-1.22.20
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new cd7d9cbcc4 [maven-release-plugin] prepare release jackrabbit-oak-1.22.20 cd7d9cbcc4 is described below commit cd7d9cbcc4acdc1e556eb7050e11b8a376aa0efb Author: Nitin Gupta AuthorDate: Fri May 10 14:13:06 2024 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.22.20 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +++--- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 2 +- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 2570fe9a28..312a2a0349 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 6cee38c73b..f5cdb77ef0 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 3353c3ada0..b9a1b8554e 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 734e3a9717..17103e869d 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 7a980b83c9..3fedbb4294 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 330948909d..40bc0e9a93 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 10bd81bdad..333746a4ab 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.20-SNAPSHOT +1.22.20 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 41fd72f6bb..09c5deb3fe 100644 --- a/oak-blob
(jackrabbit-oak) branch 1.22 updated: Set project.build.outputTimestamp to current timestamp for Oak 1.22.20
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 823762d4a0 Set project.build.outputTimestamp to current timestamp for
Oak 1.22.20
823762d4a0 is described below
commit 823762d4a0be2a6b04fc8161b09a477994dda571
Author: Nitin Gupta
AuthorDate: Fri May 10 13:58:29 2024 +0530
Set project.build.outputTimestamp to current timestamp for Oak 1.22.20
---
oak-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index dcbd848fa9..b686ef2ecc 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -36,7 +36,7 @@
-1709307307
+1715329586
3.6.1
${java.version}
-Xmx512m
(jackrabbit-oak) branch 1.22 updated: Candidate release notes for Oak 1.22.20
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 52f75c6b85 Candidate release notes for Oak 1.22.20 52f75c6b85 is described below commit 52f75c6b85b08e049dd9f3687f69b3fa2fcc8620 Author: Nitin Gupta AuthorDate: Fri May 10 08:52:39 2024 +0530 Candidate release notes for Oak 1.22.20 --- RELEASE-NOTES.txt | 57 +-- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ced75a08f9..954f5c6c1a 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,4 @@ -Release Notes -- Apache Jackrabbit Oak -- Version 1.22.19 +Release Notes -- Apache Jackrabbit Oak -- Version 1.22.20 Introduction @@ -7,7 +7,7 @@ Jackrabbit Oak is a scalable, high-performance hierarchical content repository designed for use as the foundation of modern world-class web sites and other demanding content applications. -Jackrabbit Oak 1.22.19 is a patch release that contains fixes and +Jackrabbit Oak 1.22.20 is a patch release that contains fixes and improvements over Oak 1.22. Jackrabbit Oak 1.22.x releases are considered stable and targeted for production use. @@ -15,27 +15,56 @@ The Oak effort is a part of the Apache Jackrabbit project. Apache Jackrabbit is a project of the Apache Software Foundation. -Changes in Oak 1.22.19 +Changes in Oak 1.22.20 -- Technical task -[OAK-10524] - SameNameSiblingTest: add (failing) test for getName() semantics +[OAK-10218] - oak-it-osgi: avoid Guava dependency +[OAK-10623] - oak-core: log a warning when it needs to remap/add a namespace -Bug +New Feature -[OAK-9459] - ConstraintViolationException in VersionManagerImplRestore when target node has a property definition unknown by the frozen node -[OAK-10462] - o.a.j.o.plugins.version.VersionEditor#propertyAdded() may mistakenly assume an ongoing restore operation -[OAK-10680] - tests failures with com.arakelian/docker-junit-rule +[OAK-10056] - Provide support for Jakarta Region for AWS S3 + +Improvement + +[OAK-9481] - avoid range queries on like conditions Task -[OAK-10426] - oak-segment-azure: enable baseline check -[OAK-10439] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.12 -[OAK-10446] - Upgrade jackson-databind dependency to 2.15.2 -[OAK-10537] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.13 -[OAK-10566] - Bump up minimal warning level for deprecated uses of java.security.Group to ERROR -[OAK-10591] - Bump netty dependency from 4.1.96.Final to 4.1.104.Final +[OAK-10300] - update groovy dependency to 2.5.22 +[OAK-10337] - mvn jetty:run fails to start oak-webapp +[OAK-10350] - Update spring-boot dependency to version 2.7.13 +[OAK-10386] - Bump netty dependency from 4.1.52.Final to 4.1.96.Final +[OAK-10397] - oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.23.0 +[OAK-10593] - Upgrade jackson-databind dependency to 2.16.1 +[OAK-10598] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.14 +[OAK-10644] - JsopBuilder: remove JDK6ism +[OAK-10645] - MongoDS docker container: set default Mongo version to 4.4 +[OAK-10664] - Update spotbugs plugin to 4.8.3.1 +[OAK-10665] - Update checkstyle-plugin dependency to version 3.3.1 +[OAK-10667] - Update jacoco plugin to 0.8.11 +[OAK-10668] - examples: update jetty-maven-plugin to 11.0.20 +[OAK-10669] - Upgrade maven-versions-plugin to 2.16.2 +[OAK-10677] - examples: update build-helper-maven-plugin to 3.5.0 +[OAK-10678] - update gmavenplus plugin to 3.0.2 +[OAK-10683] - Update spring-boot dependency to version 2.7.18 +[OAK-10686] - parent: add project.build.outputTimestamp property for Reproducable Builds +[OAK-10687] - Restore and cleanup SCM information +[OAK-10695] - oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.26.1 +[OAK-10696] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.15 +[OAK-10697] - webapp: update Tomcat dependency to 9.0.86 +[OAK-10702] - oak-blob-cloud: update netty dependency to 4.1.107 +[OAK-10707] - update (historic) org.apache.felix.scr.annotations plugin to version 1.12.0 +[OAK-10712] - update groovy dependency to 2.5.23 +[OAK-10713] - oak-lucene: add test coverage for stack overflow based on very long and complex regexp +[OAK-10716] - oak-lucene: update to version 4.7.2 (latest from that branch) +[OAK-10720] - Update commons-io dependency to 2.15.1 +[OAK-10722] - Update commons-codec dependency to 1.16.1 +[OAK-10723] - Update commons-lang3 dependency to 3.14.0 +[OAK-10725] - Upgrade jackson-databind dependency to 2.16.2 +[OAK-10731] - oak-pojosr: remove unused gmongo
(jackrabbit-oak) branch 1.22 updated: OAK-9481: avoid range queries on like conditions (#308)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 3c6196a9a1 OAK-9481: avoid range queries on like conditions (#308)
3c6196a9a1 is described below
commit 3c6196a9a1ff90564d87b8692568318c54042c37
Author: Fabrizio Fortino
AuthorDate: Fri Jul 2 14:28:27 2021 +0200
OAK-9481: avoid range queries on like conditions (#308)
* add unit test around like queries on multi values props
* fix to avoid range queries on like conditions
---
.../jackrabbit/oak/query/ast/ComparisonImpl.java | 10 --
.../plugins/index/lucene/LucenePropertyIndexTest.java | 18 ++
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
index c8c0472e81..59568dc895 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java
@@ -166,17 +166,7 @@ public class ComparisonImpl extends ConstraintImpl {
// but v may contain escaped wildcards, so we can't
use it
PropertyValue pv =
PropertyValues.newString(lowerBound);
operand1.restrict(f, Operator.EQUAL, pv);
-} else if (operand1.supportsRangeConditions()) {
-if (lowerBound != null) {
-PropertyValue pv =
PropertyValues.newString(lowerBound);
-operand1.restrict(f, Operator.GREATER_OR_EQUAL,
pv);
-}
-if (upperBound != null) {
-PropertyValue pv =
PropertyValues.newString(upperBound);
-operand1.restrict(f, Operator.LESS_OR_EQUAL, pv);
-}
} else {
-// path conditions
operand1.restrict(f, operator, v);
}
} else {
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
index fe5cb28212..9ef5f211db 100644
---
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
@@ -658,6 +658,24 @@ public class LucenePropertyIndexTest extends
AbstractQueryTest {
luceneQuery);
}
+@Test
+public void multiValuesLike() throws Exception{
+Tree idx = createIndex("test1", of("references"));
+root.commit();
+
+Tree test = root.getTree("/").addChild("test");
+test.addChild("a").setProperty("references", of("/some/content/AAA",
"/some/content/BBB"), Type.STRINGS);
+test.addChild("b").setProperty("references", of("/some/content/AAA",
"/some/content/CCC"), Type.STRINGS);
+root.commit();
+
+String q = "SELECT * FROM [nt:unstructured] as content WHERE
references LIKE '/some/content/efjoiefjowfgj/%'";
+String explain = explain(q);
+String luceneQuery = explain.substring(0, explain.indexOf('\n'));
+assertEquals("[nt:unstructured] as [content] /*
lucene:test1(/oak:index/test1) " +
+"references:/some/content/efjoiefjowfgj/*",
+luceneQuery);
+}
+
@Test
public void redundantNotNullCheck() throws Exception{
Tree idx = createIndex("test1", of("tags"));
(jackrabbit-oak) branch trunk updated: OAK-10776 | Add support for custom excludes in incremental index store (#1437)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new f0ac80ebd8 OAK-10776 | Add support for custom excludes in incremental
index store (#1437)
f0ac80ebd8 is described below
commit f0ac80ebd85363e36fc71150c334c3665b9d7631
Author: nit0906
AuthorDate: Wed May 8 09:46:37 2024 +0530
OAK-10776 | Add support for custom excludes in incremental index store
(#1437)
* OAK-10776 | Add support for custom excludes while building incremental
index store
-
Co-authored-by: Nitin Gupta
---
.../indexer/document/DocumentStoreIndexerBase.java | 30 ++
.../jackrabbit/oak/index/IncrementalStoreTest.java | 110 +
2 files changed, 123 insertions(+), 17 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
index ecdba7a66a..cb435986b6 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
@@ -24,6 +24,7 @@ import com.mongodb.client.MongoDatabase;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.index.IndexHelper;
import org.apache.jackrabbit.oak.index.IndexerSupport;
@@ -64,6 +65,7 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
@@ -75,11 +77,16 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_SORTED_FILE_PATH;
+import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.DEFAULT_OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDED_PATHS;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.DEFAULT_OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDE_ENTRIES_REGEX;
+import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.DEFAULT_OAK_INDEXER_PIPELINED_MONGO_REGEX_PATH_FILTERING;
+import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDED_PATHS;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDE_ENTRIES_REGEX;
+import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.OAK_INDEXER_PIPELINED_MONGO_REGEX_PATH_FILTERING;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
public abstract class DocumentStoreIndexerBase implements Closeable {
@@ -247,6 +254,29 @@ public abstract class DocumentStoreIndexerBase implements
Closeable {
predicate =
predicate.and(indexerSupport.getFilterPredicateBasedOnCustomRegex(Pattern.compile(customExcludeEntriesRegex),
Function.identity()));
}
+// Handle custom excluded paths if provided. This is only applicable
if regex path filtering is enabled.
+// Any paths whose ancestor is in the custom excluded paths list will
be excluded from incremental index store.
+// This is to keep in line with the custom exclude paths
implementation in the pipelined strategy.
+boolean regexPathFiltering = ConfigHelper.getSystemPropertyAsBoolean(
+OAK_INDEXER_PIPELINED_MONGO_REGEX_PATH_FILTERING,
+DEFAULT_OAK_INDEXER_PIPELINED_MONGO_REGEX_PATH_FILTERING);
+List customExcludedPaths;
+String excludePathsString = ConfigHelper.getSystemPropertyAsString(
+OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDED_PATHS,
+DEFAULT_OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDED_PATHS
+).trim();
+
+if (regexPathFiltering && !excludePathsString.isEmpty()) {
+customExcludedPaths = Arrays.stream(excludePathsStri
(jackrabbit-oak) branch trunk updated: Revert "OAK-6773: Convert oak-store-composite to OSGi R7 annotations (#1423)"
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new ac1a6b2ff5 Revert "OAK-6773: Convert oak-store-composite to OSGi R7
annotations (#1423)"
ac1a6b2ff5 is described below
commit ac1a6b2ff55c54ccc37e33dc8ba807327d064d77
Author: Nitin Gupta
AuthorDate: Tue Apr 30 08:42:29 2024 +0530
Revert "OAK-6773: Convert oak-store-composite to OSGi R7 annotations
(#1423)"
This reverts commit 3efe9f7e84d9d16e01e03e79e7e757315c76e895.
---
oak-store-composite/pom.xml| 9 +--
.../oak/composite/CompositeNodeStoreService.java | 67 ++
.../CrossMountReferenceValidatorProvider.java | 42 +++---
.../composite/PrivateStoreValidatorProvider.java | 29 --
.../checks/NamespacePrefixNodestoreChecker.java| 6 +-
.../composite/checks/NodeStoreChecksService.java | 14 +++--
.../checks/NodeTypeDefinitionNodeStoreChecker.java | 6 +-
.../checks/NodeTypeMountedNodeStoreChecker.java| 47 +++
.../checks/UniqueIndexNodeStoreChecker.java| 6 +-
.../oak/composite/checks/package-info.java | 4 --
.../jackrabbit/oak/composite/package-info.java | 2 +-
.../NodeTypeDefinitionNodeStoreCheckerTest.java| 6 +-
12 files changed, 110 insertions(+), 128 deletions(-)
diff --git a/oak-store-composite/pom.xml b/oak-store-composite/pom.xml
index 96c909700b..b62d5c81eb 100644
--- a/oak-store-composite/pom.xml
+++ b/oak-store-composite/pom.xml
@@ -93,13 +93,8 @@
provided
- org.osgi
- org.osgi.service.component.annotations
- provided
-
-
- org.osgi
- org.osgi.service.metatype.annotations
+ org.apache.felix
+ org.apache.felix.scr.annotations
provided
diff --git
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java
index bbebbb7150..b3fe33f225 100644
---
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java
+++
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java
@@ -17,15 +17,14 @@
package org.apache.jackrabbit.oak.composite;
import org.apache.jackrabbit.guava.common.io.Closer;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.ComponentPropertyType;
-import org.osgi.service.component.annotations.ConfigurationPolicy;
-import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.osgi.service.component.annotations.ReferencePolicy;
-import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
@@ -58,7 +57,7 @@ import java.util.Set;
import static
org.apache.jackrabbit.guava.common.collect.Sets.newIdentityHashSet;
import static java.util.stream.Collectors.toSet;
-@Component(configurationPolicy = ConfigurationPolicy.REQUIRE)
+@Component(policy = ConfigurationPolicy.REQUIRE)
public class CompositeNodeStoreService {
private static final Logger LOG =
LoggerFactory.getLogger(CompositeNodeStoreService.class);
@@ -67,9 +66,10 @@ public class CompositeNodeStoreService {
private static final String MOUNT_ROLE_PREFIX = "composite-mount-";
-@Reference(cardinality = ReferenceCardinality.MANDATORY, policy =
ReferencePolicy.STATIC)
+@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, policy =
ReferencePolicy.STATIC)
private MountInfoProvider mountInfoProvider;
+@Reference(cardinality = ReferenceCardinality.MANDATORY_MULTIPLE, policy =
ReferencePolicy.DYNAMIC, bind = "bindNodeStore", unbind = "unbindNodeStore",
referenceInterface = NodeStoreProvider.class,
target="(!(service.pid=org.apache.jackrabbit.oak.composite.CompositeNodeStore))")
private List nodeStores = new ArrayList<>();
@Reference
@@ -78,26 +78,22 @@ pub
(jackrabbit-oak) branch trunk updated (4fdc15ff80 -> c4222079a9)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 4fdc15ff80 OAK-10773 | Do not open index while getting ft index path for lucene version 1 indexes (#1432) add c4222079a9 OAK-10766 | Make lease time out configurable for individual lanes (#1429) No new revisions were added by this update. Summary of changes: .../oak/plugins/index/AsyncIndexerService.java | 46 ++ .../oak/plugins/index/AsyncIndexerServiceTest.java | 27 +++-- 2 files changed, 53 insertions(+), 20 deletions(-)
(jackrabbit-oak) branch trunk updated (f7f9768ba6 -> 4fdc15ff80)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from f7f9768ba6 OAK-10769: bump es java client to 8.13.2 / lucene 9.10.0 (#1430) add 4fdc15ff80 OAK-10773 | Do not open index while getting ft index path for lucene version 1 indexes (#1432) No new revisions were added by this update. Summary of changes: .../oak/plugins/index/lucene/LuceneIndexLookupUtil.java | 17 + 1 file changed, 5 insertions(+), 12 deletions(-)
(jackrabbit-oak) branch trunk updated: Revert "OAK-10733 | Filter out hidden properties while creating FlatFileStore (#1398)"
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new e220c69ec7 Revert "OAK-10733 | Filter out hidden properties while
creating FlatFileStore (#1398)"
e220c69ec7 is described below
commit e220c69ec73f1cf8012d6f702a8eb1d386a4418e
Author: Nitin Gupta
AuthorDate: Wed Apr 3 21:32:19 2024 +0530
Revert "OAK-10733 | Filter out hidden properties while creating
FlatFileStore (#1398)"
This reverts commit 2b27df56b9901fe107bcad6aed03c402234f590a.
---
.../flatfile/pipelined/NodeDocumentCodec.java | 7 +
.../document/flatfile/pipelined/PipelinedIT.java | 36 +-
2 files changed, 2 insertions(+), 41 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
index a8fe2d1ff2..c5a879327a 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
@@ -81,12 +81,7 @@ public class NodeDocumentCodec implements
Codec {
while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
String fieldName = reader.readName();
Object value = readValue(reader, fieldName);
-// Ignore hidden properties (property name starting with :)
-// Hidden properties are not indexed and also ignored during async
index updates.
-// So it's safe to ignore them while building the FlatFileStore as
well.
-if (!fieldName.isEmpty() && fieldName.charAt(0) != ':') {
-nodeDocument.put(fieldName, value);
-}
+nodeDocument.put(fieldName, value);
}
reader.readEndDocument();
nodeDocument.put(SIZE_FIELD, estimatedSizeOfCurrentObject);
diff --git
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
index cd41b10991..0c1ec406db 100644
---
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
+++
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
@@ -191,26 +191,6 @@ public class PipelinedIT {
), true);
}
-@Test
-public void createFFS_mongoFiltering_hidden_nodes_and_properties() throws
Exception {
-System.setProperty(OAK_INDEXER_PIPELINED_RETRY_ON_CONNECTION_ERRORS,
"false");
-System.setProperty(OAK_INDEXER_PIPELINED_MONGO_REGEX_PATH_FILTERING,
"true");
-
-Predicate pathPredicate = s -> true;
-List pathFilters = List.of(new
PathFilter(List.of("/content/dam/2023", "/content/dam/2024"),
List.of("/content/dam/2023/02")));
-
-testSuccessfulDownload(pathPredicate, pathFilters, List.of(
-"/|{}",
-"/content|{}",
-"/content/dam|{}",
-"/content/dam/2023|{\"p2\":\"v2023\"}",
-"/content/dam/2023/01|{\"p1\":\"v202301\"}",
-"/content/dam/2023/02|{}",
-"/content/dam/2024|{}",
-"/content/dam/2024/02|{\"p2\":\"v20240202\"}"
-), true, true);
-}
-
@Test
public void createFFS_mongoFiltering_include_excludes2() throws Exception {
System.setProperty(OAK_INDEXER_PIPELINED_RETRY_ON_CONNECTION_ERRORS,
"false");
@@ -479,14 +459,9 @@ public class PipelinedIT {
}
private void testSuccessfulDownload(Predicate pathPredicate,
List pathFilters, List expected, boolean ignoreLongPaths)
-throws IOException, CommitFailedException {
-testSuccessfulDownload(pathPredicate, pathFilters, expected,
ignoreLongPaths, false);
-}
-
-private void testSuccessfulDownload(Predicate pathPredicate,
List pathFilters, List expected, boolean ignoreLongPaths,
boolean testHiddenNodesAndProps)
throws CommitFailedException, IOException {
Backend rwStore = createNodeStore(false);
-createContent(rwStore.documentNodeStore, testHiddenNodesAndProps);
+createContent(rwStore.documentNodeStore);
Backend roStore = createNodeStore(true);
@@ -757,10 +732,6 @@ public
(jackrabbit-oak) branch trunk updated: OAK-10733 | Filter out hidden properties while creating FlatFileStore (#1398)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2b27df56b9 OAK-10733 | Filter out hidden properties while creating
FlatFileStore (#1398)
2b27df56b9 is described below
commit 2b27df56b9901fe107bcad6aed03c402234f590a
Author: nit0906
AuthorDate: Wed Apr 3 16:00:14 2024 +0530
OAK-10733 | Filter out hidden properties while creating FlatFileStore
(#1398)
* OAK-10733 | Filter out hidden properties while creating FlatFileStore
Co-authored-by: Nitin Gupta
---
.../flatfile/pipelined/NodeDocumentCodec.java | 7 -
.../document/flatfile/pipelined/PipelinedIT.java | 36 +-
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
index c5a879327a..a8fe2d1ff2 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/NodeDocumentCodec.java
@@ -81,7 +81,12 @@ public class NodeDocumentCodec implements
Codec {
while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
String fieldName = reader.readName();
Object value = readValue(reader, fieldName);
-nodeDocument.put(fieldName, value);
+// Ignore hidden properties (property name starting with :)
+// Hidden properties are not indexed and also ignored during async
index updates.
+// So it's safe to ignore them while building the FlatFileStore as
well.
+if (!fieldName.isEmpty() && fieldName.charAt(0) != ':') {
+nodeDocument.put(fieldName, value);
+}
}
reader.readEndDocument();
nodeDocument.put(SIZE_FIELD, estimatedSizeOfCurrentObject);
diff --git
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
index 0c1ec406db..cd41b10991 100644
---
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
+++
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedIT.java
@@ -191,6 +191,26 @@ public class PipelinedIT {
), true);
}
+@Test
+public void createFFS_mongoFiltering_hidden_nodes_and_properties() throws
Exception {
+System.setProperty(OAK_INDEXER_PIPELINED_RETRY_ON_CONNECTION_ERRORS,
"false");
+System.setProperty(OAK_INDEXER_PIPELINED_MONGO_REGEX_PATH_FILTERING,
"true");
+
+Predicate pathPredicate = s -> true;
+List pathFilters = List.of(new
PathFilter(List.of("/content/dam/2023", "/content/dam/2024"),
List.of("/content/dam/2023/02")));
+
+testSuccessfulDownload(pathPredicate, pathFilters, List.of(
+"/|{}",
+"/content|{}",
+"/content/dam|{}",
+"/content/dam/2023|{\"p2\":\"v2023\"}",
+"/content/dam/2023/01|{\"p1\":\"v202301\"}",
+"/content/dam/2023/02|{}",
+"/content/dam/2024|{}",
+"/content/dam/2024/02|{\"p2\":\"v20240202\"}"
+), true, true);
+}
+
@Test
public void createFFS_mongoFiltering_include_excludes2() throws Exception {
System.setProperty(OAK_INDEXER_PIPELINED_RETRY_ON_CONNECTION_ERRORS,
"false");
@@ -459,9 +479,14 @@ public class PipelinedIT {
}
private void testSuccessfulDownload(Predicate pathPredicate,
List pathFilters, List expected, boolean ignoreLongPaths)
+throws IOException, CommitFailedException {
+testSuccessfulDownload(pathPredicate, pathFilters, expected,
ignoreLongPaths, false);
+}
+
+private void testSuccessfulDownload(Predicate pathPredicate,
List pathFilters, List expected, boolean ignoreLongPaths,
boolean testHiddenNodesAndProps)
throws CommitFailedException, IOException {
Backend rwStore = createNodeStore(false);
-createContent(rwStore.documentNodeStore);
+createContent(rwStore.documentNodeStore, testHiddenNodesAndProps);
Backend roStore = createNodeStore(true);
@@ -732,6 +757,10 @@ public
(jackrabbit-oak) branch trunk updated: OAK-10693 | Add custom filter support for incremental FFS (#1354)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0319de9c87 OAK-10693 | Add custom filter support for incremental FFS
(#1354)
0319de9c87 is described below
commit 0319de9c87acffd21edfd7a4bd8a069fb580c8ba
Author: nit0906
AuthorDate: Mon Mar 11 17:39:49 2024 +0530
OAK-10693 | Add custom filter support for incremental FFS (#1354)
* OAK-10693 | Add custom filter support for incremental FFS
Co-authored-by: Nitin Gupta
---
.../jackrabbit/oak/index/IndexerSupport.java | 16 +-
.../indexer/document/DocumentStoreIndexerBase.java | 14 ++
.../jackrabbit/oak/index/IncrementalStoreTest.java | 255 +
.../IndexStoreBuildIndexDef.json | 16 ++
4 files changed, 251 insertions(+), 50 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
index 51446a9d38..e980f15ca0 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexerSupport.java
@@ -29,7 +29,9 @@ import java.util.function.Function;
import org.apache.commons.io.FileUtils;
import org.apache.felix.inventory.Format;
-import org.apache.jackrabbit.guava.common.base.Predicate;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
@@ -208,7 +210,6 @@ public class IndexerSupport {
}
/**
- *
* @param indexDefinitions
* @return set of preferred path elements referred from the given set of
index definitions.
*/
@@ -221,7 +222,6 @@ public class IndexerSupport {
}
/**
- *
* @param indexDefinitions set of IndexDefinition to be used to calculate
the Path Predicate
* @param typeToRepositoryPath Function to convert type to valid
repository path of type
* @param
@@ -230,4 +230,14 @@ public class IndexerSupport {
public Predicate getFilterPredicate(Set
indexDefinitions, Function typeToRepositoryPath) {
return t -> indexDefinitions.stream().anyMatch(indexDef ->
indexDef.getPathFilter().filter(typeToRepositoryPath.apply(t)) !=
PathFilter.Result.EXCLUDE);
}
+
+/**
+ * @param pattern Pattern for a custom excludes regex based on which paths
would be filtered out
+ * @param typeToRepositoryPath Function to convert type to valid
repository path of type
+ * @param
+ * @return Return a predicate that should test true for all paths that do
not match the provided regex pattern.
+ */
+public Predicate getFilterPredicateBasedOnCustomRegex(Pattern
pattern, Function typeToRepositoryPath) {
+return t -> !pattern.matcher(typeToRepositoryPath.apply(t)).find();
+}
}
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
index 36c6c40b80..ecdba7a66a 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.index.IndexHelper;
import org.apache.jackrabbit.oak.index.IndexerSupport;
import
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder;
import org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileStore;
+import
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.ConfigHelper;
import
org.apache.jackrabbit.oak.index.indexer.document.incrementalstore.IncrementalStoreBuilder;
import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState;
@@ -73,9 +74,12 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.regex.Pattern;
import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_SORTED_FILE_PATH;
+import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.PipelinedMongoDownloadTask.DEFAULT_OAK_INDEXER_PIPELINED_MONGO_CUSTOM_EXCLUDE_ENTRIES_REGEX;
+impo
[jackrabbit-oak] branch trunk updated: OAK-10503 | Handle Exception in case of diff failures while building incremental FFS and handling Add operations during merging of incremental FFS. (#1172)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new e904e45942 OAK-10503 | Handle Exception in case of diff failures while
building incremental FFS and handling Add operations during merging of
incremental FFS. (#1172)
e904e45942 is described below
commit e904e4594274f28fd7499ec1620648893b43d6b0
Author: nit0906
AuthorDate: Fri Oct 20 10:38:36 2023 +0530
OAK-10503 | Handle Exception in case of diff failures while building
incremental FFS and handling Add operations during merging of incremental FFS.
(#1172)
* Don't throw exception in case of Modified operation instead of Add
* Throw exception in case of diff failure while building incremental ffs
-
Co-authored-by: Nitin Gupta
---
.../document/incrementalstore/IncrementalFlatFileStoreStrategy.java | 6 +-
.../document/incrementalstore/MergeIncrementalFlatFileStore.java| 5 -
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java
index fc776d93fa..1718e71f86 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreStrategy.java
@@ -85,7 +85,11 @@ public class IncrementalFlatFileStoreStrategy implements
IncrementalIndexStoreSo
try (BufferedWriter w = FlatFileStoreUtils.createWriter(file,
algorithm)) {
NodeState before =
Objects.requireNonNull(nodeStore.retrieve(beforeCheckpoint));
NodeState after =
Objects.requireNonNull(nodeStore.retrieve(afterCheckpoint));
-EditorDiff.process(VisibleEditor.wrap(new
IncrementalFlatFileStoreEditor(w, entryWriter, pathPredicate, this)), before,
after);
+Exception e = EditorDiff.process(VisibleEditor.wrap(new
IncrementalFlatFileStoreEditor(w, entryWriter, pathPredicate, this)), before,
after);
+if (e != null) {
+log.error("Exception while building incremental store for
checkpoint before {}, after {}", beforeCheckpoint, afterCheckpoint, e);
+throw new RuntimeException(e);
+}
}
String sizeStr = algorithm.equals(Compression.NONE) ? "" :
String.format("compressed/%s actual size", humanReadableByteCount(textSize));
log.info("Dumped {} nodestates in json format in {} ({} {})",
entryCount, sw, humanReadableByteCount(file.length()), sizeStr);
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalFlatFileStore.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalFlatFileStore.java
index 6fde796030..b6cc8ecc6b 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalFlatFileStore.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/MergeIncrementalFlatFileStore.java
@@ -115,7 +115,10 @@ public class MergeIncrementalFlatFileStore implements
MergeIncrementalStore {
baseFFSLine = writeAndAdvance(writer,
baseFFSBufferedReader, baseFFSLine);
} else if (compared > 0) { // write incrementalFFSline and
advance line in incrementalFFS
String[] incrementalFFSParts =
IncrementalFlatFileStoreNodeStateEntryWriter.getParts(incrementalFFSLine);
-
checkState(IncrementalStoreOperand.ADD.toString().equals(getOperand(incrementalFFSParts)));
+if
(!IncrementalStoreOperand.ADD.toString().equals(getOperand(incrementalFFSParts)))
{
+log.warn("Expected operand {} but got {} for
incremental line {}. Merging will proceed as usual, but this needs to be looked
into.",
+IncrementalStoreOperand.ADD,
getOperand(incrementalFFSParts), incrementalFFSLine);
+}
incrementalFFSLine = writeAndAdvance(writer,
incrementalFFSBufferedReader,
getFFSLineFromIncrementalFFSParts(incrementalFFSParts));
} else {
[jackrabbit-oak] branch trunk updated: OAK-10458 - Set LZ4 as the default compression algorithm for the indexing job. (#1136)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new f4343950c1 OAK-10458 - Set LZ4 as the default compression algorithm
for the indexing job. (#1136)
f4343950c1 is described below
commit f4343950c192c421742ae9f2d3b827ee40a3894a
Author: Nuno Santos
AuthorDate: Thu Oct 5 13:14:03 2023 +0100
OAK-10458 - Set LZ4 as the default compression algorithm for the indexing
job. (#1136)
* Set LZ4 as the default compression algorithm for the indexing job.
* Fix tests to not rely on the default value of "oak.indexer.useLZ4"
* Fix tests to not rely on the default value of "oak.indexer.useLZ4"
* Set LZ4 default to true.
* Simplify logic based on review comments.
---
.../flatfile/FlatFileNodeStoreBuilder.java | 13 +--
.../document/flatfile/FlatFileSplitter.java| 15 +++--
.../incrementalstore/IncrementalStoreBuilder.java | 15 +
.../document/indexstore/IndexStoreUtils.java | 26 --
.../flatfile/FlatFileNodeStoreBuilderTest.java | 6 +++--
.../document/flatfile/FlatFileStoreTest.java | 2 +-
.../oak/index/DocumentStoreIndexerIT.java | 13 ++-
7 files changed, 46 insertions(+), 44 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
index 6d1994eef6..9135094c32 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
@@ -56,6 +56,8 @@ import java.util.stream.Collectors;
import static java.util.Collections.unmodifiableSet;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
+import static
org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils.OAK_INDEXER_USE_LZ4;
+import static
org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStoreUtils.OAK_INDEXER_USE_ZIP;
/**
* This class is where the strategy being selected for building FlatFileStore.
@@ -64,8 +66,6 @@ public class FlatFileNodeStoreBuilder {
private static final String FLAT_FILE_STORE_DIR_NAME_PREFIX = "flat-fs-";
-public static final String OAK_INDEXER_USE_ZIP = "oak.indexer.useZip";
-public static final String OAK_INDEXER_USE_LZ4 = "oak.indexer.useLZ4";
/**
* System property name for sort strategy. If this is true, we use {@link
MultithreadedTraverseWithSortStrategy}, else
* {@link StoreAndSortStrategy} strategy is used.
@@ -130,10 +130,7 @@ public class FlatFileNodeStoreBuilder {
private long dumpThreshold =
Integer.getInteger(OAK_INDEXER_DUMP_THRESHOLD_IN_MB,
OAK_INDEXER_DUMP_THRESHOLD_IN_MB_DEFAULT) * FileUtils.ONE_MB;
private Predicate pathPredicate = path -> true;
-private final boolean compressionEnabled =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_USE_ZIP, "true"));
-private final boolean useLZ4 =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_USE_LZ4, "false"));
-private final Compression algorithm = compressionEnabled ? (useLZ4 ? new
LZ4Compression() : Compression.GZIP) :
-Compression.NONE;
+private final Compression algorithm =
IndexStoreUtils.compressionAlgorithm();
private final boolean useTraverseWithSort =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_TRAVERSE_WITH_SORT,
"true"));
private final String sortStrategyTypeString =
System.getProperty(OAK_INDEXER_SORT_STRATEGY_TYPE);
private final SortStrategyType sortStrategyType = sortStrategyTypeString
!= null ? SortStrategyType.valueOf(sortStrategyTypeString) :
@@ -382,8 +379,8 @@ public class FlatFileNodeStoreBuilder {
private void logFlags() {
log.info("Preferred path elements are {}",
Iterables.toString(preferredPathElements));
-log.info("Compression enabled while sorting : {} ({})",
compressionEnabled, OAK_INDEXER_USE_ZIP);
-log.info("LZ4 enabled for compression algorithm : {} ({})", useLZ4,
OAK_INDEXER_USE_LZ4);
+log.info("Compression enabled while sorting : {} ({})",
IndexStoreUtils.compressionEnabled(), OAK_INDEXER_USE_ZIP);
+log.info("LZ4 enabled for compression algorithm : {} ({})",
IndexStoreUtils.useLZ4(), OAK_INDEXER_USE_LZ4);
log.info("Sort strategy : {} ({})", sortStrategyType,
OAK_INDEXER_TRAVERSE_WITH_SORT);
}
diff --git
a/oak-
[jackrabbit-oak] branch trunk updated: Set LZ4 as the default compression algorithm for the indexing job. (#1133)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new ad64ecbcfb Set LZ4 as the default compression algorithm for the
indexing job. (#1133)
ad64ecbcfb is described below
commit ad64ecbcfbe4f78354dfe6aaa93148e237034868
Author: Nuno Santos
AuthorDate: Fri Sep 29 09:36:00 2023 +0100
Set LZ4 as the default compression algorithm for the indexing job. (#1133)
---
.../oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
index 6a45e2e0d0..7754bb5dcb 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
@@ -130,7 +130,7 @@ public class FlatFileNodeStoreBuilder {
private Predicate pathPredicate = path -> true;
private final boolean compressionEnabled =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_USE_ZIP, "true"));
-private final boolean useLZ4 =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_USE_LZ4, "false"));
+private final boolean useLZ4 =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_USE_LZ4, "true"));
private final Compression algorithm = compressionEnabled ? (useLZ4 ? new
LZ4Compression() : Compression.GZIP) :
Compression.NONE;
private final boolean useTraverseWithSort =
Boolean.parseBoolean(System.getProperty(OAK_INDEXER_TRAVERSE_WITH_SORT,
"true"));
[jackrabbit-oak] branch trunk updated: OAK-10442 | Fixing docs to reflect aggregation does not support node type inheritence. (#1118)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 33dbf0b8b9 OAK-10442 | Fixing docs to reflect aggregation does not support node type inheritence. (#1118) 33dbf0b8b9 is described below commit 33dbf0b8b9b6fd702cf3b0b1ca1bae32c6c6f2f7 Author: nit0906 AuthorDate: Fri Sep 15 15:10:41 2023 +0530 OAK-10442 | Fixing docs to reflect aggregation does not support node type inheritence. (#1118) Co-authored-by: Nitin Gupta --- oak-doc/src/site/markdown/query/lucene.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oak-doc/src/site/markdown/query/lucene.md b/oak-doc/src/site/markdown/query/lucene.md index 8e8e52a2ab..3e39c719c4 100644 --- a/oak-doc/src/site/markdown/query/lucene.md +++ b/oak-doc/src/site/markdown/query/lucene.md @@ -660,6 +660,8 @@ Oak allows you to define index aggregates based on relative path patterns and primary node types. Changes to aggregated items cause the main item to be reindexed, even if it was not modified. +Please note that aggregation does not support nodeType inheritance. To support aggregation on child nodeTypes, they need to be explicitly defined as a separate aggregation configuration in the index definition. + Aggregation configuration is defined under the `aggregates` node under index configuration. The following example creates an index aggregate on nt:file that includes the content of the jcr:content node:
[jackrabbit-oak] branch trunk updated: OAK-10433 | Throttle warn logs for multivalued ordered property (#1108)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 70c4eb84c5 OAK-10433 | Throttle warn logs for multivalued ordered
property (#1108)
70c4eb84c5 is described below
commit 70c4eb84c5d6202f4b7686b9a93d50b041df1f33
Author: nit0906
AuthorDate: Fri Sep 8 20:29:17 2023 +0530
OAK-10433 | Throttle warn logs for multivalued ordered property (#1108)
---
.../search/spi/editor/FulltextDocumentMaker.java | 33 +++---
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git
a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
index 92a82927ab..f26ecee728 100644
---
a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
+++
b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
@@ -21,8 +21,12 @@ package
org.apache.jackrabbit.oak.plugins.index.search.spi.editor;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
import javax.jcr.PropertyType;
@@ -60,6 +64,15 @@ public abstract class FulltextDocumentMaker implements
DocumentMaker {
public static final String WARN_LOG_STRING_SIZE_THRESHOLD_KEY =
"oak.repository.property.index.logWarnStringSizeThreshold";
private static final int DEFAULT_WARN_LOG_STRING_SIZE_THRESHOLD_VALUE =
102400;
+private static final String THROTTLE_WARN_LOGS_KEY =
"oak.repository.property.throttle.warn.logs";
+private static final String THROTTLE_WARN_LOGS_THRESHOLD_KEY =
"oak.repository.throttle.warn.logs.threshold";
+private static final int DEFAULT_THROTTLE_WARN_LOGS_THRESHOLD_VALUE = 1000;
+
+// Counter for multi valued ordered property warnings.
+// Each path with a multi valued ordered property adds to the counter for
every valid index that indexes this property.
+private static final AtomicInteger WARN_LOG_COUNTER_MV_ORDERED_PROPERTY =
new AtomicInteger();
+private static final Set MV_ORDERED_PROPERTY_SET =
ConcurrentHashMap.newKeySet();
+
private static final String DYNAMIC_BOOST_TAG_NAME = "name";
private static final String DYNAMIC_BOOST_TAG_CONFIDENCE = "confidence";
@@ -68,6 +81,9 @@ public abstract class FulltextDocumentMaker implements
DocumentMaker {
protected final IndexDefinition.IndexingRule indexingRule;
protected final String path;
private final int logWarnStringSizeThreshold;
+protected static final int throttleWarnLogThreshold =
Integer.getInteger(THROTTLE_WARN_LOGS_THRESHOLD_KEY,
+DEFAULT_THROTTLE_WARN_LOGS_THRESHOLD_VALUE);
+protected static final boolean throttleWarnLogs =
Boolean.getBoolean(THROTTLE_WARN_LOGS_KEY);
public FulltextDocumentMaker(@Nullable FulltextBinaryTextExtractor
textExtractor,
@NotNull IndexDefinition definition,
@@ -362,10 +378,19 @@ public abstract class FulltextDocumentMaker implements
DocumentMaker {
PropertyDefinition pd) {
// Ignore and warn if property multi-valued as not supported
if (property.getType().isArray()) {
-log.warn(
-"[{}] Ignoring ordered property {} of type {} for path {}
as multivalued ordered property not supported",
-getIndexName(), pname,
-Type.fromTag(property.getType().tag(), true), path);
+// Log all the warnings if throttleWarnings is not enabled.
+// Log the warning for the first occurrence of every unique
property
+// Log the warning for every (default to 1000 but configurable)
1000 occurrence thereafter
+// We could miss certain paths being logged here since the
DocumentMaker is created for each node state for each index.
+// But ideally a warning with the property in question should
suffice.
+// Also there is no handling for different indexes having the same
property since those are usually different versions of the same index.
+if (!throttleWarnLogs || MV_ORDERED_PROPERTY_SET.add(pname) ||
+WARN_LOG_COUNTER_MV_ORDERED_PROPERTY.incrementAndGet() %
throttleWarnLogThreshold == 0) {
+log.warn(
+"[{}] Ignoring ordered property {} of t
[jackrabbit-oak] branch trunk updated: OAK-10265 | Refresh the index def after lane revert in oak-run out of… (#958)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 846fcb4e89 OAK-10265 | Refresh the index def after lane revert in
oak-run out of… (#958)
846fcb4e89 is described below
commit 846fcb4e89055504cb5b340462b1a961bfb0019d
Author: nit0906
AuthorDate: Thu Jun 1 16:08:18 2023 +0530
OAK-10265 | Refresh the index def after lane revert in oak-run out of…
(#958)
* OAK-10265 | Refresh the index def after lane revert in oak-run out of the
band reindex import
* OAK-10265 | Added test assertions
-
Co-authored-by: Nitin Gupta
---
.../jackrabbit/oak/plugins/index/IndexConstants.java| 5 +
.../oak/plugins/index/importer/AsyncLaneSwitcher.java | 2 ++
.../java/org/apache/jackrabbit/oak/index/ReindexIT.java | 17 +++--
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
index 58b99d808d..fe8abdb820 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
@@ -36,6 +36,11 @@ public interface IndexConstants {
String REINDEX_PROPERTY_NAME = "reindex";
+/**
+ * Boolean property which signals to refresh the stored index definition
+ */
+String REFRESH_PROPERTY_NAME = "refresh";
+
String REINDEX_COUNT = "reindexCount";
String REINDEX_ASYNC_PROPERTY_NAME = "reindex-async";
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
index cb3c2fcb7b..8dde3c3d9e 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
@@ -95,6 +95,8 @@ public class AsyncLaneSwitcher {
idxBuilder.setProperty(clone(IndexConstants.ASYNC_PROPERTY_NAME,
previousAsync));
}
idxBuilder.removeProperty(ASYNC_PREVIOUS);
+// Set the refresh flag to true here otherwise the lane changes won't
reflect in the storedIndexDefinition.
+idxBuilder.setProperty(IndexConstants.REFRESH_PROPERTY_NAME, true);
}
public static boolean isNone(PropertyState previousAsync) {
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
index 0e7456ab13..fea417e70b 100644
--- a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
+++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.json.JsopDiff;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexPathService;
import org.apache.jackrabbit.oak.plugins.index.IndexPathServiceImpl;
@@ -184,7 +185,6 @@ public class ReindexIT extends
LuceneAbstractIndexCommandTest {
String explain = getQueryPlan(fixture2, "select * from [nt:base] where
[bar] is not null");
assertThat(explain, containsString("traverse"));
assertThat(explain, not(containsString(TEST_INDEX_PATH)));
-
int foo2Count = getFooCount(fixture2, "foo");
assertEquals(fooCount + 100, foo2Count);
assertNotNull(fixture2.getNodeStore().retrieve(checkpoint));
@@ -213,7 +213,6 @@ public class ReindexIT extends
LuceneAbstractIndexCommandTest {
IndexRepositoryFixture fixture4 = new
LuceneRepositoryFixture(storeDir);
int foo4Count = getFooCount(fixture4, "foo");
-
//new count should be same as previous
assertEquals(foo2Count, foo4Count);
@@ -227,6 +226,20 @@ public class ReindexIT extends
LuceneAbstractIndexCommandTest {
//Updates to the index definition should have got picked up
String explain4 = getQueryPlan(fixture4, "select * from [nt:base]
where [bar] is not null");
assertThat(explain4, containsString(TEST_INDEX_PATH));
+
+// Run the async index update
+// This is needed for the refresh of the stored index def to take
place.
+fixture4.getAsyncIndexUpdate("async").run();
+
+// check if the stored inde
[jackrabbit-oak] branch OAK-10261 updated (34865a30c2 -> c197495d79)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to branch OAK-10261 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 34865a30c2 OAK-10261 Query with OR clause with COALESCE function incorrectly interpreted add c197495d79 Add IT for coalesce function usage without index No new revisions were added by this update. Summary of changes: .../oak/plugins/index/FunctionIndexCommonTest.java | 94 ++ 1 file changed, 94 insertions(+)
[jackrabbit-oak] branch trunk updated: OAK-10150 | Add a test for index purge command where the latest OOB index is disabled and the queries are served by a lower versioned index (#875)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0720de7083 OAK-10150 | Add a test for index purge command where the
latest OOB index is disabled and the queries are served by a lower versioned
index (#875)
0720de7083 is described below
commit 0720de7083d6c5ba40a7912af8f4da900410e133
Author: nit0906
AuthorDate: Wed Mar 22 08:11:35 2023 +0530
OAK-10150 | Add a test for index purge command where the latest OOB index
is disabled and the queries are served by a lower versioned index (#875)
Co-authored-by: Nitin Gupta
---
.../LucenePurgeOldIndexVersionTest.java| 61 ++
1 file changed, 61 insertions(+)
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java
index bcba1d7833..8bfca47635 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersionTest.java
@@ -176,6 +176,67 @@ public class LucenePurgeOldIndexVersionTest extends
LuceneAbstractIndexCommandTe
}
}
+// Test the scenario where the latest index is an OOB index but is
disabled, and a lower versioned custom index is actually the only active index
serving queries.
+// Verify that the lower versioned index that is being used for queries
should not get purged.
+@Test
+public void noDeleteIfLatestOOBIndexIsDisabled() throws Exception {
+LogCustomizer custom =
LogCustomizer.forLogger("org.apache.jackrabbit.oak.indexversion.IndexVersionOperation")
+.enable(Level.INFO)
+.create();
+try {
+custom.starting();
+createTestData(false);
+createCustomIndex(TEST_INDEX_PATH, 2, 1, false);
+createCustomIndex(TEST_INDEX_PATH, 3, 0, false);
+createCustomIndex(TEST_INDEX_PATH, 3, 1, false);
+createCustomIndex(TEST_INDEX_PATH, 3, 2, false);
+createCustomIndex(TEST_INDEX_PATH, 3, 3, false);
+createCustomIndex(TEST_INDEX_PATH, 4, 0, false);
+
+NodeStore store = fixture.getNodeStore();
+NodeBuilder rootBuilder = store.getRoot().builder();
+rootBuilder.getChildNode("oak:index")
+.getChildNode("fooIndex-4")
+.setProperty("type", "disabled");
+rootBuilder.getChildNode("oak:index")
+.getChildNode("fooIndex-3-custom-3")
+.setProperty("type", "disabled")
+.setProperty(":originalType", "lucene");
+store.merge(rootBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+addMockHiddenOakMount(fixture.getNodeStore(),
Arrays.asList("fooIndex-3-custom-1", "fooIndex-3-custom-2"));
+
+// At this point of time - we have /oak:index/fooIndex-4 and
/oak:index/fooIndex-3-custom-3 which are disabled
+// /oak:index/fooIndex-3-custom-2 and
/oak:index/fooIndex-3-custom-1 which are active (hidden mount exists)
+// Indexes of lower versions are all inactive (not disabled but no
hidden oak-mount-exists)
+
+runIndexPurgeCommand(true, 1, "");
+
+List logs = custom.getLogs();
+// This log verification shows that /oak:index/fooIndex-4 gets
filtered at the very first stage (before the list is sent to
IndexVersionOperation)
+// This is because it is disabled and does not have :originalType
property - so it was disabled manually and not by auto purge command - hence
it's simply ignored.
+assertThat(logs.toString(), containsString("Reverse Sorted list
[/oak:index/fooIndex-3-custom-3"));
+
+// This log verifies that /oak:index/fooIndex-3-custom-3 (which is
disabled and has :originalType property) is moved to disabled list to be
handled accordingly
+assertThat(logs.toString(), containsString("Disabled index list
[/oak:index/fooIndex-3-custom-3"));
+
+// This verifies that the index that is considered for isActive
check and further verifications is /oak:index/fooIndex-3-custom-2
+assertThat(logs.toString(), containsString("new reverse sorted
list after removing disabled indexes[/oak:index/fooIndex-3-custom-2"));
+
+NodeState indexRootNode =
fixture.getNodeStore().getRoot().getChildNode("oak:index");
+
Assert.assertFalse(indexRootNode.getChildNode("fooIndex-2-cus
[jackrabbit-oak] branch trunk updated: OAK-10140: Release Oak 1.50.0 - Update Candidate Release Notes
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 9bd753e603 OAK-10140: Release Oak 1.50.0 - Update Candidate Release Notes 9bd753e603 is described below commit 9bd753e603572878a994c78113f7317a4c97b835 Author: Nitin Gupta AuthorDate: Mon Mar 13 17:39:09 2023 +0530 OAK-10140: Release Oak 1.50.0 - Update Candidate Release Notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 649ac42bec..9d849f026e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -61,6 +61,7 @@ Improvement Task [OAK-10086] - oak-core: bump up logging for deprecated Guava based APIs to ERROR +[OAK-10098] - Oak Run - PurgeOldIndexVersion - Add support to auto purge ES indexes and delete remote ES indexes as well [OAK-10101] - Improve exception message when retrieving String properties [OAK-10103] - oak-store-document: remove deprecated SystemPropertySupplier [OAK-10104] - Extend version consistency check
[jackrabbit-oak] branch trunk updated (431c8dcaa3 -> 6ba37c2dee)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 431c8dcaa3 Oak-10137 | Fix static variable waitForESAcknowledgement
being accessed from non static context (#870)
add 6ba37c2dee OAK-10098 | Support Index purge for ES indexes (#847)
No new revisions were added by this update.
Summary of changes:
.../oak/plugins/index/IndexConstants.java | 5 +
.../plugins/index}/property/RecursiveDelete.java | 2 +-
.../lucene/property/PropertyIndexCleaner.java | 1 +
.../lucene/IndexlaneRepositoryTraversalTest.java | 3 +-
.../index/lucene/property/RecursiveDeleteTest.java | 3 +-
.../oak/indexversion/IndexVersionOperation.java| 67 +++--
.../oak/indexversion/PurgeOldIndexVersion.java | 86 +-
.../oak/indexversion/PurgeOldVersionUtils.java | 2 +-
.../oak/run/PurgeOldIndexVersionCommand.java | 45 +--
.../oak/index/AbstractIndexTestCommand.java| 57 ++--
.../oak/index/IndexRepositoryFixture.java | 41 +--
oak-run-elastic/pom.xml| 27 ++
.../index/ElasticPurgeOldIndexVersionCommand.java | 56
.../indexversion/ElasticIndexVersionOperation.java | 50
.../indexversion/ElasticPurgeOldIndexVersion.java | 110
.../jackrabbit/oak/run/AvailableElasticModes.java | 2 +
.../oak/index/ElasticAbstractIndexCommandTest.java | 84 ++
.../oak/index/ElasticRepositoryFixture.java| 50
.../ElasticPurgeOldIndexVersionTest.java | 307 +++--
.../src/test/resources/logback-test.xml| 0
oak-run/pom.xml| 7 +
.../indexversion/LuceneIndexVersionOperation.java | 64 +
.../indexversion/LucenePurgeOldIndexVersion.java | 33 +--
.../apache/jackrabbit/oak/run/AvailableModes.java | 2 +-
.../oak/run/LucenePurgeOldIndexVersionCommand.java | 11 +-
.../oak/index/DocumentStoreIndexerIT.java | 12 +-
.../oak/index/LuceneAbstractIndexCommandTest.java | 57
...dexCommandIT.java => LuceneIndexCommandIT.java} | 11 +-
.../oak/index/LuceneRepositoryFixture.java | 52 ++--
.../org/apache/jackrabbit/oak/index/ReindexIT.java | 18 +-
...st.java => LucenePurgeOldIndexVersionTest.java} | 59 +++-
.../oak/indexversion/PurgeOldIndexVersionIT.java | 4 +-
32 files changed, 960 insertions(+), 368 deletions(-)
rename
{oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene =>
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index}/property/RecursiveDelete.java
(98%)
rename {oak-run =>
oak-run-commons}/src/main/java/org/apache/jackrabbit/oak/indexversion/IndexVersionOperation.java
(82%)
rename {oak-run =>
oak-run-commons}/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersion.java
(70%)
rename {oak-run =>
oak-run-commons}/src/main/java/org/apache/jackrabbit/oak/indexversion/PurgeOldVersionUtils.java
(98%)
rename {oak-run =>
oak-run-commons}/src/main/java/org/apache/jackrabbit/oak/run/PurgeOldIndexVersionCommand.java
(67%)
rename
oak-run/src/test/java/org/apache/jackrabbit/oak/index/AbstractIndexCommandTest.java
=>
oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/AbstractIndexTestCommand.java
(67%)
rename
oak-run/src/test/java/org/apache/jackrabbit/oak/index/RepositoryFixture.java =>
oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/IndexRepositoryFixture.java
(83%)
create mode 100644
oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticPurgeOldIndexVersionCommand.java
create mode 100644
oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/indexversion/ElasticIndexVersionOperation.java
create mode 100644
oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersion.java
create mode 100644
oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/index/ElasticAbstractIndexCommandTest.java
create mode 100644
oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/index/ElasticRepositoryFixture.java
copy
oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java
=>
oak-run-elastic/src/test/java/org/apache/jackrabbit/oak/indexversion/ElasticPurgeOldIndexVersionTest.java
(70%)
copy {oak-core => oak-run-elastic}/src/test/resources/logback-test.xml (100%)
create mode 100644
oak-run/src/main/java/org/apache/jackrabbit/oak/indexversion/LuceneIndexVersionOperation.java
copy
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexDefinitionBuilder.java
=>
oak-run/src/main/java/org/apache/jackrabbit/oak/indexversion/LucenePurgeOldIndexVersion.java
(58%)
copy
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/run/ScalabilityCommand.java
=>
oak-run/src/main/java/org/apache/jackrabbit/oak/run/Luce
[jackrabbit-oak] branch trunk updated (b578e486c2 -> 431c8dcaa3)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from b578e486c2 OAK-10135 : JackrabbitAccessControlManager.getEffectivePolicies(Set principals) should include ReadPolicy (#869) add 431c8dcaa3 Oak-10137 | Fix static variable waitForESAcknowledgement being accessed from non static context (#870) No new revisions were added by this update. Summary of changes: .../elastic/index/ElasticBulkProcessorHandler.java | 29 +- .../index/elastic/index/ElasticIndexWriter.java| 19 +- .../index/ElasticBulkProcessorHandlerTest.java | 8 +++--- 3 files changed, 34 insertions(+), 22 deletions(-)
[jackrabbit-oak] branch trunk updated: OAK-10095 | Fix NPE in FieldFactory.dateToLong (#838)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5671cdce1d OAK-10095 | Fix NPE in FieldFactory.dateToLong (#838)
5671cdce1d is described below
commit 5671cdce1d1f9dce48546ef27818153f89d2e9bd
Author: nit0906
AuthorDate: Wed Feb 1 07:55:56 2023 +0530
OAK-10095 | Fix NPE in FieldFactory.dateToLong (#838)
* OAK-10095 | Fix NPE in FieldFactory.dateToLong
---
.../jackrabbit/oak/plugins/index/lucene/FieldFactory.java | 13 -
.../oak/plugins/index/lucene/LuceneIndexEditorTest.java | 10 ++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java
index ea15d56329..a1d973f36d 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.Collection;
import com.google.common.primitives.Ints;
@@ -186,7 +187,17 @@ public final class FieldFactory {
return null;
}
//TODO OAK-2204 - Should we change the precision to lower resolution
-return ISO8601.parse(date).getTimeInMillis();
+Calendar c = ISO8601.parse(date);
+if (c != null) {
+return c.getTimeInMillis();
+} else {
+// ISO8601.parse returns null in case of multiple exceptions like
IllegalFormatException, IndexOutOfBoundsException, NumberFormatException etc
+// However returning null for us would basically store a null
value in the document (which seems wrong).
+// So throwing an unchecked exception here with a proper
description.
+// Earlier such a situation was leading to an NPE which was
confusing to understand.
+// Refer
https://jackrabbit.apache.org/api/2.20/index.html?org/apache/jackrabbit/util/ISO8601.html
+throw new RuntimeException("Unable to parse the provided date
field : " + date + " to convert to millis. Supported format is
±-MM-DDThh:mm:ss.SSSTZD");
+}
}
}
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
index 69c0a6f8db..9a5d503167 100644
---
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
@@ -233,6 +233,16 @@ public class LuceneIndexEditorTest {
//Date
assertEquals("/test",
getPath(NumericRangeQuery.newLongRange("creationTime",
dateToTime("05/05/2014"), dateToTime("05/07/2014"), true,
true)));
+
+// Call FieldFactory.dateToLong with an unsupported Date format - this
should throw a RuntimeException
+try {
+getPath(NumericRangeQuery.newLongRange("creationTime",
+FieldFactory.dateToLong("05/05/2014"),
FieldFactory.dateToLong("05/07/2014"), true, true));
+} catch (RuntimeException e) {
+assertEquals("Unable to parse the provided date field : 05/05/2014
to convert to millis." +
+" Supported format is ±-MM-DDThh:mm:ss.SSSTZD",
e.getMessage());
+}
+
}
@Test
[jackrabbit-oak] branch trunk updated: OAK-10001 | Update node config in jenkins file to jdk 11 (#839)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new e156ced2c1 OAK-10001 | Update node config in jenkins file to jdk 11
(#839)
e156ced2c1 is described below
commit e156ced2c178b81ff0da98672029d76f2e252cad
Author: nit0906
AuthorDate: Tue Jan 31 14:37:47 2023 +0530
OAK-10001 | Update node config in jenkins file to jdk 11 (#839)
Co-authored-by: Nitin Gupta
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3aeb93e43c..d89d6003af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ def buildModule(moduleSpec) {
}
stage(moduleSpec) {
node(label: 'ubuntu') {
-def JAVA_JDK_8=tool name: 'jdk_1.8_latest', type:
'hudson.model.JDK'
+def JAVA_JDK_11=tool name: 'jdk_11_latest', type:
'hudson.model.JDK'
def MAVEN_3_LATEST=tool name: 'maven_3_latest', type:
'hudson.tasks.Maven$MavenInstallation'
def MAVEN_CMD = "mvn --batch-mode
-Dmaven.repo.local=${env.HOME}/maven-repositories/${env.EXECUTOR_NUMBER}"
def MONGODB_SUFFIX = sh(script: 'openssl rand -hex 4',
returnStdout: true).trim()
@@ -56,7 +56,7 @@ def buildModule(moduleSpec) {
'''
timeout(70) {
checkout scm
-
withEnv(["Path+JDK=$JAVA_JDK_8/bin","Path+MAVEN=$MAVEN_3_LATEST/bin","JAVA_HOME=$JAVA_JDK_8","MAVEN_OPTS=-Xmx1536M"])
{
+
withEnv(["Path+JDK=$JAVA_JDK_11/bin","Path+MAVEN=$MAVEN_3_LATEST/bin","JAVA_HOME=$JAVA_JDK_11","MAVEN_OPTS=-Xmx1536M"])
{
sh '''
echo "MAVEN_OPTS is ${MAVEN_OPTS}"
'''
[jackrabbit-oak] branch trunk updated: OAK-10063 | Fixing log message to print the complete log (#817)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new bebc0d401a OAK-10063 | Fixing log message to print the complete log
(#817)
bebc0d401a is described below
commit bebc0d401aae02b113eb9cf8116c7c9aae2a2c12
Author: nit0906
AuthorDate: Thu Jan 12 13:53:52 2023 +0530
OAK-10063 | Fixing log message to print the complete log (#817)
Co-authored-by: Nitin Gupta
---
.../org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
index 1ab8e4118f..281812fc5d 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
@@ -1096,7 +1096,7 @@ public class AsyncIndexUpdate implements Runnable,
Closeable {
failingSince = latestErrorTime;
latestErrorWarn = System.currentTimeMillis();
if (isConcurrentUpdateException) {
-log.info("[{}]", name, e.getMessage());
+log.info("[{}] The index update failed : {}", name,
e.getMessage());
} else {
log.warn("[{}] The index update failed", name, e);
}
@@ -1106,7 +1106,7 @@ public class AsyncIndexUpdate implements Runnable,
Closeable {
if (warn) {
latestErrorWarn = System.currentTimeMillis();
if (isConcurrentUpdateException) {
-log.info("[{}]", name, e.getMessage());
+log.info("[{}] The index update is still failing :
{}", name, e.getMessage());
} else {
log.warn("[{}] The index update is still failing",
name, e);
}
[jackrabbit-oak] branch trunk updated: moving oak-doc and oak-doc-railroad-macro to latest dev versions
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 1492e153a4 moving oak-doc and oak-doc-railroad-macro to latest dev versions 1492e153a4 is described below commit 1492e153a4e8eded60052ddff4e05a4047f11a19 Author: Nitin Gupta AuthorDate: Wed Dec 21 09:23:49 2022 +0530 moving oak-doc and oak-doc-railroad-macro to latest dev versions --- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-doc-railroad-macro/pom.xml b/oak-doc-railroad-macro/pom.xml index 8d2ab5c922..57727a46a5 100644 --- a/oak-doc-railroad-macro/pom.xml +++ b/oak-doc-railroad-macro/pom.xml @@ -22,7 +22,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index 1b2920639b..9fb9941f6d 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.47-SNAPSHOT ../oak-parent/pom.xml
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new b47503be15 [maven-release-plugin] prepare for next development iteration b47503be15 is described below commit b47503be159ecdd6f34938967ee7863cd5a39ab0 Author: Nitin Gupta AuthorDate: Fri Dec 16 23:23:10 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 48 insertions(+), 52 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index dddb1cc021..2e27ffe168 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index aa9bf7b5b9..6ab7643c69 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index df33d7..515de36e86 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 0e7b1d21ec..98a436c766 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 43d1737495..449f592810 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index e810b26f0f..9312a7f689 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 0d635b00ae..25f0165dac 100644 --- a/oak-benchmarks-lucene
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 created (now af0719fae6)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at af0719fae6 (tag) tagging 2ba5b6a12aa423f09a145587c7b750aca4764d33 (commit) replaces jackrabbit-oak-1.44.0 by Nitin Gupta on Fri Dec 16 23:22:52 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.46.0 --- No new revisions were added by this update.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare release jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 2ba5b6a12a [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 2ba5b6a12a is described below commit 2ba5b6a12aa423f09a145587c7b750aca4764d33 Author: Nitin Gupta AuthorDate: Fri Dec 16 23:21:46 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 52 insertions(+), 48 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 6ec0f882b0..dddb1cc021 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 8c59c98e39..aa9bf7b5b9 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 24d20d7ed1..df33d7 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 071a5c483f..0e7b1d21ec 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 2e13e9ee44..43d1737495 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index a6a5d67ebc..e810b26f0f 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index c92cc6db51..0d635b00ae 100644 --- a/oak-benchmarks-lucene/pom.xml
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 0d18284dd8 [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0 0d18284dd8 is described below commit 0d18284dd869bd83b5587ba5b2e01c0652991ddb Author: Nitin Gupta AuthorDate: Fri Dec 16 23:10:37 2022 +0530 [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b78f527a7a..3ad6ff3d08 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT oak-parent/pom.xml
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 deleted (was be02f32722)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git *** WARNING: tag jackrabbit-oak-1.46.0 was deleted! *** tag was be02f32722 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8d9ecc8447 [maven-release-plugin] prepare for next development
iteration
8d9ecc8447 is described below
commit 8d9ecc8447305ba85182f9abe0448fbd7078d452
Author: Nitin Gupta
AuthorDate: Fri Dec 16 23:05:07 2022 +0530
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b885e6b207..b78f527a7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.jackrabbit
oak-parent
-1.46.0
+1.47-SNAPSHOT
oak-parent/pom.xml
@@ -90,7 +90,7 @@
scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
https://github.com/apache/jackrabbit-oak/tree/${project.scm.tag}
-jackrabbit-oak-1.46.0
+HEAD
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 created (now be02f32722)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at be02f32722 (tag) tagging 0f565b7245058f68e94322d92545567af2c5f395 (commit) replaces jackrabbit-oak-1.44.0 by Nitin Gupta on Fri Dec 16 23:04:51 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.46.0 --- No new revisions were added by this update.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare release jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0f565b7245 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0
0f565b7245 is described below
commit 0f565b7245058f68e94322d92545567af2c5f395
Author: Nitin Gupta
AuthorDate: Fri Dec 16 23:00:50 2022 +0530
[maven-release-plugin] prepare release jackrabbit-oak-1.46.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3ad6ff3d08..b885e6b207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
org.apache.jackrabbit
oak-parent
-1.45-SNAPSHOT
+1.46.0
oak-parent/pom.xml
@@ -90,7 +90,7 @@
scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
https://github.com/apache/jackrabbit-oak/tree/${project.scm.tag}
-HEAD
+jackrabbit-oak-1.46.0
[jackrabbit-oak] branch trunk updated (0d420382ff -> d38f44e3bd)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 0d420382ff [maven-release-plugin] prepare for next development iteration add 7d2ecdf707 Revert "[maven-release-plugin] prepare for next development iteration" add d38f44e3bd Revert "[maven-release-plugin] prepare release jackrabbit-oak-1.46.0" No new revisions were added by this update. Summary of changes: oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 2 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-)
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 0d420382ff [maven-release-plugin] prepare for next development iteration 0d420382ff is described below commit 0d420382ffeb09153feb586c7555703898eeef35 Author: Nitin Gupta AuthorDate: Fri Dec 16 19:25:26 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 48 insertions(+), 52 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index dddb1cc021..2e27ffe168 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index aa9bf7b5b9..6ab7643c69 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index df33d7..515de36e86 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 0e7b1d21ec..98a436c766 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 43d1737495..449f592810 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index e810b26f0f..9312a7f689 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 0d635b00ae..25f0165dac 100644 --- a/oak-benchmarks-lucene
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 created (now 3e8b4597a2)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 3e8b4597a2 (tag) tagging 6d4639f17452a20284272cbe56d10ae77406d16f (commit) replaces jackrabbit-oak-1.44.0 by Nitin Gupta on Fri Dec 16 19:25:10 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.46.0 --- No new revisions were added by this update.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare release jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 6d4639f174 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 6d4639f174 is described below commit 6d4639f17452a20284272cbe56d10ae77406d16f Author: Nitin Gupta AuthorDate: Fri Dec 16 19:24:10 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 52 insertions(+), 48 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 6ec0f882b0..dddb1cc021 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 8c59c98e39..aa9bf7b5b9 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 24d20d7ed1..df33d7 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 071a5c483f..0e7b1d21ec 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 2e13e9ee44..43d1737495 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index a6a5d67ebc..e810b26f0f 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index c92cc6db51..0d635b00ae 100644 --- a/oak-benchmarks-lucene/pom.xml
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 deleted (was 90eac72ccd)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git *** WARNING: tag jackrabbit-oak-1.46.0 was deleted! *** tag was 90eac72ccd The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 56a0fa0828 [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0 56a0fa0828 is described below commit 56a0fa0828e42b59089d014a20dff3b378d8edc9 Author: Nitin Gupta AuthorDate: Thu Dec 15 19:56:06 2022 +0530 [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 2 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 2e27ffe168..6ec0f882b0 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 6ab7643c69..8c59c98e39 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 515de36e86..24d20d7ed1 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 98a436c766..071a5c483f 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 449f592810..2e13e9ee44 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index 9312a7f689..a6a5d67ebc 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 25f0165dac
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new f4b6a3fbde [maven-release-plugin] prepare for next development iteration f4b6a3fbde is described below commit f4b6a3fbde511972d1c0a9c5cb6c25a96948a274 Author: Nitin Gupta AuthorDate: Thu Dec 15 19:26:27 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 48 insertions(+), 52 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index dddb1cc021..2e27ffe168 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index aa9bf7b5b9..6ab7643c69 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index df33d7..515de36e86 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 0e7b1d21ec..98a436c766 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 43d1737495..449f592810 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index e810b26f0f..9312a7f689 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 0d635b00ae..25f0165dac 100644 --- a/oak-benchmarks-lucene
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 created (now 90eac72ccd)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 90eac72ccd (tag) tagging cf108b4af039efeb70f9688a002e7f52469defba (commit) replaces jackrabbit-oak-1.44.0 by Nitin Gupta on Thu Dec 15 19:26:13 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.46.0 --- No new revisions were added by this update.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare release jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new cf108b4af0 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 cf108b4af0 is described below commit cf108b4af039efeb70f9688a002e7f52469defba Author: Nitin Gupta AuthorDate: Thu Dec 15 19:25:54 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 52 insertions(+), 48 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 6ec0f882b0..dddb1cc021 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 8c59c98e39..aa9bf7b5b9 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 24d20d7ed1..df33d7 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 071a5c483f..0e7b1d21ec 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 2e13e9ee44..43d1737495 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index a6a5d67ebc..e810b26f0f 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index c92cc6db51..0d635b00ae 100644 --- a/oak-benchmarks-lucene/pom.xml
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 deleted (was 5a1d84980b)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git *** WARNING: tag jackrabbit-oak-1.46.0 was deleted! *** tag was 5a1d84980b The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 738bf2bbc5 [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0 738bf2bbc5 is described below commit 738bf2bbc53feca7eee527bac365389f238da97d Author: Nitin Gupta AuthorDate: Thu Dec 15 15:23:45 2022 +0530 [maven-release-plugin] rollback the release of jackrabbit-oak-1.46.0 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 2 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 2e27ffe168..6ec0f882b0 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 6ab7643c69..8c59c98e39 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 515de36e86..24d20d7ed1 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 98a436c766..071a5c483f 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 449f592810..2e13e9ee44 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index 9312a7f689..a6a5d67ebc 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.47-SNAPSHOT +1.45-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 25f0165dac
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 58ada55601 [maven-release-plugin] prepare for next development iteration 58ada55601 is described below commit 58ada5560175b36edd39181175bfc217b1a31547 Author: Nitin Gupta AuthorDate: Thu Dec 15 13:03:53 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 48 insertions(+), 52 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index dddb1cc021..2e27ffe168 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index aa9bf7b5b9..6ab7643c69 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index df33d7..515de36e86 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 0e7b1d21ec..98a436c766 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 43d1737495..449f592810 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index e810b26f0f..9312a7f689 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.46.0 +1.47-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 0d635b00ae..25f0165dac 100644 --- a/oak-benchmarks-lucene
[jackrabbit-oak] annotated tag jackrabbit-oak-1.46.0 created (now 5a1d84980b)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.46.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 5a1d84980b (tag) tagging d160d51e977826d196cecc23abd3c9240ea138c4 (commit) replaces jackrabbit-oak-1.44.0 by Nitin Gupta on Thu Dec 15 13:03:41 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.46.0 --- No new revisions were added by this update.
[jackrabbit-oak] branch trunk updated: [maven-release-plugin] prepare release jackrabbit-oak-1.46.0
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new d160d51e97 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 d160d51e97 is described below commit d160d51e977826d196cecc23abd3c9240ea138c4 Author: Nitin Gupta AuthorDate: Thu Dec 15 12:56:28 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.46.0 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks-elastic/pom.xml | 2 +- oak-benchmarks-lucene/pom.xml| 2 +- oak-benchmarks-solr/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 6 +- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run-elastic/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-aws/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-remote/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 47 files changed, 52 insertions(+), 48 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 6ec0f882b0..dddb1cc021 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 8c59c98e39..aa9bf7b5b9 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 24d20d7ed1..df33d7 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 071a5c483f..0e7b1d21ec 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 2e13e9ee44..43d1737495 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index a6a5d67ebc..e810b26f0f 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.45-SNAPSHOT +1.46.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index c92cc6db51..0d635b00ae 100644 --- a/oak-benchmarks-lucene/pom.xml
[jackrabbit-oak] branch trunk updated: Apache Jackrabbit Oak 1.46.0 Candidate Release Notes
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 1317a6f214 Apache Jackrabbit Oak 1.46.0 Candidate Release Notes 1317a6f214 is described below commit 1317a6f2144a27e17ae855c93610c9aefbac1dac Author: Nitin Gupta AuthorDate: Thu Dec 15 09:16:15 2022 +0530 Apache Jackrabbit Oak 1.46.0 Candidate Release Notes --- RELEASE-NOTES.txt | 232 ++ 1 file changed, 128 insertions(+), 104 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index da22c85bfb..2153033875 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,4 @@ -Release Notes -- Apache Jackrabbit Oak -- Version 1.44.0 +Release Notes -- Apache Jackrabbit Oak -- Version 1.46.0 Introduction @@ -7,137 +7,161 @@ Jackrabbit Oak is a scalable, high-performance hierarchical content repository designed for use as the foundation of modern world-class web sites and other demanding content applications. -Apache Jackrabbit Oak 1.44.0 is an incremental feature release based +Apache Jackrabbit Oak 1.46.0 is an incremental feature release based on and compatible with earlier stable Jackrabbit Oak 1.x releases. This release is considered stable and targeted for production use. -While Oak 1.44.0 compiles and tests successfully on Java 17, Javadocs +While Oak 1.46.0 compiles and tests successfully on Java 17, Javadocs generation fails on Java 17 (but works as expected on Java 8). The Oak effort is a part of the Apache Jackrabbit project. Apache Jackrabbit is a project of the Apache Software Foundation. -Changes in Oak 1.44.0 +Changes in Oak 1.46.0 - Technical task -[OAK-9585] - BrokenNetworkIT fails on Java 17 -[OAK-9703] - benchmarks comparing new restrictions to rep:glob -[OAK-9833] - UpgradeIT fails on Java 17 +[OAK-9084] - Remove unnecessary (un)boxing in oak-store-spi +[OAK-9085] - Remove unnecessary (un)boxing in oak-webapp +[OAK-9901] - deploy oak docu +[OAK-9915] - remove jackrabbit-data dependency from oak-core +[OAK-9916] - remove jackrabbit-data dependency from oak-store-document +[OAK-9969] - Benchmark for OAK-9966 +[OAK-9994] - avoid leaking out transitive dependencies to Guava +[OAK-9995] - oak-blob-cloud-azure: unneeded Guava import declaration +[OAK-9996] - oak-search-mt: unneeded Guava import declaration +[OAK-] - remove use of com.google.common.collect.Iterators.emptyIterator +[OAK-10015] - Update Mockito dependency to 4.9.0 +[OAK-10018] - standalone: upgrade spring fwk to 2.5.14 +[OAK-10024] - improve diagnostics for addNode for invalid relative paths Bug -[OAK-9564] - Lease failure when update takes longer than socket timeout -[OAK-9649] - Improve multithreaded download retry strategy during indexing -[OAK-9656] - Recovery runs mistakenly when system clock jumps ahead -[OAK-9676] - In CompositeNodeStore, mounts are ignored when iterating through child nodes -[OAK-9684] - elastic: avoid ingesting FVs with size different from the one in the index definition -[OAK-9695] - Deleting a property fails in case there is a residual protected property definition in its node type with a non-matching type -[OAK-9700] - RevisionGC may fail with NPE -[OAK-9708] - Invalid logging of 'improper' regex WARN -[OAK-9709] - PropertyDelegate.isProtected() throws NPE when parent is stale -[OAK-9729] - Reduce execution time for oak-search-elastic tests -[OAK-9732] - oak-it-osgi ITs broken on Windows -[OAK-9735] - Reset/update corrupt index counter in metrics -[OAK-9736] - oak-store-composite ITs broken -[OAK-9750] - Oak-search-elastic: Add right tika dependency -[OAK-9751] - Exception while reading external changes from journal -[OAK-9769] - PathPredicate not being used properly when building FlatFileStore -[OAK-9773] - DefaultSyncContext#syncMembership() compares external ids case-sensitively -[OAK-9775] - ACEs with unsupported restrictions must be cleared upon editing -[OAK-9779] - PermissionConstants.PERMISSION_PROPERTY_NAMES does not list rep:isAllow -[OAK-9782] - CompositeRestrictionProvider must call validate on aggregated providers -[OAK-9791] - Missing check for restriction node being present -[OAK-9793] - AbstractRestrictionProvider: validation to respect aggregation for unsupported paths -[OAK-9797] - Direct access blob cache override breaks metrics and monitoring -[OAK-9798] - Inconsistent handling of supported permissions in CompositePermissionProviderOr -[OAK-9809] - oak-run server: update Jetty because of outdated servlet API version -[OAK-9813] - [oak-run-commons] LoggingInitializer shutdownLogging should not shut down
[jackrabbit-oak] branch trunk updated: Oak-10011 | Specifying path from where sonar scanner can pick up the jacoco xml reports (#783)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1e5f973c8a Oak-10011 | Specifying path from where sonar scanner can
pick up the jacoco xml reports (#783)
1e5f973c8a is described below
commit 1e5f973c8a5e753b31fe73eeb93eb01aea575e63
Author: nit0906
AuthorDate: Fri Dec 2 22:26:06 2022 +0530
Oak-10011 | Specifying path from where sonar scanner can pick up the jacoco
xml reports (#783)
---
oak-parent/pom.xml | 5 +
1 file changed, 5 insertions(+)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index a6737aead5..da16ac6159 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -84,6 +84,11 @@
10
+
+ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+
+apache
+https://sonarcloud.io
[jackrabbit-oak] branch trunk updated: Oak-10011 | Remove the pedantic and integration profile from sonar build command, just keep the coverage one. (#781)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 77b9a1e92d Oak-10011 | Remove the pedantic and integration profile
from sonar build command, just keep the coverage one. (#781)
77b9a1e92d is described below
commit 77b9a1e92d3d2ec3c63fd690f4ed4db8e8c99374
Author: nit0906
AuthorDate: Fri Dec 2 12:54:42 2022 +0530
Oak-10011 | Remove the pedantic and integration profile from sonar build
command, just keep the coverage one. (#781)
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6df64725bb..26db45312b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,4 +50,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR
information, if any
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-run: mvn -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Ppedantic,integrationTesting,coverage
-Dsonar.projectKey=org.apache.jackrabbit:jackrabbit-oak
-Dsonar.organization=apache
\ No newline at end of file
+run: mvn -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage
-Dsonar.projectKey=org.apache.jackrabbit:jackrabbit-oak
-Dsonar.organization=apache
[jackrabbit-oak] branch trunk updated: OAK-10011 | Including coverage profile in the build and analyse task (#779)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new ab67a23f41 OAK-10011 | Including coverage profile in the build and
analyse task (#779)
ab67a23f41 is described below
commit ab67a23f41be06213eceb25d46613dfafcdf121b
Author: nit0906
AuthorDate: Fri Dec 2 12:02:34 2022 +0530
OAK-10011 | Including coverage profile in the build and analyse task (#779)
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf93628d3a..6df64725bb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,4 +50,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR
information, if any
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-run: mvn -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.projectKey=org.apache.jackrabbit:jackrabbit-oak
-Dsonar.organization=apache
\ No newline at end of file
+run: mvn -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Ppedantic,integrationTesting,coverage
-Dsonar.projectKey=org.apache.jackrabbit:jackrabbit-oak
-Dsonar.organization=apache
\ No newline at end of file
[jackrabbit-oak] branch trunk updated: OAK-10011 : Configure SonarClould for Oak (fixing project key) (#772)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7cd4a93d2c OAK-10011 : Configure SonarClould for Oak (fixing project
key) (#772)
7cd4a93d2c is described below
commit 7cd4a93d2cd72278d0a93607844c69c3a2f64ec0
Author: nit0906
AuthorDate: Wed Nov 30 20:46:58 2022 +0530
OAK-10011 : Configure SonarClould for Oak (fixing project key) (#772)
---
.github/workflows/build.yml | 2 +-
oak-examples/webapp/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b09ded8cf..bf93628d3a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,4 +50,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR
information, if any
SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-run: mvn -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.projectKey=apache_jackrabbit-oak
\ No newline at end of file
+run: mvn -B verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Dsonar.projectKey=org.apache.jackrabbit:jackrabbit-oak
-Dsonar.organization=apache
\ No newline at end of file
diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml
index 84eaeecc1a..b541a00150 100644
--- a/oak-examples/webapp/pom.xml
+++ b/oak-examples/webapp/pom.xml
@@ -309,6 +309,7 @@
org.apache.maven.plugins
maven-failsafe-plugin
+ true
src/test/resources/logging.properties
[jackrabbit-oak] branch trunk updated: OAK-10004 - Bump Elasticsearch client from 7.17.6 to 7.17.7 (#759)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 45169551b8 OAK-10004 - Bump Elasticsearch client from 7.17.6 to 7.17.7
(#759)
45169551b8 is described below
commit 45169551b88ced8068702879497d3be47820313f
Author: Nuno Santos
AuthorDate: Mon Nov 21 09:34:03 2022 +0100
OAK-10004 - Bump Elasticsearch client from 7.17.6 to 7.17.7 (#759)
* Bump Elasticsearch client from 7.17.6 to 7.17.7.
* Increase timeout in an assetion in a test, give more time for a cache to
be updated.
---
oak-search-elastic/pom.xml | 2 +-
.../elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java | 2 +-
.../query/async/facets/ElasticStatisticalFacetAsyncProvider.java| 2 +-
.../oak/plugins/index/elastic/ElasticIndexStatisticsTest.java | 2 +-
.../apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
index ddce5127e7..f2dfcc3c8e 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -33,7 +33,7 @@
Oak Elasticsearch integration subproject
-7.17.6
+7.17.7
diff --git
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
index aa503af1b3..50f1bd13c2 100644
---
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
+++
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
@@ -53,7 +53,7 @@ class ElasticInsecureFacetAsyncProvider implements
ElasticFacetProvider, Elastic
if (aggregations != null) {
Aggregate aggregate =
aggregations.get(FulltextIndex.parseFacetField(columnName));
return aggregate.sterms().buckets().array().stream()
-.map(term -> new FulltextIndex.Facet(term.key(), (int)
term.docCount()))
+.map(term -> new
FulltextIndex.Facet(term.key().stringValue(), (int) term.docCount()))
.collect(Collectors.toList());
} else return null;
}
diff --git
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
index c4ed6599f5..4611062dc1 100644
---
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
+++
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
@@ -95,7 +95,7 @@ public class ElasticStatisticalFacetAsyncProvider extends
ElasticSecureFacetAsyn
for (String field : facetFields) {
List buckets =
aggregations.get(field).sterms().buckets().array();
facetMap.put(field, buckets.stream()
-.map(b -> new FulltextIndex.Facet(b.key(), (int)
b.docCount()))
+.map(b -> new FulltextIndex.Facet(b.key().stringValue(),
(int) b.docCount()))
.collect(Collectors.toList())
);
}
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
index a06b18f921..1830c77e22 100644
---
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
@@ -105,7 +105,7 @@ public class ElasticIndexStatisticsTest {
}
// cache hit, latest value returned
assertEquals(1000, indexStatistics.numDocs());
-}, 500);
+}, 1000);
verifyNoMoreInteractions(elasticClientMock);
// index count changes in elastic
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
index 96580161ab..dcfc39abae 100644
---
a/oak-search-elastic/src/test/java/org/apache/ja
[jackrabbit-oak] branch 1.22 updated: Updating versions post 1.22.13 release
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 2782214974 Updating versions post 1.22.13 release 2782214974 is described below commit 2782214974e47f665488fa4fd1ace864efe42da0 Author: Nitin Gupta AuthorDate: Mon Oct 17 12:43:32 2022 +0530 Updating versions post 1.22.13 release --- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-doc-railroad-macro/pom.xml b/oak-doc-railroad-macro/pom.xml index 6c40aa337d..cf39a69d76 100644 --- a/oak-doc-railroad-macro/pom.xml +++ b/oak-doc-railroad-macro/pom.xml @@ -22,7 +22,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.14-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index fc0afcf005..df4dcd0280 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.14-SNAPSHOT ../oak-parent/pom.xml
[jackrabbit-oak] branch 1.22 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 3bc4dc5f3d [maven-release-plugin] prepare for next development iteration 3bc4dc5f3d is described below commit 3bc4dc5f3d48201185cdea452b3d883c002d6249 Author: Nitin Gupta AuthorDate: Thu Oct 13 14:38:41 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index fd9ff15be8..265c86beef 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index db4e07928e..16f7bed016 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 51b7cdf1bc..94baedaa4f 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 725cc14ede..15b654a029 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 4371dc73f9..7fdb03f6d7 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 3eb49b2048..ca69065191 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index f40544a596..4c45ffd9d6 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.13 +1.22.14-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 5d03fdbea2..afd8ce3c68 100644 --- a/oak-blob
[jackrabbit-oak] annotated tag jackrabbit-oak-1.22.13 created (now 1decd63225)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.22.13 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 1decd63225 (tag) tagging ee4501e048e391ed43af965a9e209c4ad6afe52c (commit) replaces jackrabbit-oak-1.22.12 by Nitin Gupta on Thu Oct 13 14:38:00 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.22.13 --- No new revisions were added by this update.
[jackrabbit-oak] branch 1.22 updated: [maven-release-plugin] prepare release jackrabbit-oak-1.22.13
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new ee4501e048 [maven-release-plugin] prepare release jackrabbit-oak-1.22.13 ee4501e048 is described below commit ee4501e048e391ed43af965a9e209c4ad6afe52c Author: Nitin Gupta AuthorDate: Thu Oct 13 14:37:30 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.22.13 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 23ea7c8398..fd9ff15be8 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index bbdea158ee..db4e07928e 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index a242e0eca8..51b7cdf1bc 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 110d976fe2..725cc14ede 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index d23c1a347d..4371dc73f9 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 2d3d3d038f..3eb49b2048 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index c1a93e26a1..f40544a596 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.13-SNAPSHOT +1.22.13 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index f3412c356b..5d03fdbea2 100644 --- a/oak-blob
[jackrabbit-oak] branch 1.22 updated: Release notes for Apache Jackrabbit Oak 1.22.13
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 75842900ce Release notes for Apache Jackrabbit Oak 1.22.13 75842900ce is described below commit 75842900ce5b8578efd161312b9d37fa8d4aaa99 Author: Nitin Gupta AuthorDate: Thu Oct 13 11:33:35 2022 +0530 Release notes for Apache Jackrabbit Oak 1.22.13 --- RELEASE-NOTES.txt | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index dc4c49a210..c5f29707c9 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,4 @@ -Release Notes -- Apache Jackrabbit Oak -- Version 1.22.12 +Release Notes -- Apache Jackrabbit Oak -- Version 1.22.13 Introduction @@ -7,7 +7,7 @@ Jackrabbit Oak is a scalable, high-performance hierarchical content repository designed for use as the foundation of modern world-class web sites and other demanding content applications. -Jackrabbit Oak 1.22.12 is a patch release that contains fixes and +Jackrabbit Oak 1.22.13 is a patch release that contains fixes and improvements over Oak 1.22. Jackrabbit Oak 1.22.x releases are considered stable and targeted for production use. @@ -15,18 +15,19 @@ The Oak effort is a part of the Apache Jackrabbit project. Apache Jackrabbit is a project of the Apache Software Foundation. -Changes in Oak 1.22.12 +Changes in Oak 1.22.13 - Bug -[OAK-9773] - DefaultSyncContext#syncMembership() compares external ids case-sensitively +[OAK-9535] - Support recovery of large branch merge +[OAK-9891] - Removal (purge) of version of a node does not remove associated labels -Improvement +Task -[OAK-9404] - Missing nullability annotations in org.apache.jackrabbit.oak.plugins.tree -[OAK-9405] - Reduce complexity of TreeUtil -[OAK-9527] - Typos in security related API +[OAK-9720] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.5 +[OAK-9828] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.6 +[OAK-9925] - update MongoDB Java Driver dependency to 3.12.11 In addition to the above-mentioned changes, this release contains
[jackrabbit-oak] branch trunk updated: Add support for testing with Elastisearch 8.4.3 (Elastiknn 8.4.3 plugin checksum). (#729)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 03d7f6830c Add support for testing with Elastisearch 8.4.3 (Elastiknn
8.4.3 plugin checksum). (#729)
03d7f6830c is described below
commit 03d7f6830cb68cc3f8bb80be89794eb46e355291
Author: Nuno Santos
AuthorDate: Mon Oct 10 08:58:29 2022 +0200
Add support for testing with Elastisearch 8.4.3 (Elastiknn 8.4.3 plugin
checksum). (#729)
Change submitted by nfsantos
---
.../oak/plugins/index/elastic/ElasticTestServer.java | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
index cda2934088..96580161ab 100644
---
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
@@ -43,13 +43,14 @@ import static org.junit.Assume.assumeNotNull;
public class ElasticTestServer implements AutoCloseable {
private static final Logger LOG =
LoggerFactory.getLogger(ElasticTestServer.class);
-private static final Map
PLUGIN_OFFICIAL_RELEASES_DIGEST_MAP = ImmutableMap.of(
-"7.17.3.0",
"5e3b40bb72b2813f927be9bf6ecdf88668d89d2ef20c7ebafaa51ab8407fd179",
-"7.17.6.0",
"326893bb98ef1a0c569d9f4c4a9a073e53361924f990b17e87077985ce8a7478",
-"8.3.3.0",
"14d3223456f4b9f00f86628ec8400cb46513935e618ae0f5d0d1088739ccc233",
-"8.4.1.0",
"56797a1bac6ceeaa36d2358f818b14633124d79c5e04630fa3544603d82eaa01",
-"8.4.2.0",
"5ce81ad043816900a496ad5b3cce7de1d99547ebf92aa1f9856343e48580c71c"
-);
+private static final Map
PLUGIN_OFFICIAL_RELEASES_DIGEST_MAP = ImmutableMap.builder()
+.put("7.17.3.0",
"5e3b40bb72b2813f927be9bf6ecdf88668d89d2ef20c7ebafaa51ab8407fd179")
+.put("7.17.6.0",
"326893bb98ef1a0c569d9f4c4a9a073e53361924f990b17e87077985ce8a7478")
+.put("8.3.3.0",
"14d3223456f4b9f00f86628ec8400cb46513935e618ae0f5d0d1088739ccc233")
+.put("8.4.1.0",
"56797a1bac6ceeaa36d2358f818b14633124d79c5e04630fa3544603d82eaa01")
+.put("8.4.2.0",
"5ce81ad043816900a496ad5b3cce7de1d99547ebf92aa1f9856343e48580c71c")
+.put("8.4.3.0",
"5c00d43cdd56c5c5d8e9032ad507acea482fb5ca9445861c5cc12ad63af66425")
+.build();
private static final ElasticTestServer SERVER = new ElasticTestServer();
private static volatile ElasticsearchContainer CONTAINER;
[jackrabbit-oak] branch trunk updated: document elastic improvemnets (#726)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new 856d3cd56b document elastic improvemnets (#726) 856d3cd56b is described below commit 856d3cd56b354709b5a41b28d3e837bf1a0f45b3 Author: nit0906 AuthorDate: Mon Oct 3 15:11:38 2022 +0530 document elastic improvemnets (#726) Co-authored-by: Nitin Gupta --- oak-doc/src/site/markdown/query/elastic.md | 4 1 file changed, 4 insertions(+) diff --git a/oak-doc/src/site/markdown/query/elastic.md b/oak-doc/src/site/markdown/query/elastic.md index 7ea6cc3a7e..aa23ba6794 100644 --- a/oak-doc/src/site/markdown/query/elastic.md +++ b/oak-doc/src/site/markdown/query/elastic.md @@ -48,5 +48,9 @@ however there are differences: Synchronous indexing, and enforcing uniqueness constraints is not currently supported in elastic indexes. * The behavior for `dynamicBoost` is slightly different: For Lucene indexes, boosting is done in indexing, while for Elastic it is done at query time. +* The behavior for `suggest` is slightly different: + For Lucene indexes, the suggestor is updated every 10 minutes by default and the frequency + can be changed by `suggestUpdateFrequencyMinutes` property in suggestion node under the index definition node. + In Elastic indexes, there is no such delay and thus no need for the above config property. This is an improvement in ES over lucene. [lucene]: https://jackrabbit.apache.org/oak/docs/query/lucene.html
[jackrabbit-oak] branch trunk updated: OAK-9950|Update tika version in oak (#719)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 277829c198 OAK-9950|Update tika version in oak (#719)
277829c198 is described below
commit 277829c198c9bdf583c7dcc06c96ce7f3f9d69b2
Author: nit0906
AuthorDate: Mon Sep 26 20:32:23 2022 +0530
OAK-9950|Update tika version in oak (#719)
* OAK-9950|Update tika version in oak
---
oak-it-osgi/src/test/resources/versions.properties | 2 +-
oak-parent/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/oak-it-osgi/src/test/resources/versions.properties
b/oak-it-osgi/src/test/resources/versions.properties
index 7ab4642a04..723d25f60d 100644
--- a/oak-it-osgi/src/test/resources/versions.properties
+++ b/oak-it-osgi/src/test/resources/versions.properties
@@ -18,5 +18,5 @@ tika=${tika.version}
poi=4.0.1
commons-collections4=4.1
commons-compress=1.20
-commons-lang3=3.10
+commons-lang3=3.12.0
commons-math3=3.6.1
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index c469f2804a..8c47ffb6f6 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -61,7 +61,7 @@
1.7.32
1.2.10
2.0.206
-1.24.1
+1.26
15.0
com.google.common.*;version="[15.0,21)"
10.14.2.0
@@ -614,7 +614,7 @@
org.apache.commons
commons-lang3
-3.10
+3.12.0
commons-io
[jackrabbit-oak] branch trunk updated (d8fa29ed40 -> 45f7fc736e)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from d8fa29ed40 OAK-9947: upgrade jackson (including databind) to 2.13.4
(#712)
add 45f7fc736e Oak-9917 | Better ES test coverage (#697)
No new revisions were added by this update.
Summary of changes:
oak-lucene/pom.xml |5 +
.../plugins/index/lucene/FunctionIndexTest.java| 1287
.../index/lucene/LuceneFacetCommonTest.java|4 +-
.../LuceneIndexDescendantSpellcheckTest.java | 188 ---
.../index/lucene/LuceneIndexPlannerCommonTest.java | 631
...uceneIndexQuerySQL2OptimisationCommonTest.java} | 40 +-
.../index/lucene/LuceneIndexSuggestionTest.java| 376 -
.../oak/plugins/index/lucene/SecureFacetTest.java | 414 --
oak-search-elastic/pom.xml |5 +
.../index/elastic/query/ElasticIndexPlanner.java |4 +-
.../plugins/index/elastic/ElasticFacetTest.java|4 +-
.../elastic/ElasticIndexPlannerCommonTest.java | 234 +++
...lasticIndexQuerySQL2OptimisationCommonTest.java | 69 +
.../elastic/ElasticIndexSuggestionCommonTest.java |4 +-
.../plugins/index/elastic/ElasticReindexTest.java |4 +-
oak-search/pom.xml |5 +
.../jackrabbit/oak/plugins/index/ExcerptTest.java |2 +-
.../oak/plugins/index/FacetCommonTest.java |2 +-
.../oak/plugins/index/FullTextIndexCommonTest.java |2 +-
.../oak/plugins/index/FunctionIndexCommonTest.java | 51 +
...ndTraversalQueriesSimilarResultsCommonTest.java |2 +-
.../index/IndexDescendantSpellcheckCommonTest.java |2 +-
.../index/IndexDescendantSuggestionCommonTest.java |2 +-
.../index/IndexExclusionQueryCommonTest.java |8 +-
.../index/IndexImproperUsageCommonTest.java|2 +-
.../index/IndexPathRestrictionCommonTest.java |4 +-
.../oak/plugins/index/IndexPlannerCommonTest.java | 1551
.../oak/plugins/index/IndexQueryCommonTest.java|2 +-
.../IndexQuerySQL2OptimisationCommonTest.java | 84 +-
.../plugins/index/IndexSuggestionCommonTest.java |2 +-
.../oak/plugins/index/PropertyIndexCommonTest.java |2 +-
.../oak/plugins/index/SpellcheckCommonTest.java|2 +-
.../StrictPathRestrictionEnableCommonTest.java |2 +-
.../jackrabbit/oak/plugins/index/TestUtil.java | 33 +
.../jackrabbit/oak/plugins/index/TestUtils.java| 54 -
35 files changed, 2656 insertions(+), 2427 deletions(-)
delete mode 100644
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java
delete mode 100644
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDescendantSpellcheckTest.java
create mode 100644
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPlannerCommonTest.java
copy
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/{LuceneIndexAggregationCommonTest.java
=> LuceneIndexQuerySQL2OptimisationCommonTest.java} (55%)
delete mode 100644
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
delete mode 100644
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SecureFacetTest.java
create mode 100644
oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPlannerCommonTest.java
create mode 100644
oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexQuerySQL2OptimisationCommonTest.java
create mode 100644
oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexPlannerCommonTest.java
rename
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTestSQL2OptimisationTest.java
=>
oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexQuerySQL2OptimisationCommonTest.java
(73%)
delete mode 100644
oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/TestUtils.java
[jackrabbit-oak] branch trunk updated (46fe60c6ce -> 9f4d399303)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 46fe60c6ce Merge pull request #674 from mreutegg/OAK-9908 add 9f4d399303 OAK-9903 | Improved test coverage for path restriction and path transformation (#671) No new revisions were added by this update. Summary of changes: .../LuceneIndexPathRestrictionCommonTest.java | 82 +++ .../lucene/LuceneIndexPathRestrictionTest.java | 339 oak-parent/pom.xml | 5 + .../index/elastic/ElasticIndexStatistics.java | 26 +- .../elastic/query/ElasticResponseHandler.java | 14 +- .../query/async/ElasticResultRowAsyncIterator.java | 1 + .../util/ElasticIndexDefinitionBuilder.java| 9 + .../ElasticIndexPathRestrictionCommonTest.java | 112 .../index/elastic/ElasticIndexStatisticsTest.java | 2 +- .../oak/plugins/index/FullTextIndexCommonTest.java | 68 +++ .../index/IndexPathRestrictionCommonTest.java | 609 + 11 files changed, 913 insertions(+), 354 deletions(-) create mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionCommonTest.java delete mode 100644 oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexPathRestrictionTest.java create mode 100644 oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexPathRestrictionCommonTest.java create mode 100644 oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexPathRestrictionCommonTest.java
[jackrabbit-oak] branch trunk updated: OAK-9878 | Adding test for exclusion and inclusion properties in full… (#668)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4764425d2b OAK-9878 | Adding test for exclusion and inclusion
properties in full… (#668)
4764425d2b is described below
commit 4764425d2b2dcfc4e3073371685b13a8d6fd7ad0
Author: nit0906
AuthorDate: Wed Aug 17 08:37:57 2022 +0530
OAK-9878 | Adding test for exclusion and inclusion properties in full…
(#668)
* OAK-9878 | Adding test for exclusion and inclusion properties in fulltext
index + porting to common tests to be used by both lucene and elastic
---
.../LuceneIndexExclusionQueryCommonTest.java | 45 +++-
.../lucene/LuceneIndexExclusionQueryTest.java | 116 -
.../ElasticIndexExclusionQueryCommonTest.java | 40 +++
.../index/IndexExclusionQueryCommonTest.java | 61 +--
4 files changed, 108 insertions(+), 154 deletions(-)
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryCommonTest.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryCommonTest.java
index 0f9b87c13a..262dab0e49 100644
---
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryCommonTest.java
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryCommonTest.java
@@ -17,52 +17,35 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
import org.apache.jackrabbit.oak.InitialContentHelper;
-import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
-import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.index.IndexExclusionQueryCommonTest;
import org.apache.jackrabbit.oak.plugins.index.LuceneIndexOptions;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.spi.commit.Observer;
-import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
-import static com.google.common.collect.ImmutableList.of;
-import static javax.jcr.PropertyType.TYPENAME_BINARY;
-import static javax.jcr.PropertyType.TYPENAME_STRING;
-import static org.apache.jackrabbit.oak.api.Type.STRINGS;
-import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
-import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.useV2;
-import static
org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.EXCLUDE_PROPERTY_NAMES;
-import static
org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.INCLUDE_PROPERTY_TYPES;
+import java.io.File;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
/**
* Tests the {@link LuceneIndexProvider} exclusion settings
*/
public class LuceneIndexExclusionQueryCommonTest extends
IndexExclusionQueryCommonTest {
-private static final String NOT_IN = "notincluded";
+private ExecutorService executorService = Executors.newFixedThreadPool(2);
-@Override
-protected void createTestIndexNode() throws Exception {
-indexOptions = new LuceneIndexOptions();
-Tree lucene = createTestIndexNode(root.getTree("/"), TYPE_LUCENE);
-lucene.setProperty(INCLUDE_PROPERTY_TYPES,
-of(TYPENAME_BINARY, TYPENAME_STRING), STRINGS);
-lucene.setProperty(EXCLUDE_PROPERTY_NAMES, of(NOT_IN), STRINGS);
-useV2(lucene);
-root.commit();
-}
+@Rule
+public TemporaryFolder temporaryFolder = new TemporaryFolder(new
File("target"));
@Override
protected ContentRepository createRepository() {
-LowCostLuceneIndexProvider provider = new LowCostLuceneIndexProvider();
-return new Oak(new
MemoryNodeStore(InitialContentHelper.INITIAL_CONTENT))
-.with(new OpenSecurityProvider())
-.with((QueryIndexProvider) provider)
-.with((Observer) provider)
-.with(new LuceneIndexEditorProvider())
-.createContentRepository();
+indexOptions = new LuceneIndexOptions();
+LuceneTestRepositoryBuilder luceneTestRepositoryBuilder = new
LuceneTestRepositoryBuilder(executorService, temporaryFolder);
+luceneTestRepositoryBuilder.setNodeStore(new
MemoryNodeStore(InitialContentHelper.INITIAL_CONTENT));
+repositoryOptionsUtil = luceneTestRepositoryBuilder.build();
+
+return repositoryOptionsUtil.getOak().createContentRepository();
}
}
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTes
[jackrabbit-oak] branch trunk updated: OAK-9874 (unit test only) - Add a (failing and @Ignored) unit test to check that queries return same result with and without index. (#644)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 56fca22fa4 OAK-9874 (unit test only) - Add a (failing and @Ignored)
unit test to check that queries return same result with and without index.
(#644)
56fca22fa4 is described below
commit 56fca22fa4477149b4994d71d17d9f009c6481f1
Author: Nuno Santos
AuthorDate: Tue Aug 16 12:05:30 2022 +0200
OAK-9874 (unit test only) - Add a (failing and @Ignored) unit test to check
that queries return same result with and without index. (#644)
* Move the lists with queries with same and different results from the
Elastic/Lucene derived classes to base class, as these are currently equal, so
it is not necessary for them to be duplicated.
Enabled the test for queries with different results and make it fail if not
all queries produce different results.
Change names of lists of queries from correct/wrong queries to use instead
different/same results, which is more descriptive of what they are.
(Contributed by Nuno Santos - https://github.com/nfsantos)
---
...ndTraversalQueriesSimilarResultsCommonTest.java | 53 ++
...ndTraversalQueriesSimilarResultsCommonTest.java | 43 +
...ndTraversalQueriesSimilarResultsCommonTest.java | 182 +
3 files changed, 278 insertions(+)
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAndTraversalQueriesSimilarResultsCommonTest.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAndTraversalQueriesSimilarResultsCommonTest.java
new file mode 100644
index 00..4f5a4b0494
--- /dev/null
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAndTraversalQueriesSimilarResultsCommonTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.plugins.index.lucene;
+
+import org.apache.jackrabbit.oak.api.ContentRepository;
+import org.apache.jackrabbit.oak.plugins.index.LuceneIndexOptions;
+import
org.apache.jackrabbit.oak.plugins.index.IndexAndTraversalQueriesSimilarResultsCommonTest;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class LuceneIndexAndTraversalQueriesSimilarResultsCommonTest extends
IndexAndTraversalQueriesSimilarResultsCommonTest {
+private final ExecutorService executorService =
Executors.newFixedThreadPool(2);
+@Rule
+public TemporaryFolder temporaryFolder = new TemporaryFolder(new
File("target"));
+
+public LuceneIndexAndTraversalQueriesSimilarResultsCommonTest() {
+indexOptions = new LuceneIndexOptions();
+}
+
+@Override
+protected ContentRepository createRepository() {
+LuceneTestRepositoryBuilder builder = new
LuceneTestRepositoryBuilder(executorService, temporaryFolder);
+repositoryOptionsUtil = builder.build();
+indexOptions = new LuceneIndexOptions();
+return repositoryOptionsUtil.getOak().createContentRepository();
+}
+
+@After
+public void shutdownExecutor() {
+executorService.shutdown();
+}
+}
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAndTraversalQueriesSimilarResultsCommonTest.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAndTraversalQueriesSimilarResultsCommonTest.java
new file mode 100644
index 00..94eae194cd
--- /dev/null
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAndTraversalQueriesSimilarResultsCommonTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
[jackrabbit-oak] branch trunk updated: OAK-9878 | OAK-9858 | Fixing failing(Ignored) tests for ES (#653)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new cdfc855a2b OAK-9878 | OAK-9858 | Fixing failing(Ignored) tests for ES
(#653)
cdfc855a2b is described below
commit cdfc855a2b26358baaf67e0f799dcec1fa78cc13
Author: nit0906
AuthorDate: Tue Aug 9 10:16:45 2022 +0530
OAK-9878 | OAK-9858 | Fixing failing(Ignored) tests for ES (#653)
* OAK-9858 | Making ES indexing sync(similar to lucene) for
IndexQueryCommonTests that are based on text files
* Re-enabling traversal since it's needed by some join queries in tests,
also making changes in sql2 test to accomodate for newer properties in test
collateral since this test was disabled
* Fixing sort for ES index in case of non explicit properties covered via
some regex property
* Fixing like queries in ES in case of fulltext/analyzed properties
* Fixing queries on node name in case of ES index - needed to use
:nodeName..keyword instead of :nodeName
* Code Cleanup
* Incorporating review comments
* Fixing minor issue in like query
* Added missing test for path() function
---
.../jackrabbit/oak/query/AbstractQueryTest.java| 10 +++-
.../org/apache/jackrabbit/oak/query/sql2.txt | 12 +++--
.../index/lucene/LuceneIndexQueryCommonTest.java | 21 +++-
.../index/elastic/query/ElasticRequestHandler.java | 24 ++---
.../index/elastic/ElasticIndexQueryCommonTest.java | 32 ++--
.../oak/plugins/index/FunctionIndexCommonTest.java | 30 +++
.../oak/plugins/index/IndexQueryCommonTest.java| 58 +-
7 files changed, 120 insertions(+), 67 deletions(-)
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
index f096b64c68..c1914aedfc 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
@@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -227,7 +228,14 @@ public abstract class AbstractQueryTest {
w.println(line);
line = line.substring("commit".length()).trim();
apply(root, line);
-root.commit();
+// This part of code is used by both lucene and elastic
tests.
+// The index definitions in these tests don't have async
property set
+// So lucene, in this case behaves in a sync manner. But
the tests fail on Elastic,
+// since ES indexing is always async.
+// The below commit info map (sync-mode = rt) would make
Elastic use RealTimeBulkProcessHandler.
+// This would make ES indexes also sync.
+// This will NOT have any impact on the lucene tests.
+root.commit(Collections.singletonMap("sync-mode", "rt"));
}
w.flush();
}
diff --git
a/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt
b/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt
index 7168fe6d3d..d7dfba98d0 100644
--- a/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt
+++ b/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2.txt
@@ -407,21 +407,22 @@ commit /testRoot + "test2": { "name": "World!" }
commit /testRoot + "test3": { "name": "Hallo" }
commit /testRoot + "test4": { "name": "10%" }
commit /testRoot + "test5": { "name": "10 percent" }
+commit /testRoot + "test6": { "name": "brave" }
select a.name
from [nt:base] as a
where a.name is not null and isdescendantnode(a , '/testRoot') order by
upper(a.name)
10 percent
10%
+brave
Hallo
hello
World!
select [jcr:path]
from [nt:base]
- where length(name) = 5
-/testRoot/test
-/testRoot/test3
+ where length(name) = 10
+/testRoot/test5
select [jcr:path]
from [nt:base]
@@ -440,8 +441,9 @@ select [jcr:path]
select [jcr:path]
from [nt:base]
- where name like '%o_%'
-/testRoot/test2
+ where name like '%e_%'
+/testRoot/test
+/testRoot/test5
select [jcr:path]
from [nt:base]
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryCommonTest.java
b/oak-lucene/src/test/java/org/ap
[jackrabbit-oak] branch trunk updated: OAK-9870 | Escaped characters from client get unescaped in ES implementation (#645)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 27a7a9ffa0 OAK-9870 | Escaped characters from client get unescaped in
ES implementation (#645)
27a7a9ffa0 is described below
commit 27a7a9ffa0e78e5b258626aef24066eb58efc559
Author: nit0906
AuthorDate: Fri Aug 5 10:24:36 2022 +0530
OAK-9870 | Escaped characters from client get unescaped in ES
implementation (#645)
* OAK-9870 | Removing leading '-' from rawtext to avoid double negation +
logging jcr query in case of lucene query failure
---
.../plugins/index/lucene/LucenePropertyIndex.java | 2 +-
.../lucene/LuceneFullTextIndexCommonTest.java | 23 ++
.../index/elastic/query/ElasticRequestHandler.java | 14 +++-
.../elastic/ElasticFullTextIndexCommonTest.java| 27 +++
.../oak/plugins/index/FullTextIndexCommonTest.java | 90 +-
5 files changed, 131 insertions(+), 25 deletions(-)
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
index baffc5edec..bbb39b7f35 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
@@ -534,7 +534,7 @@ public class LucenePropertyIndex extends FulltextIndex {
}
}
} catch (Exception e) {
-LOG.warn("query via {} failed.", LucenePropertyIndex.this,
e);
+LOG.warn("query [{}] via {} failed.", plan.getFilter() ,
LucenePropertyIndex.this.getClass().getCanonicalName(), e);
} finally {
indexNode.release();
}
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextIndexCommonTest.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextIndexCommonTest.java
index 19fc60c6c6..f30a5dd1e6 100644
---
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextIndexCommonTest.java
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneFullTextIndexCommonTest.java
@@ -17,13 +17,17 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
import org.apache.jackrabbit.oak.api.ContentRepository;
+import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.index.FullTextIndexCommonTest;
import org.apache.jackrabbit.oak.plugins.index.LuceneIndexOptions;
import org.junit.After;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
+import org.slf4j.event.Level;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -49,4 +53,23 @@ public class LuceneFullTextIndexCommonTest extends
FullTextIndexCommonTest {
public void shutdownExecutor() {
executorService.shutdown();
}
+
+@Override
+protected LogCustomizer setupLogCustomizer() {
+return
LogCustomizer.forLogger(LucenePropertyIndex.class.getName()).enable(Level.WARN).create();
+}
+
+@Override
+protected List getExpectedLogMessage() {
+List expectedLogList = new ArrayList<>();
+String log1 = "query [Filter(query=select [jcr:path], [jcr:score], *
from [nt:base] as a where contains([analyzed_field], 'foo}') /* xpath: " +
+"//*[jcr:contains(@analyzed_field, 'foo}')] */
fullText=analyzed_field:\"foo}\", path=*)] via
org.apache.jackrabbit.oak.plugins.index.lucene.LucenePropertyIndex failed.";
+String log2 = "query [Filter(query=select [jcr:path], [jcr:score], *
from [nt:base] as a where contains([analyzed_field], 'foo]') /* xpath: " +
+"//*[jcr:contains(@analyzed_field, 'foo]')] */
fullText=analyzed_field:\"foo]\", path=*)] via
org.apache.jackrabbit.oak.plugins.index.lucene.LucenePropertyIndex failed.";
+
+expectedLogList.add(log1);
+expectedLogList.add(log2);
+
+return expectedLogList;
+}
}
diff --git
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
index 41cee6ba11..4c932cb034 100644
---
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java
+++
b/oak-search-elastic/src/main/java/org/apache/ja
[jackrabbit-oak] branch trunk updated: Revert "OAK-9870 | Escaping brackets to avoid query parse exceptions (#643)"
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new e71d4f1fd5 Revert "OAK-9870 | Escaping brackets to avoid query parse
exceptions (#643)"
e71d4f1fd5 is described below
commit e71d4f1fd5ef5eeb1cbc238646c9c465af74e631
Author: Nitin Gupta
AuthorDate: Fri Jul 29 18:26:17 2022 +0530
Revert "OAK-9870 | Escaping brackets to avoid query parse exceptions (#643)"
This reverts commit c194a0d7547d6e5d6da4a5df0ab9e1efd647c2f5.
---
.../index/search/spi/query/FulltextIndex.java | 5 ++--
.../oak/plugins/index/FullTextIndexCommonTest.java | 30 --
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git
a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
index 56edd3d635..fb61936f8c 100644
---
a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
+++
b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
@@ -281,15 +281,14 @@ public abstract class FulltextIndex implements
AdvancedQueryIndex, QueryIndex, N
}
/**
- * Following chars are used as operators in Lucene and Elastic Queries and
should be escaped
+ * Following chars are used as operators in Lucene Query and should be
escaped
*/
-private static final char[] QUERY_OPERATORS = {':' , '/', '!', '&', '|',
'=', '{', '}', '[', ']', '(', ')'};
+private static final char[] QUERY_OPERATORS = {':' , '/', '!', '&', '|',
'='};
/**
* Following logic is taken from
org.apache.jackrabbit.core.query.lucene.JackrabbitQueryParser#parse(java.lang.String)
*/
public static String rewriteQueryText(String textsearch) {
-
// replace escaped ' with just '
StringBuilder rewritten = new StringBuilder();
// most query parsers recognize 'AND' and 'NOT' as
diff --git
a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
index f9851ec783..c60d348af9 100644
---
a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
+++
b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
@@ -88,34 +88,4 @@ public abstract class FullTextIndexCommonTest extends
AbstractQueryTest {
});
}
-
-@Test
-public void testWithSpecialCharsInSearchTerm() throws Exception {
-IndexDefinitionBuilder builder = indexOptions.createIndex(
-indexOptions.createIndexDefinitionBuilder(), false,
"analyzed_field");
-builder.noAsync();
-builder.indexRule("nt:base")
-.property("analyzed_field")
-.analyzed().nodeScopeIndex();
-
-indexOptions.setIndex(root, UUID.randomUUID().toString(), builder);
-root.commit();
-
-//add content
-Tree test = root.getTree("/").addChild("test");
-
-test.addChild("a").setProperty("analyzed_field", "foo");
-root.commit();
-
-assertEventually(() -> {
-assertQuery("//*[jcr:contains(@analyzed_field, '{foo}')] ", XPATH,
Collections.singletonList("/test/a"));
-assertQuery("//*[jcr:contains(@analyzed_field, '\\{foo}')] ",
XPATH, Collections.singletonList("/test/a"));
-assertQuery("//*[jcr:contains(@analyzed_field, 'foo:')] ", XPATH,
Collections.singletonList("/test/a"));
-assertQuery("//*[jcr:contains(@analyzed_field, '[foo]')] ", XPATH,
Collections.singletonList("/test/a"));
-assertQuery("//*[jcr:contains(@analyzed_field, '|foo/')] ", XPATH,
Collections.singletonList("/test/a"));
-assertQuery("//*[jcr:contains(@analyzed_field, '(&=!foo')] ",
XPATH, Collections.singletonList("/test/a"));
-});
-
-}
-
}
[jackrabbit-oak] branch trunk updated: OAK-9870 | Escaping brackets to avoid query parse exceptions (#643)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new c194a0d754 OAK-9870 | Escaping brackets to avoid query parse
exceptions (#643)
c194a0d754 is described below
commit c194a0d7547d6e5d6da4a5df0ab9e1efd647c2f5
Author: nit0906
AuthorDate: Fri Jul 29 17:04:41 2022 +0530
OAK-9870 | Escaping brackets to avoid query parse exceptions (#643)
* OAK-9870 | Escaping brackets to avoid query parse exceptions
---
.../index/search/spi/query/FulltextIndex.java | 5 ++--
.../oak/plugins/index/FullTextIndexCommonTest.java | 30 ++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git
a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
index fb61936f8c..56edd3d635 100644
---
a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
+++
b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
@@ -281,14 +281,15 @@ public abstract class FulltextIndex implements
AdvancedQueryIndex, QueryIndex, N
}
/**
- * Following chars are used as operators in Lucene Query and should be
escaped
+ * Following chars are used as operators in Lucene and Elastic Queries and
should be escaped
*/
-private static final char[] QUERY_OPERATORS = {':' , '/', '!', '&', '|',
'='};
+private static final char[] QUERY_OPERATORS = {':' , '/', '!', '&', '|',
'=', '{', '}', '[', ']', '(', ')'};
/**
* Following logic is taken from
org.apache.jackrabbit.core.query.lucene.JackrabbitQueryParser#parse(java.lang.String)
*/
public static String rewriteQueryText(String textsearch) {
+
// replace escaped ' with just '
StringBuilder rewritten = new StringBuilder();
// most query parsers recognize 'AND' and 'NOT' as
diff --git
a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
index c60d348af9..f9851ec783 100644
---
a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
+++
b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/FullTextIndexCommonTest.java
@@ -88,4 +88,34 @@ public abstract class FullTextIndexCommonTest extends
AbstractQueryTest {
});
}
+
+@Test
+public void testWithSpecialCharsInSearchTerm() throws Exception {
+IndexDefinitionBuilder builder = indexOptions.createIndex(
+indexOptions.createIndexDefinitionBuilder(), false,
"analyzed_field");
+builder.noAsync();
+builder.indexRule("nt:base")
+.property("analyzed_field")
+.analyzed().nodeScopeIndex();
+
+indexOptions.setIndex(root, UUID.randomUUID().toString(), builder);
+root.commit();
+
+//add content
+Tree test = root.getTree("/").addChild("test");
+
+test.addChild("a").setProperty("analyzed_field", "foo");
+root.commit();
+
+assertEventually(() -> {
+assertQuery("//*[jcr:contains(@analyzed_field, '{foo}')] ", XPATH,
Collections.singletonList("/test/a"));
+assertQuery("//*[jcr:contains(@analyzed_field, '\\{foo}')] ",
XPATH, Collections.singletonList("/test/a"));
+assertQuery("//*[jcr:contains(@analyzed_field, 'foo:')] ", XPATH,
Collections.singletonList("/test/a"));
+assertQuery("//*[jcr:contains(@analyzed_field, '[foo]')] ", XPATH,
Collections.singletonList("/test/a"));
+assertQuery("//*[jcr:contains(@analyzed_field, '|foo/')] ", XPATH,
Collections.singletonList("/test/a"));
+assertQuery("//*[jcr:contains(@analyzed_field, '(&=!foo')] ",
XPATH, Collections.singletonList("/test/a"));
+});
+
+}
+
}
[jackrabbit-oak] branch trunk updated: OAK-9856 | Log query and caller stack trace in case of ES search fail… (#639)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/trunk by this push: new e1ef734223 OAK-9856 | Log query and caller stack trace in case of ES search fail… (#639) e1ef734223 is described below commit e1ef7342234bd233009affa47c0dcdf44e4fed89 Author: nit0906 AuthorDate: Wed Jul 27 09:32:30 2022 +0530 OAK-9856 | Log query and caller stack trace in case of ES search fail… (#639) * OAK-9856 | Log query and caller stack trace in case of ES search failures --- .../query/async/ElasticResultRowAsyncIterator.java | 25 +++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java index 6252f64c27..1d359705c1 100644 --- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java +++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java @@ -49,6 +49,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Predicate; @@ -71,11 +72,11 @@ public class ElasticResultRowAsyncIterator implements Iterator rowInclusionPredicate; private final ElasticMetricHandler metricHandler; private final LMSEstimator estimator; - private final ElasticQueryScanner elasticQueryScanner; private final ElasticRequestHandler elasticRequestHandler; private final ElasticResponseHandler elasticResponseHandler; private final ElasticFacetProvider elasticFacetProvider; +private final AtomicReference errorRef = new AtomicReference(); private FulltextResultRow nextRow; @@ -92,7 +93,6 @@ public class ElasticResultRowAsyncIterator implements Iterator
[jackrabbit-oak] branch 1.22 updated: Updating versions for oak-doc and oak-doc-railroad-macro to latest snapshot
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 733d95489c Updating versions for oak-doc and oak-doc-railroad-macro to latest snapshot 733d95489c is described below commit 733d95489cbaa74a44e11a61d6d93136b0d60759 Author: Nitin Gupta AuthorDate: Tue Jul 19 22:15:17 2022 +0530 Updating versions for oak-doc and oak-doc-railroad-macro to latest snapshot --- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-doc-railroad-macro/pom.xml b/oak-doc-railroad-macro/pom.xml index 569dcfcc93..6c40aa337d 100644 --- a/oak-doc-railroad-macro/pom.xml +++ b/oak-doc-railroad-macro/pom.xml @@ -22,7 +22,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.13-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index b2c5b26422..fc0afcf005 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.13-SNAPSHOT ../oak-parent/pom.xml
[jackrabbit-oak] branch 1.22 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new f6d69fb432 [maven-release-plugin] prepare for next development iteration f6d69fb432 is described below commit f6d69fb432e38f34e3e840a99bf80e5be42c6b47 Author: Nitin Gupta AuthorDate: Fri Jul 15 10:16:56 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 1f5e0afa0e..23ea7c8398 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 94986a427e..bbdea158ee 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index b04ae5bc71..a242e0eca8 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 75341d1b9b..110d976fe2 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 35fbeae17b..d23c1a347d 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 3981ac05fc..2d3d3d038f 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index e8ccdaa846..c1a93e26a1 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.12 +1.22.13-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 3fb6d89c9d..f3412c356b 100644 --- a/oak-blob
[jackrabbit-oak] annotated tag jackrabbit-oak-1.22.12 created (now fa93d9a719)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.22.12 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at fa93d9a719 (tag) tagging c0aedb0b0ea76c96397c5be747576e510815 (commit) replaces jackrabbit-oak-1.22.11 by Nitin Gupta on Fri Jul 15 10:16:42 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.22.12 --- No new revisions were added by this update.
[jackrabbit-oak] branch 1.22 updated: [maven-release-plugin] prepare release jackrabbit-oak-1.22.12
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new c0aedb0b88 [maven-release-plugin] prepare release jackrabbit-oak-1.22.12 c0aedb0b88 is described below commit c0aedb0b0ea76c96397c5be747576e510815 Author: Nitin Gupta AuthorDate: Fri Jul 15 10:11:49 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.22.12 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index a86cc239b9..1f5e0afa0e 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index c0435ae2ff..94986a427e 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 9370a8f381..b04ae5bc71 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index e7e762e2d9..75341d1b9b 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 838eef7f63..35fbeae17b 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 69281f11ce..3981ac05fc 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index b5b8af0530..e8ccdaa846 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.12-SNAPSHOT +1.22.12 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 87e924119c..3fb6d89c9d 100644 --- a/oak-blob
[jackrabbit-oak] branch 1.22 updated: Apache Jackrabbit Oak 1.22.12 candidate Release Notes
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 84b8043f2a Apache Jackrabbit Oak 1.22.12 candidate Release Notes
84b8043f2a is described below
commit 84b8043f2ab00e1207ee3d7a275faeffb57ba409
Author: Nitin Gupta
AuthorDate: Thu Jul 14 13:07:05 2022 +0530
Apache Jackrabbit Oak 1.22.12 candidate Release Notes
---
RELEASE-NOTES.txt | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0c07b1afa5..dc4c49a210 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,4 +1,4 @@
-Release Notes -- Apache Jackrabbit Oak -- Version 1.22.11
+Release Notes -- Apache Jackrabbit Oak -- Version 1.22.12
Introduction
@@ -7,7 +7,7 @@ Jackrabbit Oak is a scalable, high-performance hierarchical
content
repository designed for use as the foundation of modern world-class
web sites and other demanding content applications.
-Jackrabbit Oak 1.22.11 is a patch release that contains fixes and
+Jackrabbit Oak 1.22.12 is a patch release that contains fixes and
improvements over Oak 1.22. Jackrabbit Oak 1.22.x releases are
considered stable and targeted for production use.
@@ -15,21 +15,19 @@ The Oak effort is a part of the Apache Jackrabbit project.
Apache Jackrabbit is a project of the Apache Software Foundation.
-Changes in Oak 1.22.11
+Changes in Oak 1.22.12
-
Bug
-[OAK-9653] - Adding the index tag option interferes with regex properties,
leads to return zero results
-
-New Feature
-
-[OAK-9587] - Add an attribute to enforce a strict index tag check
("selectionPolicy")
+[OAK-9773] - DefaultSyncContext#syncMembership() compares external ids
case-sensitively
Improvement
-[OAK-9634] - CacheLIRS: test failure with ARM processor
-[OAK-9651] - Protection against very large queries
+[OAK-9404] - Missing nullability annotations in
org.apache.jackrabbit.oak.plugins.tree
+[OAK-9405] - Reduce complexity of TreeUtil
+[OAK-9527] - Typos in security related API
+
In addition to the above-mentioned changes, this release contains
all changes included up to the previous Apache Jackrabbit Oak 1.22.x release.
[jackrabbit-oak] branch trunk updated: OAK-9755 | Lucene metrics using labels (#565)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new b213b4696c OAK-9755 | Lucene metrics using labels (#565)
b213b4696c is described below
commit b213b4696cb4deb241915f8c7aeb08061bc5acc4
Author: nit0906
AuthorDate: Thu May 12 19:59:11 2022 +0530
OAK-9755 | Lucene metrics using labels (#565)
* OAK-9755 | Introducing labels for Lucene jmx metrics
* Exporting org.apache.jackrabbit.oak.plugins.metric.util package from
oak-core
---
oak-core/pom.xml | 1 +
.../oak/plugins/metric/util/StatsProviderUtil.java | 67 ++
.../oak/plugins/metric/util/package-info.java | 24
.../jackrabbit/oak/query/ast/SelectorImpl.java | 8 ++-
.../lucene/LuceneIndexStatsUpdateCallback.java | 19 --
.../oak/plugins/index/lucene/hybrid/NRTIndex.java | 17 --
.../index/elastic/ElasticMetricHandler.java| 14 ++---
7 files changed, 129 insertions(+), 21 deletions(-)
diff --git a/oak-core/pom.xml b/oak-core/pom.xml
index a75bd7e9f1..706a27fbf1 100644
--- a/oak-core/pom.xml
+++ b/oak-core/pom.xml
@@ -71,6 +71,7 @@
org.apache.jackrabbit.oak.plugins.observation.filter,
org.apache.jackrabbit.oak.plugins.tree.factories,
org.apache.jackrabbit.oak.plugins.version,
+org.apache.jackrabbit.oak.plugins.metric.util
org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule,
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/util/StatsProviderUtil.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/util/StatsProviderUtil.java
new file mode 100644
index 00..5e6c243354
--- /dev/null
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/util/StatsProviderUtil.java
@@ -0,0 +1,67 @@
+/*
+ * 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.plugins.metric.util;
+
+import org.apache.jackrabbit.oak.stats.CounterStats;
+import org.apache.jackrabbit.oak.stats.HistogramStats;
+import org.apache.jackrabbit.oak.stats.MeterStats;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.apache.jackrabbit.oak.stats.StatsOptions;
+import org.apache.jackrabbit.oak.stats.TimerStats;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.function.BiFunction;
+
+/**
+ * Util class to generate a name for Stats implementations that can be used
for creating labels in prometheus.
+ * Usage - StatsProviderUtil().getHistoStats().apply(metricName, labels)
+ * where metricName is a String to denote the metric name and labels is map of
label values.
+ * Resultant metric will be created with a name as follows -
+ * metricName;labelName1=labelValue1;labelName2=labelValue2
+ * This can then be translated by a consuming alerting system like prometheus
into metric name and labels separately.
+ */
+public class StatsProviderUtil {
+
+private final StatisticsProvider statisticsProvider;
+private final BiFunction, String> METRIC =
(name, labels) -> labels.entrySet().stream().reduce(name,
+(n, e) -> n + ";" + e.getKey() + "=" + e.getValue(),
+(n1, n2) -> n1 + n2);
+
+public StatsProviderUtil(@NotNull StatisticsProvider statisticsProvider) {
+this.statisticsProvider = statisticsProvider;
+}
+
+public BiFunction, HistogramStats>
getHistoStats() {
+return (name, labels) ->
statisticsProvider.getHistogram(METRIC.apply(name, labels),
StatsOptions.METRICS_ONLY);
+}
+
+public BiFunction, CounterStats>
getCounterStats() {
+return (name, labels) ->
statisticsProvider.getCounterStats(METRIC.apply(name, labels),
StatsOptions.METRICS_ONLY);
+}
+
+public BiFunction, TimerStats> getTimerStats()
{
+return (name, labels) ->
statisticsProvider.getTimer(METRIC.apply(name, labels),
S
[jackrabbit-oak] branch trunk updated: Oak-9729 | Improving ES test container creation for ES tests (#559)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3038fd67fc Oak-9729 | Improving ES test container creation for ES
tests (#559)
3038fd67fc is described below
commit 3038fd67fc276fad3d45b31522e774f3671da369
Author: nit0906
AuthorDate: Thu May 5 15:13:35 2022 +0530
Oak-9729 | Improving ES test container creation for ES tests (#559)
* OAK-9729 | Adding retry in starting up ES container and refactoring the
singleton part of code
---
.../index/elastic/ElasticConnectionRule.java | 2 +-
.../plugins/index/elastic/ElasticTestServer.java | 42 --
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
index fef6001482..6b854b13c1 100644
---
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
@@ -56,7 +56,7 @@ public class ElasticConnectionRule extends ExternalResource {
public Statement apply(Statement base, Description description) {
Statement s = super.apply(base, description);
if (elasticConnectionString == null ||
getElasticConnectionFromString() == null) {
-elastic = ElasticTestServer.getESTestServer().container();
+elastic = ElasticTestServer.getESTestServer();
setUseDocker(true);
}
return s;
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
index a7ee1c69a1..0ae7d4c36a 100644
---
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
@@ -44,23 +44,32 @@ public class ElasticTestServer implements AutoCloseable {
private static final Logger LOG =
LoggerFactory.getLogger(ElasticTestServer.class);
private static final String PLUGIN_DIGEST =
"db479aeee452b2a0f6e3c619ecdf27ca5853e54e7bc787e5c56a49899c249240";
-private static ElasticTestServer esTestServer;
-private volatile ElasticsearchContainer elasticsearchContainer;
+private static ElasticTestServer esTestServer = new ElasticTestServer();
+private static volatile ElasticsearchContainer elasticsearchContainer;
-public static synchronized ElasticTestServer getESTestServer() {
-if (esTestServer == null) {
-LOG.info("Starting ES test server");
-esTestServer = new ElasticTestServer();
-esTestServer.setup();
-Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-LOG.info("Stopping global ES test server.");
-esTestServer.close();
-}));
+private ElasticTestServer() {
+}
+
+public static synchronized ElasticsearchContainer getESTestServer() {
+// Setup a new ES container if elasticsearchContainer is null or not
running
+if (elasticsearchContainer == null ||
!elasticsearchContainer.isRunning()) {
+LOG.info("Starting ES test server");
+esTestServer.setup();
+// Check if the ES container started, if not then cleanup and
throw an exception
+// No need to run the tests further since they will anyhow fail.
+if (elasticsearchContainer == null ||
!elasticsearchContainer.isRunning()) {
+esTestServer.close();
+throw new RuntimeException("Unable to start ES container after
retries. Any further tests will fail");
}
-return esTestServer;
+Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+LOG.info("Stopping global ES test server.");
+esTestServer.close();
+}));
+}
+return elasticsearchContainer;
}
-private synchronized void setup() {
+private synchronized void setup() {
final String pluginVersion = "7.16.3.0";
final String pluginFileName = "elastiknn-" + pluginVersion + ".zip";
final String localPluginPath = "target/" + pluginFileName;
@@ -71,7 +80,8 @@ public class ElasticTestServer implements AutoCloseable {
.withCopyFileToContainer(MountableFile.f
[jackrabbit-oak] branch trunk updated: Using a global ES docker container that is only created once durign t… (#554)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2cc36a150a Using a global ES docker container that is only created
once durign t… (#554)
2cc36a150a is described below
commit 2cc36a150a7dcce87abba49a73ee2a75bf9512b4
Author: nit0906
AuthorDate: Fri Apr 29 18:43:10 2022 +0530
Using a global ES docker container that is only created once durign t…
(#554)
* Using a global ES docker container that is only created once durign the
execution of oak-search-elastic
---
oak-parent/pom.xml | 2 +-
.../index/elastic/ElasticConnectionRule.java | 96 +++-
.../index/elastic/ElasticIndexCleanerTest.java | 2 +-
...cConnectionRule.java => ElasticTestServer.java} | 123 ++---
4 files changed, 53 insertions(+), 170 deletions(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 7af7a8bdcf..6784630710 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -67,7 +67,7 @@
2.10.5.1
-1.16.3
+1.17.1
4.13.1
1.8
java18
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
index e893197809..fef6001482 100644
---
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java
@@ -16,34 +16,19 @@
*/
package org.apache.jackrabbit.oak.plugins.index.elastic;
-import com.github.dockerjava.api.DockerClient;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.jackrabbit.oak.commons.IOUtils;
-import org.elasticsearch.Version;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.elasticsearch.client.RequestOptions;
import org.junit.rules.ExternalResource;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.DockerClientFactory;
-import org.testcontainers.containers.Network;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
-import org.testcontainers.utility.MountableFile;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import static org.junit.Assume.assumeNotNull;
/*
To be used as a @ClassRule
@@ -52,14 +37,14 @@ public class ElasticConnectionRule extends ExternalResource
{
private static final Logger LOG =
LoggerFactory.getLogger(ElasticConnectionRule.class);
-private static final String INDEX_PREFIX = "elastic_test";
-private static final String PLUGIN_DIGEST =
"db479aeee452b2a0f6e3c619ecdf27ca5853e54e7bc787e5c56a49899c249240";
+private final String indexPrefix;
private static boolean useDocker = false;
private final String elasticConnectionString;
public ElasticConnectionRule(String elasticConnectionString) {
this.elasticConnectionString = elasticConnectionString;
+indexPrefix = "elastic_test_" + RandomStringUtils.random(5, true,
false).toLowerCase();
}
public ElasticsearchContainer elastic;
@@ -70,22 +55,8 @@ public class ElasticConnectionRule extends ExternalResource {
@Override
public Statement apply(Statement base, Description description) {
Statement s = super.apply(base, description);
-// see if docker is to be used or not... initialize docker rule only
if that's the case.
-final String pluginVersion = "7.16.3.0";
-final String pluginFileName = "elastiknn-" + pluginVersion + ".zip";
-final String localPluginPath = "target/" + pluginFileName;
-downloadSimilaritySearchPluginIfNotExists(localPluginPath,
pluginVersion);
if (elasticConnectionString == null ||
getElasticConnectionFromString() == null) {
-checkIfDockerClientAvailable();
-Network network = Network.newNetwork();
-
-elastic = new
ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:" +
Version.CURRENT)
-
.withCopyFileToCont
[jackrabbit-oak] branch trunk updated: Ofsetting corrupt index counter value when index is fixed (#526)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 871ce1b Ofsetting corrupt index counter value when index is fixed
(#526)
871ce1b is described below
commit 871ce1bb28712c16ba75b57538fb49e14bc135a3
Author: nit0906
AuthorDate: Wed Mar 23 15:06:40 2022 +0530
Ofsetting corrupt index counter value when index is fixed (#526)
---
.../plugins/index/TrackingCorruptIndexHandler.java | 7 -
.../index/TrackingCorruptIndexHandlerTest.java | 32 ++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
index d2a984a..565786e 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandler.java
@@ -94,7 +94,12 @@ public class TrackingCorruptIndexHandler implements
CorruptIndexHandler {
}
}
if (meter != null) {
-meter.mark(indexes.size());
+// indexes.size() gives us the number of remaining corrupt indices.
+// meter.mark(indexes.size()) increments the current meter count
by indexes.size(). We don't want that here.
+// We actually want to set the the meter count to indexes.size(),
the api doesn't seem to support that.
+// So we instead add indexes.size() - meter.getCount() , which
will always be <= 0. So this effectively will reduce the meter count
+// by number of indexes fixed in this call.
+meter.mark(indexes.size() - meter.getCount());
}
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandlerTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandlerTest.java
index fe07de3..880712f 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandlerTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/TrackingCorruptIndexHandlerTest.java
@@ -21,9 +21,16 @@ package org.apache.jackrabbit.oak.plugins.index;
import java.util.Calendar;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
+import org.apache.jackrabbit.oak.stats.MeterStats;
+import org.apache.jackrabbit.oak.stats.StatsOptions;
+import org.junit.After;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -32,6 +39,12 @@ public class TrackingCorruptIndexHandlerTest {
private TrackingCorruptIndexHandler handler = new
TrackingCorruptIndexHandler();
private Clock clock = new Clock.Virtual();
+private final ScheduledExecutorService scheduledExecutorService =
Executors.newSingleThreadScheduledExecutor();
+
+@After
+public void cleanup() {
+scheduledExecutorService.shutdown();
+}
@Test
public void basics() throws Exception{
@@ -52,6 +65,25 @@ public class TrackingCorruptIndexHandlerTest {
}
@Test
+public void testCorruptCounter() {
+MeterStats meter = new
DefaultStatisticsProvider(scheduledExecutorService).
+getMeter(TrackingCorruptIndexHandler.CORRUPT_INDEX_METER_NAME,
StatsOptions.METRICS_ONLY);
+
+handler.setMeterStats(meter);
+handler.setClock(clock);
+handler.indexUpdateFailed("async", "/oak:index/foo", new Exception());
+assertEquals(1, meter.getCount());
+handler.indexUpdateFailed("async", "/oak:index/bar", new Exception());
+assertEquals(2, meter.getCount());
+
+HashSet set = new HashSet<>();
+set.add("/oak:index/foo");
+handler.markWorkingIndexes(set);
+
+assertEquals(1, meter.getCount());
+}
+
+@Test
public void disbaled() throws Exception{
handler.setClock(clock);
handler.indexUpdateFailed("async", "/oak:index/foo", new Exception());
[jackrabbit-oak] branch trunk updated: OAK-9714 | Adding support to be able to build FlatFileStore independe… (#514)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new a316bb3 OAK-9714 | Adding support to be able to build FlatFileStore
independe… (#514)
a316bb3 is described below
commit a316bb31e648eef28e9e7b700b657a08035cb77f
Author: nit0906
AuthorDate: Mon Mar 21 18:30:54 2022 +0530
OAK-9714 | Adding support to be able to build FlatFileStore independe…
(#514)
* OAK-9714 | Adding support to be able to build FlatFileStore independent
of the index method in DocumentStoreIndexer
---
.../oak/plugins/index/importer/IndexImporter.java | 16 ++-
.../oak/plugins/index/importer/package-info.java | 2 +-
oak-run-commons/pom.xml| 5 +++
.../apache/jackrabbit/oak/index/IndexOptions.java | 6 +++
.../jackrabbit/oak/index/IndexerSupport.java | 2 +-
.../indexer/document/DocumentStoreIndexerBase.java | 52 --
.../flatfile/FlatFileNodeStoreBuilder.java | 2 +-
.../indexer/document/flatfile/FlatFileStore.java | 9
.../apache/jackrabbit/oak/index/IndexCommand.java | 7 +++
9 files changed, 93 insertions(+), 8 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
index 37bd81b..fb86df7 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
@@ -57,6 +57,11 @@ public class IndexImporter {
* Symbolic name use to indicate sync indexes
*/
static final String ASYNC_LANE_SYNC = "sync";
+/*
+* System property name for flag for preserve checkpoint. If this is set to
true, then checkpoint cleanup will be skipped.
+* Default is set to false.
+ */
+public static final String OAK_INDEX_IMPORTER_PRESERVE_CHECKPOINT =
"oak.index.importer.preserveCheckpoint";
private final Logger log = LoggerFactory.getLogger(getClass());
private final NodeStore nodeStore;
@@ -69,6 +74,7 @@ public class IndexImporter {
private final IndexEditorProvider indexEditorProvider;
private final AsyncIndexerLock indexerLock;
private final IndexDefinitionUpdater indexDefinitionUpdater;
+private final boolean preserveCheckpoint =
Boolean.getBoolean(OAK_INDEX_IMPORTER_PRESERVE_CHECKPOINT);
public IndexImporter(NodeStore nodeStore, File indexDir,
IndexEditorProvider indexEditorProvider,
AsyncIndexerLock indexerLock) throws IOException {
@@ -290,8 +296,14 @@ public class IndexImporter {
}
private void releaseCheckpoint() {
-nodeStore.release(indexerInfo.checkpoint);
-log.info("Released the referred checkpoint [{}]",
indexerInfo.checkpoint);
+if (preserveCheckpoint) {
+log.info("Preserving the referred checkpoint [{}]. This could have
been done in case this checkpoint is needed by a process later on." +
+" Please make sure to remove the checkpoint once it's no
longer needed.", indexerInfo.checkpoint);
+} else {
+nodeStore.release(indexerInfo.checkpoint);
+log.info("Released the referred checkpoint [{}]",
indexerInfo.checkpoint);
+}
+
}
private void incrementReIndexCount(NodeBuilder definition) {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
index 9872f08..2ebba64 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("0.1.0")
+@Version("0.2.0")
package org.apache.jackrabbit.oak.plugins.index.importer;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
index e8e1d77..d19a44f 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -61,6 +61,11 @@
oak-segment-tar
${project.version}
+
+org.apache.jackrabbit
+oak-search
+${project.version}
+
org.apache.jackrabbit
oak-segment-remote
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexOptions.java
b/oak-run-commons/src/main/java/org/apache/jac
[jackrabbit-oak] branch 1.6 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.6 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.6 by this push: new 01498e7 [maven-release-plugin] prepare for next development iteration 01498e7 is described below commit 01498e7a3c5ccade4fe7da869b61c493298c5063 Author: Nitin Gupta AuthorDate: Fri Mar 11 21:12:30 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-auth-external/pom.xml | 2 +- oak-auth-ldap/pom.xml | 2 +- oak-authorization-cug/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml| 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob/pom.xml| 2 +- oak-commons/pom.xml | 2 +- oak-core/pom.xml| 2 +- oak-examples/pom.xml| 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml| 2 +- oak-http/pom.xml| 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-remote/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-segment-tar/pom.xml | 2 +- oak-segment/pom.xml | 2 +- oak-solr-core/pom.xml | 2 +- oak-solr-osgi/pom.xml | 2 +- oak-tarmk-standby/pom.xml | 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 5862967..330c6d7 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 1e068e7..0ddf45c 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 48963a7..6e7582b 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 78ceac5..e71d2bb 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 0ce36db..210a40f 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob/pom.xml b/oak-blob/pom.xml index 08f6cc7..42c7514 100644 --- a/oak-blob/pom.xml +++ b/oak-blob/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml index d137bb3..3bc4f9d 100644 --- a/oak-commons/pom.xml +++ b/oak-commons/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-core/pom.xml b/oak-core/pom.xml index 9550df2..cbc22e0 100644 --- a/oak-core/pom.xml +++ b/oak-core/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-examples/pom.xml b/oak-examples/pom.xml index 9a930d4..db894f1 100644 --- a/oak-examples/pom.xml +++ b/oak-examples/pom.xml @@ -25,7 +25,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-examples/standalone/pom.xml b/oak-examples/standalone/pom.xml index 24d8f96..5eb9460 100644 --- a/oak-examples/standalone/pom.xml +++ b/oak-examples/standalone/pom.xml @@ -26,7 +26,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../../oak-parent/pom.xml oak-standalone diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 1f07793..b803d0f 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -26,7 +26,7 @@ org.apache.jackrabbit oak-parent -1.6.23 +1.6.24-SNAPSHOT ../../oak-parent/pom.xml oak
[jackrabbit-oak] annotated tag jackrabbit-oak-1.6.23 created (now 5d1d64d)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.6.23 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git. at 5d1d64d (tag) tagging 6d32083bf603942ac4df0b1aa47b30e2119e4feb (commit) replaces jackrabbit-oak-1.6.22 by Nitin Gupta on Fri Mar 11 21:12:12 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.6.23 --- No new revisions were added by this update.
[jackrabbit-oak] branch 1.22 updated: Updating poms to latest snapshot for non reactor modules
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new c844a9c Updating poms to latest snapshot for non reactor modules c844a9c is described below commit c844a9c60868eb685cd6418274c415bc7381ad37 Author: Nitin Gupta AuthorDate: Thu Feb 24 10:14:24 2022 +0530 Updating poms to latest snapshot for non reactor modules --- oak-doc-railroad-macro/pom.xml | 2 +- oak-doc/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-doc-railroad-macro/pom.xml b/oak-doc-railroad-macro/pom.xml index 7ea69fb..569dcfc 100644 --- a/oak-doc-railroad-macro/pom.xml +++ b/oak-doc-railroad-macro/pom.xml @@ -22,7 +22,7 @@ org.apache.jackrabbit oak-parent -1.22.10-SNAPSHOT +1.22.12-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index 86c3bd6..b2c5b26 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.10-SNAPSHOT +1.22.12-SNAPSHOT ../oak-parent/pom.xml
[jackrabbit-oak] branch trunk updated: OAK-9690 | Adding bringIndexUptoDate support for elastic index post offline reindexing (#492)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new bfa326d OAK-9690 | Adding bringIndexUptoDate support for elastic
index post offline reindexing (#492)
bfa326d is described below
commit bfa326d467074656711174c60ef0ba390b77a9c1
Author: nit0906
AuthorDate: Wed Feb 23 17:15:52 2022 +0530
OAK-9690 | Adding bringIndexUptoDate support for elastic index post offline
reindexing (#492)
---
.../plugins/index/importer/AsyncLaneSwitcher.java | 4 +
.../oak/plugins/index/importer/package-info.java | 20
.../oak/index/IndexImporterSupportBase.java| 44 +++--
.../jackrabbit/oak/index/IndexerSupport.java | 6 +-
.../jackrabbit/oak/index/ElasticIndexCommand.java | 60 +---
.../oak/index/ElasticIndexImporterSupport.java | 102 +
.../jackrabbit/oak/index/ElasticIndexOptions.java | 5 -
.../oak/index/ElasticIndexerSupport.java | 63 +
.../jackrabbit/oak/index/IndexImporterSupport.java | 21 ++---
.../index/elastic/ElasticIndexImporter.java| 45 +
.../elastic/index/ElasticBulkProcessorHandler.java | 8 +-
11 files changed, 285 insertions(+), 93 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
index e053ede..2e9e45a 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/AsyncLaneSwitcher.java
@@ -77,6 +77,10 @@ public class AsyncLaneSwitcher {
idxBuilder.setProperty(newAsyncState);
}
+public static boolean isLaneSwitched(NodeBuilder idxBuilder) {
+return idxBuilder.hasProperty(ASYNC_PREVIOUS);
+}
+
public static String getTempLaneName(String laneName){
return TEMP_LANE_PREFIX + laneName;
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
new file mode 100644
index 000..9872f08
--- /dev/null
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+@Version("0.1.0")
+package org.apache.jackrabbit.oak.plugins.index.importer;
+
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexImporterSupport.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexImporterSupportBase.java
similarity index 57%
copy from
oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexImporterSupport.java
copy to
oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexImporterSupportBase.java
index 6c77c73..7e57e29 100644
---
a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexImporterSupport.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/IndexImporterSupportBase.java
@@ -16,33 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.index;
-import java.io.File;
-import java.io.IOException;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.importer.AsyncIndexerLock;
import org.apache.jackrabbit.oak.plugins.index.importer.ClusterNodeStoreLock;
import org.apache.jackrabbit.oak.plugins.index.importer.IndexImporter;
-import
org.apache.jackrabbit.oak.plugins.index.lucene.directory.LuceneIndexImporter;
-import
org.apache.jackrabbit.oak.plugins.index.property.Proper
[jackrabbit-oak] branch 1.22 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new c8e2b1e [maven-release-plugin] prepare for next development iteration c8e2b1e is described below commit c8e2b1e9111f5455c976f2d9455bbc4dc13c3e30 Author: Nitin Gupta AuthorDate: Tue Feb 22 11:17:42 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 9cd83af..a86cc23 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 87bdd6a..c0435ae 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index c60957d..9370a8f 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 654524d..e7e762e 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index d1c8edb..838eef7 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index c058e7e..69281f1 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index aff285f..b5b8af0 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.11 +1.22.12-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 618ad6e..87e9241 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -21,7 +21,7
[jackrabbit-oak] annotated tag jackrabbit-oak-1.22.11 created (now 603528e)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.22.11 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git. at 603528e (tag) tagging 742b3e67831be35e8896e073dd537e2be72e0570 (commit) replaces jackrabbit-oak-1.22.10 by Nitin Gupta on Tue Feb 22 11:17:15 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.22.11 --- No new revisions were added by this update.
[jackrabbit-oak] branch 1.22 updated: [maven-release-plugin] prepare release jackrabbit-oak-1.22.11
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.22 by this push: new 742b3e6 [maven-release-plugin] prepare release jackrabbit-oak-1.22.11 742b3e6 is described below commit 742b3e67831be35e8896e073dd537e2be72e0570 Author: Nitin Gupta AuthorDate: Tue Feb 22 11:11:09 2022 +0530 [maven-release-plugin] prepare release jackrabbit-oak-1.22.11 --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml| 2 +- oak-auth-ldap/pom.xml| 2 +- oak-authorization-cug/pom.xml| 2 +- oak-authorization-principalbased/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml | 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml | 2 +- oak-blob/pom.xml | 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml | 2 +- oak-core/pom.xml | 2 +- oak-examples/pom.xml | 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml | 2 +- oak-http/pom.xml | 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jackrabbit-api/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml| 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-elastic/pom.xml | 2 +- oak-search-mt/pom.xml| 2 +- oak-search/pom.xml | 2 +- oak-security-spi/pom.xml | 2 +- oak-segment-azure/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml| 2 +- oak-solr-osgi/pom.xml| 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml| 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 41 files changed, 43 insertions(+), 43 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 3282234..9cd83af 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index f5499d3..87bdd6a 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 8ce49a3..c60957d 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 4462e05..654524d 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 4b04a6d..d1c8edb 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 675fa97..c058e7e 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 0b75bb6..aff285f 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.22.11-SNAPSHOT +1.22.11 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index e1830ef..618ad6e 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -21,7 +21,7
[jackrabbit-oak] branch 1.22 updated: Release notes for Oak 1.22.11
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 0c1a66c Release notes for Oak 1.22.11
0c1a66c is described below
commit 0c1a66cd4a92e4ed1772dc0294ab5c3ff2cac4ea
Author: Nitin Gupta
AuthorDate: Tue Feb 22 08:23:23 2022 +0530
Release notes for Oak 1.22.11
---
RELEASE-NOTES.txt | 34 +-
1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 74cdcd1..0c07b1a 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,4 +1,4 @@
-Release Notes -- Apache Jackrabbit Oak -- Version 1.22.10
+Release Notes -- Apache Jackrabbit Oak -- Version 1.22.11
Introduction
@@ -7,7 +7,7 @@ Jackrabbit Oak is a scalable, high-performance hierarchical
content
repository designed for use as the foundation of modern world-class
web sites and other demanding content applications.
-Jackrabbit Oak 1.22.10 is a patch release that contains fixes and
+Jackrabbit Oak 1.22.11 is a patch release that contains fixes and
improvements over Oak 1.22. Jackrabbit Oak 1.22.x releases are
considered stable and targeted for production use.
@@ -15,29 +15,21 @@ The Oak effort is a part of the Apache Jackrabbit project.
Apache Jackrabbit is a project of the Apache Software Foundation.
-Changes in Oak 1.22.10
+Changes in Oak 1.22.11
-
Bug
-[OAK-8948] - ObservationManager.addEventListener() throws NPE with invalid
paths in filter
-[OAK-9562] - Missing _bin when node is recreated after revision GC
-[OAK-9591] - Implement hashcode() and equals() method in ItemDefinitionImpl
-[OAK-9616] - Node.setPrimaryType() does not always support expanded names
-
-Task
-
-[OAK-8974] - VersionGarbageCollectorIT should use fixtures from
AbstractDocumentStoreTest
-[OAK-9458] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.3
-[OAK-9600] - Make "standby.secure" configurable
-[OAK-9611] - Bump netty dependency from 4.1.66.Final to 4.1.68.Final
-[OAK-9615] - Update Oak trunk and Oak 1.22 to Jackrabbit 2.20.4
-[OAK-9641] - Update Logback version to 1.2.8
-[OAK-9643] - Update slf4j dependency to 1.7.32
-[OAK-9645] - oak-solr-core - avoid transitive log4j test dependency
-[OAK-9652] - Update Logback version to 1.2.10
-[OAK-9661] - Upgrade Solr to v8.11.1
-[OAK-9668] - Update H2DB dependency
+[OAK-9653] - Adding the index tag option interferes with regex properties,
leads to return zero results
+
+New Feature
+
+[OAK-9587] - Add an attribute to enforce a strict index tag check
("selectionPolicy")
+
+Improvement
+
+[OAK-9634] - CacheLIRS: test failure with ARM processor
+[OAK-9651] - Protection against very large queries
In addition to the above-mentioned changes, this release contains
all changes included up to the previous Apache Jackrabbit Oak 1.22.x release.
[jackrabbit-oak] branch 1.8 updated: Updating oak-doc to latest snapshot version
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.8 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.8 by this push: new 129e126 Updating oak-doc to latest snapshot version 129e126 is described below commit 129e126ccb48d0128809d5c76e4b9ef57a8bf4fd Author: nit0906 AuthorDate: Fri Feb 4 14:00:52 2022 +0530 Updating oak-doc to latest snapshot version --- oak-doc/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index 7e3db10..f76a2ea 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.8.22-SNAPSHOT +1.8.27-SNAPSHOT ../oak-parent/pom.xml
[jackrabbit-oak] branch 1.22 updated: OAK-9651: Protection against very large queries (#446) (#476)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 9c0cca3 OAK-9651: Protection against very large queries (#446) (#476)
9c0cca3 is described below
commit 9c0cca33bdaf03becf936e133eda32d809b188a2
Author: Andrew Khoury
AuthorDate: Thu Feb 3 20:05:30 2022 -0800
OAK-9651: Protection against very large queries (#446) (#476)
Co-authored-by: Mohit Kataria
---
.../jackrabbit/oak/query/QueryEngineImpl.java | 9 +-
.../jackrabbit/oak/query/QueryEngineSettings.java | 16
.../oak/query/stats/QueryStatsMBeanImpl.java | 11 ++-
.../jackrabbit/oak/query/QueryLimitTest.java | 106 +
.../jackrabbit/oak/query/stats/QueryStatsTest.java | 38
5 files changed, 178 insertions(+), 2 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
index c9bcb18..2a4e1a1 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
@@ -151,12 +151,19 @@ public abstract class QueryEngineImpl implements
QueryEngine {
} else {
LOG.debug("Parsing {} statement: {}", language, statement);
}
+QueryEngineSettings settings = context.getSettings();
+if (statement.length() > (settings.getQueryLengthErrorLimit())){
+LOG.error("Too large query: " + statement);
+throw new ParseException("Query length "+ statement.length() + "
is larger than max supported query length: " +
settings.getQueryLengthErrorLimit(), 0);
+}
+if (statement.length() > (settings.getQueryLengthWarnLimit())){
+LOG.warn("Query length {} breached queryWarnLimit {}. Query: {}",
statement.length(), settings.getQueryLengthWarnLimit(), statement);
+}
NamePathMapper mapper = new NamePathMapperImpl(
new LocalNameMapper(context.getRoot(), mappings));
NodeTypeInfoProvider nodeTypes = context.getNodeTypeInfoProvider();
-QueryEngineSettings settings = context.getSettings();
settings.getQueryValidator().checkStatement(statement);
QueryExecutionStats stats =
settings.getQueryStatsReporter().getQueryExecution(statement, language);
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
index 61a4447..e8ab8f0 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java
@@ -88,6 +88,22 @@ public class QueryEngineSettings implements
QueryEngineSettingsMBean, QueryLimit
private final QueryValidator queryValidator = new QueryValidator();
+
+private static final String OAK_QUERY_LENGTH_WARN_LIMIT =
"oak.query.length.warn.limit";
+private static final String OAK_QUERY_LENGTH_ERROR_LIMIT =
"oak.query.length.error.limit";
+
+private final long queryLengthWarnLimit =
Long.getLong(OAK_QUERY_LENGTH_WARN_LIMIT, 1024 * 1024); // 1 MB
+private final long queryLengthErrorLimit =
Long.getLong(OAK_QUERY_LENGTH_ERROR_LIMIT, 100 * 1024 * 1024); //100MB
+
+
+public long getQueryLengthWarnLimit() {
+return queryLengthWarnLimit;
+}
+
+public long getQueryLengthErrorLimit() {
+return queryLengthErrorLimit;
+}
+
public QueryEngineSettings() {
statisticsProvider = StatisticsProvider.NOOP;
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/stats/QueryStatsMBeanImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/stats/QueryStatsMBeanImpl.java
index 781b8ff..51b3ae1 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/stats/QueryStatsMBeanImpl.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/stats/QueryStatsMBeanImpl.java
@@ -42,10 +42,12 @@ public class QueryStatsMBeanImpl extends
AnnotatedStandardMBean
private final Logger log = LoggerFactory.getLogger(getClass());
private final int SLOW_QUERY_LIMIT_SCANNED =
Integer.getInteger("oak.query.slowScanLimit", 10);
-private final int MAX_STATS_DATA =
+private final int MAX_STATS_DATA =
Integer.getInteger("oak.query.stats", 5000);
private final int MAX_POPULAR_QUERIES =
Integer.getInteger("oak.query.slowLimit", 100);
+private final int MAX_QUERY_SIZE =
+Integer.getInteger("oak.query.maxQuerySize", 2048);
[jackrabbit-oak] branch 1.8 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a commit to branch 1.8 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git The following commit(s) were added to refs/heads/1.8 by this push: new 410fdfc [maven-release-plugin] prepare for next development iteration 410fdfc is described below commit 410fdfc4f3eec5528aebd0e424f28b5a165469a8 Author: Nitin Gupta AuthorDate: Tue Feb 1 12:49:14 2022 +0530 [maven-release-plugin] prepare for next development iteration --- oak-api/pom.xml | 2 +- oak-auth-external/pom.xml | 2 +- oak-auth-ldap/pom.xml | 2 +- oak-authorization-cug/pom.xml | 2 +- oak-benchmarks/pom.xml | 2 +- oak-blob-cloud-azure/pom.xml| 2 +- oak-blob-cloud/pom.xml | 2 +- oak-blob-plugins/pom.xml| 2 +- oak-blob/pom.xml| 2 +- oak-commons/pom.xml | 2 +- oak-core-spi/pom.xml| 2 +- oak-core/pom.xml| 2 +- oak-examples/pom.xml| 2 +- oak-examples/standalone/pom.xml | 2 +- oak-examples/webapp/pom.xml | 2 +- oak-exercise/pom.xml| 2 +- oak-http/pom.xml| 2 +- oak-it-osgi/pom.xml | 2 +- oak-it/pom.xml | 2 +- oak-jcr/pom.xml | 2 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 ++-- oak-pojosr/pom.xml | 2 +- oak-query-spi/pom.xml | 2 +- oak-run-commons/pom.xml | 2 +- oak-run/pom.xml | 2 +- oak-search-mt/pom.xml | 2 +- oak-security-spi/pom.xml| 2 +- oak-segment-tar/pom.xml | 2 +- oak-solr-core/pom.xml | 2 +- oak-solr-osgi/pom.xml | 2 +- oak-store-composite/pom.xml | 2 +- oak-store-document/pom.xml | 2 +- oak-store-spi/pom.xml | 2 +- oak-upgrade/pom.xml | 2 +- pom.xml | 4 ++-- 36 files changed, 38 insertions(+), 38 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 5323819..5cd5ed1 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index e760025..909de2f 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 31100f4..8d7a067 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index f1b4c6f..a1b4555 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml index 7d87f0f..a14d185 100644 --- a/oak-benchmarks/pom.xml +++ b/oak-benchmarks/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-blob-cloud-azure/pom.xml b/oak-blob-cloud-azure/pom.xml index 2c2531f..01e8ab2 100644 --- a/oak-blob-cloud-azure/pom.xml +++ b/oak-blob-cloud-azure/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 4fa8329..ef9886c 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob-plugins/pom.xml b/oak-blob-plugins/pom.xml index c38a195..9d1fc51 100644 --- a/oak-blob-plugins/pom.xml +++ b/oak-blob-plugins/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-blob/pom.xml b/oak-blob/pom.xml index fa66481..e8f02e4 100644 --- a/oak-blob/pom.xml +++ b/oak-blob/pom.xml @@ -21,7 +21,7 @@ oak-parent org.apache.jackrabbit -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml index 1b23fe3..1dcbe1d 100644 --- a/oak-commons/pom.xml +++ b/oak-commons/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.8.26 +1.8.27-SNAPSHOT ../oak-parent/pom.xml
[jackrabbit-oak] annotated tag jackrabbit-oak-1.8.26 created (now cc72461)
This is an automated email from the ASF dual-hosted git repository. ngupta pushed a change to annotated tag jackrabbit-oak-1.8.26 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git. at cc72461 (tag) tagging 405a4ebe7fa0662d80fff4dfbe334441ced3fa5b (commit) replaces jackrabbit-oak-1.8.25 by Nitin Gupta on Tue Feb 1 12:48:59 2022 +0530 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.8.26 --- No new revisions were added by this update.
