(jackrabbit-oak) branch 1.22 updated: OAK-6769: Convert oak-search-mt to OSGi R7 annotations
This is an automated email from the ASF dual-hosted git repository.
reschke 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 8f5d7b4012 OAK-6769: Convert oak-search-mt to OSGi R7 annotations
8f5d7b4012 is described below
commit 8f5d7b40129bbe214d971ed19d93aac5231e01d9
Author: mbaedke
AuthorDate: Wed Mar 6 13:54:58 2024 +0100
OAK-6769: Convert oak-search-mt to OSGi R7 annotations
---
oak-search-mt/pom.xml | 4 +-
.../mt/MTFulltextQueryTermsProviderFactory.java| 71 ++
2 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/oak-search-mt/pom.xml b/oak-search-mt/pom.xml
index 77238c4c9b..063d74a74d 100644
--- a/oak-search-mt/pom.xml
+++ b/oak-search-mt/pom.xml
@@ -99,8 +99,8 @@
provided
-org.apache.felix
-org.apache.felix.scr.annotations
+org.osgi
+org.osgi.service.component.annotations
provided
diff --git
a/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
b/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
index 7107b8e8f5..d2cc5313d6 100644
---
a/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
+++
b/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
@@ -22,14 +22,15 @@ import java.io.File;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
-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.Service;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.AttributeType;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import
org.apache.jackrabbit.oak.plugins.index.lucene.spi.FulltextQueryTermsProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -45,36 +46,52 @@ import org.slf4j.LoggerFactory;
* Factory for {@link MTFulltextQueryTermsProvider}
*/
@Component(
-name =
"org.apache.jackrabbit.oak.plugins.index.mt.MTFulltextQueryTermsProviderFactory",
-label = "Apache Jackrabbit Oak Machine Translation Fulltext Query
Terms Provider",
-configurationFactory = true,
-metatype = true,
-policy = ConfigurationPolicy.REQUIRE
+service = { FulltextQueryTermsProvider.class },
+configurationPolicy = ConfigurationPolicy.REQUIRE
)
-@Service(FulltextQueryTermsProvider.class)
+@Designate(
+ocd = MTFulltextQueryTermsProviderFactory.Configuration.class,
+factory = true )
public class MTFulltextQueryTermsProviderFactory implements
FulltextQueryTermsProvider {
-private static final float DEFAULT_MIN_SCORE = 0.5f;
+@ObjectClassDefinition(
+id =
"org.apache.jackrabbit.oak.plugins.index.mt.MTFulltextQueryTermsProviderFactory",
+name = "Apache Jackrabbit Oak Machine Translation Fulltext Query
Terms Provider"
+)
+@interface Configuration {
-private final Logger log = LoggerFactory.getLogger(getClass());
+@AttributeDefinition(
+name = "Joshua Config Path",
+description = "The absolute filesystem path to Apache Joshua
configuration file"
+)
+String path_to_config();
+
+@AttributeDefinition(
+name = "Node types",
+description = "List of node types for which expanding the
query via MT",
+cardinality = 10
+)
+String[] node_types();
-@Property(label = "Joshua Config Path", description = "The absolute
filesystem path to Apache Joshua configuration file")
-private static final String CONFIG_PATH = "path.to.config";
+@AttributeDefinition(
+name = "Minimum score",
+description = "Minimum allowed score for a translated
phrase/term to be used for expansion",
+type
(jackrabbit-oak) branch 1.22 updated: OAK-10544: oak-jcr: remapping a namespace prefix leaves namespace resolver in broken state (#1283)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 7da78754ce OAK-10544: oak-jcr: remapping a namespace prefix leaves
namespace resolver in broken state (#1283)
7da78754ce is described below
commit 7da78754ce3c2bc67f6cbfd24cc5de557f8bd375
Author: Julian Reschke
AuthorDate: Wed Jan 24 11:31:43 2024 +0100
OAK-10544: oak-jcr: remapping a namespace prefix leaves namespace resolver
in broken state (#1283)
* OAK-10544: oak-jcr: remapping a namespace prefix leaves namespace
resolver in broken state
* Update
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java
Co-authored-by: Thomas Mueller
-
Co-authored-by: Thomas Mueller
---
.../org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java | 9 +
.../test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java| 1 -
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java
index c6e330984e..92362aa9f2 100644
---
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java
+++
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionNamespaces.java
@@ -72,6 +72,8 @@ public class SessionNamespaces extends LocalNameMapper {
"Prefix is not a valid XML NCName: " + prefix);
}
+String previouslyMappedUri = getOakURIOrNull(prefix);
+
// remove the possible existing mapping for the given prefix
local.remove(prefix);
@@ -86,6 +88,13 @@ public class SessionNamespaces extends LocalNameMapper {
// add the new mapping
local.put(prefix, uri);
+
+// make sure the previously mapped URI has a prefix
+// (getNamespacePrefix has the side effect of generating
+// a new prefix if none was found, and adding that to the local
mapping)
+if (previouslyMappedUri != null) {
+getNamespacePrefix(previouslyMappedUri);
+}
}
/**
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
index 1469141865..759cf0981e 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
@@ -216,7 +216,6 @@ public class NamePathTest {
}
@Test
-@Ignore("OAK-10544")
public void testPrefixRemapping() throws NamespaceException,
RepositoryException {
Random r = new Random();
int i1 = r.nextInt();
(jackrabbit-oak) branch 1.22 updated: OAK-10544: oak-jcr: add test for observing effect of remapping a namespace prefix to a different namespace name
This is an automated email from the ASF dual-hosted git repository.
reschke 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 0fb49b565c OAK-10544: oak-jcr: add test for observing effect of
remapping a namespace prefix to a different namespace name
0fb49b565c is described below
commit 0fb49b565ca290cc273013021834f1de267c554b
Author: Julian Reschke
AuthorDate: Tue May 28 14:06:44 2024 +0100
OAK-10544: oak-jcr: add test for observing effect of remapping a namespace
prefix to a different namespace name
---
.../apache/jackrabbit/oak/jcr/NamePathTest.java| 63 +-
1 file changed, 61 insertions(+), 2 deletions(-)
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
index 2b37fde1bf..1469141865 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
@@ -16,22 +16,29 @@
*/
package org.apache.jackrabbit.oak.jcr;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.List;
+import java.util.Random;
+import javax.jcr.NamespaceException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import com.google.common.collect.ImmutableList;
-
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
+import com.google.common.collect.ImmutableList;
+
public class NamePathTest {
private Session session;
@@ -208,6 +215,58 @@ public class NamePathTest {
session.getNode(n.getPath());
}
+@Test
+@Ignore("OAK-10544")
+public void testPrefixRemapping() throws NamespaceException,
RepositoryException {
+Random r = new Random();
+int i1 = r.nextInt();
+int i2 = r.nextInt();
+String prefix = "nstest" + i1 + "XXX";
+String uri1 = "foobar:1-" + i1;
+String uri2 = "foobar:2-" + i2;
+String testLocalName = "test";
+String expandedTestName ="{" + uri1 + "}" + testLocalName;
+
+DefaultNamePathResolver resolver = new
DefaultNamePathResolver(session);
+
+try {
+
session.getWorkspace().getNamespaceRegistry().registerNamespace(prefix, uri1);
+
+String originalName = prefix + ":" + testLocalName;
+Node testNode = session.getRootNode().addNode(originalName);
+session.save();
+
+// verify that name resolver finds correct namespaceURI
+assertEquals(uri1,
resolver.getQName(testNode.getName()).getNamespaceURI());
+
+// check that expanded name works
+Node n2 = session.getRootNode().getNode(expandedTestName);
+assertTrue(testNode.isSame(n2));
+
+// remap prefix1 to uri2
+session.setNamespacePrefix(prefix, uri2);
+
+// check that expanded name still works
+Node n3 = session.getRootNode().getNode(expandedTestName);
+assertTrue(testNode.isSame(n3));
+
+String remappedName = n3.getName();
+assertNotEquals(originalName, remappedName);
+
+int colon = remappedName.indexOf(':');
+assertTrue("remapped name must contain colon:" + remappedName,
colon > 0);
+String remappedPrefix = remappedName.substring(0, colon);
+assertNotEquals("prefix after mapping must be different", prefix,
remappedPrefix);
+
+// OAK-10544: adding the line below makes the test pass
+// session.getNamespacePrefix(uri1);
+
+assertEquals("remapped prefix need to map to original URI " +
uri1, uri1, session.getNamespaceURI(remappedPrefix));
+} finally {
+
session.getWorkspace().getNamespaceRegistry().unregisterNamespace(prefix);
+}
+}
+
private void testPaths(List paths) throws RepositoryException {
for (String path : paths) {
(jackrabbit-oak) branch OAK-10838 deleted (was b9c7f9d2dc)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10838 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was b9c7f9d2dc OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check (#1491)
This is an automated email from the ASF dual-hosted git repository. reschke 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 8bab606b28 OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check (#1491) 8bab606b28 is described below commit 8bab606b284b8084881586c2df36913567f07aa1 Author: Julian Reschke AuthorDate: Tue May 28 13:15:24 2024 +0200 OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check (#1491) --- oak-parent/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 32f246792a..3d18047a50 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -239,6 +239,8 @@ !org.apache.jackrabbit.oak.plugins.index.solr.util !org.apache.jackrabbit.oak.segment.spi.monitor !org.apache.jackrabbit.oak.segment.spi.persistence + + !org.apache.lucene.* *
(jackrabbit-oak) branch OAK-10838 created (now b9c7f9d2dc)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10838 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at b9c7f9d2dc OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check This branch includes the following new commits: new b9c7f9d2dc OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10838 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit b9c7f9d2dc2fd93b87e2417375e46fa4fa512e75 Author: Julian Reschke AuthorDate: Tue May 28 11:42:52 2024 +0100 OAK-10838: oak-lucene: maven install fails in oak-lucene due to baseline check --- oak-parent/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 32f246792a..3d18047a50 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -239,6 +239,8 @@ !org.apache.jackrabbit.oak.plugins.index.solr.util !org.apache.jackrabbit.oak.segment.spi.monitor !org.apache.jackrabbit.oak.segment.spi.persistence + + !org.apache.lucene.* *
(jackrabbit-oak) branch trunk updated: OAK-10824: Release Oak 1.64.0
This is an automated email from the ASF dual-hosted git repository. reschke 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 c1a73280ea OAK-10824: Release Oak 1.64.0 c1a73280ea is described below commit c1a73280ea67371c44efea0b8fbebf45140554b7 Author: Julian Reschke AuthorDate: Mon May 27 21:31:46 2024 +0100 OAK-10824: Release Oak 1.64.0 --- 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 d5301f04a0..80865cb725 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.63-SNAPSHOT +1.65-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-doc/pom.xml b/oak-doc/pom.xml index fdbe2bc426..1d35781f32 100644 --- a/oak-doc/pom.xml +++ b/oak-doc/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.65-SNAPSHOT ../oak-parent/pom.xml
(jackrabbit-oak) branch trunk updated: Revert "Revert "OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486)""
This is an automated email from the ASF dual-hosted git repository. reschke 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 c5a9f713b3 Revert "Revert "OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486)"" c5a9f713b3 is described below commit c5a9f713b381cd23f062c399fbde4663b55d45e8 Author: Julian Reschke AuthorDate: Mon May 27 14:50:04 2024 +0100 Revert "Revert "OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486)"" This reverts commit a9d0c1c81295dfde2e3b1f1bb97af589e5238816. --- 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 8a7ef531ca..32f246792a 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -65,7 +65,7 @@ 2.1.214 1.28.5 10.15.2.0 -2.16.2 +2.17.1 1.19.7 4.13.1 3.0.21
(jackrabbit-oak) branch trunk updated (049d7713d9 -> a9d0c1c812)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 049d7713d9 Merge pull request #1479 from daniancu/OAK-10826 add a9d0c1c812 Revert "OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486)" No new revisions were added by this update. Summary of changes: oak-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(jackrabbit-oak) branch trunk updated: OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486)
This is an automated email from the ASF dual-hosted git repository. reschke 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 4a4f2ed767 OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486) 4a4f2ed767 is described below commit 4a4f2ed767da749f48df26bd1aea73ee262a02ed Author: Julian Reschke AuthorDate: Fri May 24 09:24:25 2024 +0200 OAK-10830: Upgrade jackson-databind dependency to 2.17.1 (#1486) --- 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 8a7ef531ca..32f246792a 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -65,7 +65,7 @@ 2.1.214 1.28.5 10.15.2.0 -2.16.2 +2.17.1 1.19.7 4.13.1 3.0.21
(jackrabbit-oak) branch OAK-10830 deleted (was eaddbf464b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10830 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was eaddbf464b OAK-10830: Upgrade jackson-databind dependency to 2.17.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) 01/01: OAK-10830: Upgrade jackson-databind dependency to 2.17.1
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10830 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit eaddbf464b5805a3c2fdebd342ccc43c65231722 Author: Julian Reschke AuthorDate: Fri May 24 08:23:48 2024 +0100 OAK-10830: Upgrade jackson-databind dependency to 2.17.1 --- 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 8a7ef531ca..32f246792a 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -65,7 +65,7 @@ 2.1.214 1.28.5 10.15.2.0 -2.16.2 +2.17.1 1.19.7 4.13.1 3.0.21
(jackrabbit-oak) branch OAK-10830 created (now eaddbf464b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10830 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at eaddbf464b OAK-10830: Upgrade jackson-databind dependency to 2.17.1 This branch includes the following new commits: new eaddbf464b OAK-10830: Upgrade jackson-databind dependency to 2.17.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10829 deleted (was 3c0391c89e)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10829 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 3c0391c89e OAK-10829: examples: update build-helper-maven-plugin to 3.6.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated (a52b001073 -> 2726d5746c)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from a52b001073 Issues/OAK-10675 (#1385) add 2726d5746c OAK-10829: examples: update build-helper-maven-plugin to 3.6.0 (#1483) No new revisions were added by this update. Summary of changes: oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(jackrabbit-oak) branch OAK-10829 created (now 3c0391c89e)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10829 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 3c0391c89e OAK-10829: examples: update build-helper-maven-plugin to 3.6.0 This branch includes the following new commits: new 3c0391c89e OAK-10829: examples: update build-helper-maven-plugin to 3.6.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10829: examples: update build-helper-maven-plugin to 3.6.0
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10829 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit 3c0391c89ee84b75800dfaac51d4316a65c4539d Author: Julian Reschke AuthorDate: Thu May 23 10:53:44 2024 +0100 OAK-10829: examples: update build-helper-maven-plugin to 3.6.0 --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 50a8ed6154..3c767a72a6 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -251,7 +251,7 @@ org.codehaus.mojo build-helper-maven-plugin -3.5.0 +3.6.0 attach-artifacts
(jackrabbit-oak) branch trunk updated: [maven-release-plugin] prepare release jackrabbit-oak-1.64.0
This is an automated email from the ASF dual-hosted git repository. reschke 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 32e5b94eec [maven-release-plugin] prepare release jackrabbit-oak-1.64.0 32e5b94eec is described below commit 32e5b94eec2f26892a0d82ed88116a58937a1ad3 Author: Julian Reschke AuthorDate: Wed May 22 18:05:11 2024 +0200 [maven-release-plugin] prepare release jackrabbit-oak-1.64.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/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-shaded-guava/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, 49 insertions(+), 49 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 6de1124fbf..131e153707 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.64.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index d62df5980f..442521f358 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.64.0 ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 9282389d42..0ba4a58978 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.64.0 ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index 87a9018fe7..c17f7ca3a7 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.64.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 4693ce5f62..92377dfee4 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.64.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index 2214e78648..bd32857d96 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.63-SNAPSHOT +1.64.0 ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 8a404b4d1d..4810e52665 100644 --- a/oak-benchmarks-lucene/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. reschke 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 536e9e9656 [maven-release-plugin] prepare for next development iteration 536e9e9656 is described below commit 536e9e9656d30a2b658dbc0638ac4d9c5b725c28 Author: Julian Reschke AuthorDate: Wed May 22 18:05:22 2024 +0200 [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/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-shaded-guava/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, 49 insertions(+), 49 deletions(-) diff --git a/oak-api/pom.xml b/oak-api/pom.xml index 131e153707..595abcd635 100644 --- a/oak-api/pom.xml +++ b/oak-api/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.64.0 +1.65-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-auth-external/pom.xml b/oak-auth-external/pom.xml index 442521f358..65fd84d2b4 100644 --- a/oak-auth-external/pom.xml +++ b/oak-auth-external/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.64.0 +1.65-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-auth-ldap/pom.xml b/oak-auth-ldap/pom.xml index 0ba4a58978..6ff0b547d2 100644 --- a/oak-auth-ldap/pom.xml +++ b/oak-auth-ldap/pom.xml @@ -23,7 +23,7 @@ org.apache.jackrabbit oak-parent -1.64.0 +1.65-SNAPSHOT ../oak-parent/pom.xml diff --git a/oak-authorization-cug/pom.xml b/oak-authorization-cug/pom.xml index c17f7ca3a7..9dd8b0c43f 100644 --- a/oak-authorization-cug/pom.xml +++ b/oak-authorization-cug/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.64.0 +1.65-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-authorization-principalbased/pom.xml b/oak-authorization-principalbased/pom.xml index 92377dfee4..c3bf7a06f0 100644 --- a/oak-authorization-principalbased/pom.xml +++ b/oak-authorization-principalbased/pom.xml @@ -19,7 +19,7 @@ org.apache.jackrabbit oak-parent -1.64.0 +1.65-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-elastic/pom.xml b/oak-benchmarks-elastic/pom.xml index bd32857d96..972e47f698 100644 --- a/oak-benchmarks-elastic/pom.xml +++ b/oak-benchmarks-elastic/pom.xml @@ -20,7 +20,7 @@ org.apache.jackrabbit oak-parent -1.64.0 +1.65-SNAPSHOT ../oak-parent/pom.xml 4.0.0 diff --git a/oak-benchmarks-lucene/pom.xml b/oak-benchmarks-lucene/pom.xml index 4810e52665..2abd32e7ff 100644 --- a/oak-benchmarks-lucene
(jackrabbit-oak) annotated tag jackrabbit-oak-1.64.0 created (now 0c7c928751)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to annotated tag jackrabbit-oak-1.64.0 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 0c7c928751 (tag) tagging 32e5b94eec2f26892a0d82ed88116a58937a1ad3 (commit) replaces jackrabbit-oak-1.62.0 by Julian Reschke on Wed May 22 18:05:16 2024 +0200 - Log - [maven-release-plugin] copy for tag jackrabbit-oak-1.64.0 --- No new revisions were added by this update.
(jackrabbit-oak) branch trunk updated: OAK-10824: Release Oak 1.64.0 - Candidate Release Notes
This is an automated email from the ASF dual-hosted git repository. reschke 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 4726136474 OAK-10824: Release Oak 1.64.0 - Candidate Release Notes 4726136474 is described below commit 4726136474f021c2d1e0b72067561a5e7be6b9ad Author: Julian Reschke AuthorDate: Wed May 22 15:59:11 2024 +0100 OAK-10824: Release Oak 1.64.0 - Candidate Release Notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index f5275eea54..8f1937861b 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -44,6 +44,7 @@ Improvement [OAK-10760] - oak-core should check namespace registry consistency on startup [OAK-10762] - oak-search-elastic: similarity queries produce not relevant results when uses similarTags +[OAK-10771] - Add disk cache size stats and issue warning if evicted segment has zero length [OAK-10778] - Indexing job: support parallel download from MongoDB with two connections in Pipelined strategy [OAK-10783] - VersionableEditor: misleading WARN message when creating version history [OAK-10784] - o.a.j.o.plugins.migration.version.VersionableEditor should create the version storage node, if needed
(jackrabbit-oak) branch trunk updated: OAK-10824: Release Oak 1.64.0 - Candidate Release Notes
This is an automated email from the ASF dual-hosted git repository. reschke 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 f7f21c8d25 OAK-10824: Release Oak 1.64.0 - Candidate Release Notes f7f21c8d25 is described below commit f7f21c8d25068d12ea59914827d308b5a3f07a31 Author: Julian Reschke AuthorDate: Wed May 22 10:00:32 2024 +0100 OAK-10824: Release Oak 1.64.0 - Candidate Release Notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 94d9c9fef5..f5275eea54 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -52,6 +52,7 @@ Improvement [OAK-10804] - Indexing job: optimize check for hidden nodes [OAK-10808] - PipelinedMongoConnectionFailureIT should not fail if Mongo is not available [OAK-10810] - Remove redundant call to StringCache.get in Path.fromString() +[OAK-10813] - Improve performance of Oak-mongo.js function to remove/list nodes Task
(jackrabbit-oak) branch trunk updated: OAK-10824: Release Oak 1.64.0 - Candidate Release Notes
This is an automated email from the ASF dual-hosted git repository. reschke 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 1c355c452c OAK-10824: Release Oak 1.64.0 - Candidate Release Notes 1c355c452c is described below commit 1c355c452c0a3fc7a084edb824baca62299674be Author: Julian Reschke AuthorDate: Tue May 21 14:45:17 2024 +0100 OAK-10824: Release Oak 1.64.0 - Candidate Release Notes --- RELEASE-NOTES.txt | 167 ++ 1 file changed, 56 insertions(+), 111 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 6e1a555416..94d9c9fef5 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,4 @@ -Release Notes -- Apache Jackrabbit Oak -- Version 1.62.0 +Release Notes -- Apache Jackrabbit Oak -- Version 1.64.0 Introduction @@ -7,138 +7,83 @@ 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.62.0 is an incremental feature release based +Apache Jackrabbit Oak 1.64.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.62.0 compiles and tests successfully on Java 17, Javadocs +While Oak 1.64.0 compiles and tests successfully on Java 17, Javadocs generation fails on Java 17 (but works as expected on Java 11). 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.62.0 +Changes in Oak 1.64.0 - Technical task -[OAK-6765] - Convert oak-jcr to OSGi R7 annotations -[OAK-6769] - Convert oak-search-mt to OSGi R7 annotations -[OAK-10623] - oak-core: log a warning when it needs to remap/add a namespace -[OAK-10673] - DocumentStore: add test for checking of removal on non-existing map entries -[OAK-10708] - DocumentNodeStore: error-log failures to update the journal -[OAK-10709] - Deprecate oak-search-mt +[OAK-6768] - Convert oak-remote to OSGi R7 annotations +[OAK-6774] - Convert oak-upgrade to OSGi R7 annotations +[OAK-10786] - oak-lucene: use copy of lucene-core 4.7.2 source code +[OAK-10787] - oak-lucene: backport fix for lucene-core vulnerability Bug -[OAK-10500] - javadoc:aggregate build fails again -[OAK-10544] - oak-jcr: remapping a namespace prefix leaves namespace resolver in broken state -[OAK-10551] - o.a.j.o.jcr.osgi.RepositoryManager declares OSGi properties that are not used at all -[OAK-10576] - oak-search-elastic: dynamicBoost should match only on full text queries on all fields (* or .) -[OAK-10590] - Indexing job downloads and creates FFS with full node store if includedPaths is specified as a string instead of array of strings -[OAK-10595] - Cached data before a collision rollback can be read as committed -[OAK-10611] - o.a.j.o.namepath.JcrPathParser does not handle invalid characters correctly -[OAK-10617] - oak-search-elastic: potential deadlock with includePathRestrictions=false and multiple filtered results -[OAK-10636] - Tar recovery unsuccessful in oak-segment-tar during initialisation of FileStore -[OAK-10638] - Build fails on Java 17 due to JAR size limit -[OAK-10650] - MongoDocumentStore.findDocuments can fail with BSON exception -[OAK-10652] - Repository writes in SegmentStoreMigrator blocked when migrating to Azure segment store -[OAK-10653] - BasicDocumentStoreTest: handle DocumentStoreException on ds.create -[OAK-10717] - oak-pojosr should be updated to o.a.felix.connect-0.2.0 -[OAK-10735] - Binary data in logs related to the haystack property - -Story - -[OAK-10573] - Make distinction for azure timeout settings between write and read operations -[OAK-10604] - Azure Service Principal Support in oak-segment-azure -[OAK-10615] - Azure Service Principal Support in oak-run segment-copy, compact, console +[OAK-10647] - DocumentNodeStore: journal update needs success check +[OAK-10719] - oak-lucene uses Lucene version that can throw a StackOverflowException +[OAK-10756] - OrderableNodesTest.childOrderCleanupFeatureToggleTest fails with -Dnsfixtures=DOCUMENT_NS +[OAK-10767] - oak-it-osgi unnecessarily deploys commons-collections to the test environment +[OAK-10775] - LeaseUpdateSocketTimeoutIT still wants a mongo:4.2 image +[OAK-10782] - oak-search-elastic: query getSize() can lock writes when is called before an update +[OAK-10788] - Indexing job downloader: shutdown gracefully all threads in case of failure +[OAK-10800] - DictionaryCompoundWordTokenFilter not supported
(jackrabbit-oak) branch OAK-10820 deleted (was 73e0703733)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10820 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 73e0703733 OAK-10820: webapp: update Tomcat dependency to 9.0.89 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10820: webapp: update Tomcat dependency to 9.0.89 (#1472)
This is an automated email from the ASF dual-hosted git repository. reschke 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 7ab4027f49 OAK-10820: webapp: update Tomcat dependency to 9.0.89 (#1472) 7ab4027f49 is described below commit 7ab4027f495279469290ed5fa567da94f6d037b3 Author: Julian Reschke AuthorDate: Sun May 19 16:57:35 2024 +0200 OAK-10820: webapp: update Tomcat dependency to 9.0.89 (#1472) --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 6ee4d78862..549cade6ab 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -35,7 +35,7 @@ Web application that hosts and serves a Jackrabbit Oak content repository -9.0.87 +9.0.89 true
(jackrabbit-oak) branch OAK-10820 created (now 73e0703733)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10820 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 73e0703733 OAK-10820: webapp: update Tomcat dependency to 9.0.89 This branch includes the following new commits: new 73e0703733 OAK-10820: webapp: update Tomcat dependency to 9.0.89 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10820: webapp: update Tomcat dependency to 9.0.89
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10820 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit 73e07037331faaf191305f96949848a1c564fcdd Author: Julian Reschke AuthorDate: Sun May 19 15:57:02 2024 +0100 OAK-10820: webapp: update Tomcat dependency to 9.0.89 --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 6ee4d78862..549cade6ab 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -35,7 +35,7 @@ Web application that hosts and serves a Jackrabbit Oak content repository -9.0.87 +9.0.89 true
(jackrabbit-oak) branch OAK-10819 deleted (was 625e2fe62a)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10819 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 625e2fe62a OAK-10819: examples: update jetty-maven-plugin to 11.0.21 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10819: examples: update jetty-maven-plugin to 11.0.21 (#1471)
This is an automated email from the ASF dual-hosted git repository. reschke 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 bd237f298d OAK-10819: examples: update jetty-maven-plugin to 11.0.21 (#1471) bd237f298d is described below commit bd237f298dda2945e56582c2ec411f68363eb354 Author: Julian Reschke AuthorDate: Sun May 19 14:56:03 2024 +0200 OAK-10819: examples: update jetty-maven-plugin to 11.0.21 (#1471) --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index b962c023e0..6ee4d78862 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -215,7 +215,7 @@ org.eclipse.jetty jetty-maven-plugin - 11.0.20 + 11.0.21 -1
(jackrabbit-oak) 01/01: OAK-10819: examples: update jetty-maven-plugin to 11.0.21
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10819 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit 625e2fe62a9ad8078d0a704bad6cfea1a0cbaa5d Author: Julian Reschke AuthorDate: Sun May 19 13:55:31 2024 +0100 OAK-10819: examples: update jetty-maven-plugin to 11.0.21 --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index b962c023e0..6ee4d78862 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -215,7 +215,7 @@ org.eclipse.jetty jetty-maven-plugin - 11.0.20 + 11.0.21 -1
(jackrabbit-oak) branch OAK-10819 created (now 625e2fe62a)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10819 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 625e2fe62a OAK-10819: examples: update jetty-maven-plugin to 11.0.21 This branch includes the following new commits: new 625e2fe62a OAK-10819: examples: update jetty-maven-plugin to 11.0.21 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10816 deleted (was d398f44940)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10816 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was d398f44940 OAK-10816: Update spotbugs plugin to 4.8.5.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10816: Update spotbugs plugin to 4.8.5.0 (#1470)
This is an automated email from the ASF dual-hosted git repository. reschke 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 f9e1dfa80d OAK-10816: Update spotbugs plugin to 4.8.5.0 (#1470) f9e1dfa80d is described below commit f9e1dfa80d3c762c3c4ed6a494bd2a0d66dac108 Author: Julian Reschke AuthorDate: Sat May 18 19:38:29 2024 +0200 OAK-10816: Update spotbugs plugin to 4.8.5.0 (#1470) --- 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 3448328c40..4537ecc6fb 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -329,7 +329,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.3.1 + 4.8.5.0 org.apache.maven.plugins
(jackrabbit-oak) branch OAK-10816 created (now d398f44940)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10816 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at d398f44940 OAK-10816: Update spotbugs plugin to 4.8.5.0 This branch includes the following new commits: new d398f44940 OAK-10816: Update spotbugs plugin to 4.8.5.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10816: Update spotbugs plugin to 4.8.5.0
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10816 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit d398f44940982b106e6a7e435fe391b0a2a943bf Author: Julian Reschke AuthorDate: Sat May 18 18:37:52 2024 +0100 OAK-10816: Update spotbugs plugin to 4.8.5.0 --- 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 3448328c40..4537ecc6fb 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -329,7 +329,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.3.1 + 4.8.5.0 org.apache.maven.plugins
(jackrabbit-oak) branch trunk updated: OAK-10760: oak-core should check namespace registry consistency on st… (#1447)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 43619290a5 OAK-10760: oak-core should check namespace registry
consistency on st… (#1447)
43619290a5 is described below
commit 43619290a5ebdc9c60aa9d1929f796e5033f59da
Author: mbaedke
AuthorDate: Fri May 17 18:54:43 2024 +0200
OAK-10760: oak-core should check namespace registry consistency on st…
(#1447)
* OAK-10760: oak-core should check namespace registry consistency on startup
Implemented.
* OAK-10760: oak-core should check namespace registry consistency on startup
Removed Guava usage, improved log messages.
* OAK-10760: oak-core should check namespace registry consistency on startup
Added flag to avoid multiple consistency checks.
* OAK-10760: oak-core should check namespace registry consistency on startup
Fixed property miscount and URI encoding issues.
---
.../plugins/name/ReadOnlyNamespaceRegistry.java| 76 +-
1 file changed, 73 insertions(+), 3 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
index 87d12054d4..ddf6509ce0 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.name;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.toArray;
import static java.util.Collections.emptyList;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -26,11 +25,19 @@ import javax.jcr.NamespaceRegistry;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
+import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants;
import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* Read-only namespace registry. Used mostly internally when access to the
@@ -42,12 +49,19 @@ import org.jetbrains.annotations.NotNull;
public class ReadOnlyNamespaceRegistry
implements NamespaceRegistry, NamespaceConstants {
+private static final Logger LOG =
LoggerFactory.getLogger(ReadOnlyNamespaceRegistry.class);
+
+private static volatile boolean CONSISTENCY_CHECKED;
+
protected final Tree namespaces;
protected final Tree nsdata;
public ReadOnlyNamespaceRegistry(Root root) {
this.namespaces = root.getTree(NAMESPACES_PATH);
this.nsdata = namespaces.getChild(REP_NSDATA);
+if (!CONSISTENCY_CHECKED) {
+checkConsistency();
+}
}
private Iterable getNSData(String name) {
@@ -74,12 +88,16 @@ public class ReadOnlyNamespaceRegistry
@Override @NotNull
public String[] getPrefixes() {
-return toArray(getNSData(REP_PREFIXES), String.class);
+List prefixes = new ArrayList();
+getNSData(REP_PREFIXES).forEach(prefixes::add);
+return prefixes.toArray(new String[prefixes.size()]);
}
@Override @NotNull
public String[] getURIs() {
-return toArray(getNSData(REP_URIS), String.class);
+List uris = new ArrayList<>();
+getNSData(REP_URIS).forEach(uris::add);
+return uris.toArray(new String[uris.size()]);
}
@Override @NotNull
@@ -112,4 +130,56 @@ public class ReadOnlyNamespaceRegistry
"No namespace prefix registered for URI " + uri);
}
+protected void checkConsistency() {
+final String jcrPrimaryType = "jcr:primaryType";
+List prefixes = Arrays.asList(getPrefixes());
+List encodedUris =
Arrays.stream(getURIs()).map(Namespaces::encodeUri).collect(Collectors.toList());
+if (prefixes.size() != encodedUris.size()) {
+LOG.error("The namespace registry is inconsistent: found {}
registered namespace prefixes and {} registered namespace URIs. The numbers
have to be equal.", prefixes.size(), encodedUris.size());
+}
+int mappedPrefixCount = 0;
+for (PropertyState propertyState : namespaces.getProperties()) {
+String prefix = propertyState.getName();
+if (!prefix.equals(jcrPrimaryType))
(jackrabbit-oak) branch OAK-10815 deleted (was a3a90c6606)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10815 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was a3a90c6606 OAK-10815: Update jacoco plugin to 0.8.12 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10815: Update jacoco plugin to 0.8.12 (#1469)
This is an automated email from the ASF dual-hosted git repository. reschke 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 1f25d6fc4a OAK-10815: Update jacoco plugin to 0.8.12 (#1469) 1f25d6fc4a is described below commit 1f25d6fc4a547951923274b054bca2f8bbdd0de1 Author: Julian Reschke AuthorDate: Fri May 17 17:14:10 2024 +0200 OAK-10815: Update jacoco plugin to 0.8.12 (#1469) --- 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 7f089fe984..3448328c40 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -394,7 +394,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12
(jackrabbit-oak) 01/01: OAK-10815: Update jacoco plugin to 0.8.12
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10815 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit a3a90c660613396c49111e8e89fbaa778982d242 Author: Julian Reschke AuthorDate: Fri May 17 16:13:19 2024 +0100 OAK-10815: Update jacoco plugin to 0.8.12 --- 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 7f089fe984..3448328c40 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -394,7 +394,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12
(jackrabbit-oak) branch OAK-10815 created (now a3a90c6606)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10815 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at a3a90c6606 OAK-10815: Update jacoco plugin to 0.8.12 This branch includes the following new commits: new a3a90c6606 OAK-10815: Update jacoco plugin to 0.8.12 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10787 deleted (was 68e3a16fa1)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10787 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 68e3a16fa1 merge trunk The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10787: oak-lucene: backport fix for lucene-core vulnerability (#1443)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 283a1d7fea OAK-10787: oak-lucene: backport fix for lucene-core
vulnerability (#1443)
283a1d7fea is described below
commit 283a1d7fea23fdceff8dda6e88b059d6990eff09
Author: Julian Reschke
AuthorDate: Thu May 16 05:58:54 2024 +0200
OAK-10787: oak-lucene: backport fix for lucene-core vulnerability (#1443)
* OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code -
include copy of lucene-core 4.7.2 (g...@github.com:apache/lucene.git, tag
releases/lucene-solr/4.7.2, path lucene/core/src/java)
* OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - fix
two issues JDK 11 incompatibility
* OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - remove
lucene-core dependency
* OAK-10786: add a comment about where the code originates from
* OAK-10786: bump exported lucene package version to clarify that this is
Oak's fork
* OAK-10786: add copies of
META-INF/services/org.apache.lucene.codecs.DocValuesFormat and
META-INF/services/org.apache.lucene.codecs.PostingsFormat
* OAK-10787: oak-lucene: backport fix for lucene-core vulnerability
---
oak-lucene/pom.xml | 2 +-
.../org/apache/lucene/util/automaton/RegExp.java | 42 +++---
.../plugins/index/lucene/LuceneSecurityTest.java | 2 --
.../oak/plugins/index/FullTextIndexCommonTest.java | 2 --
4 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
index c1f080d0c4..aa19373e98 100644
--- a/oak-lucene/pom.xml
+++ b/oak-lucene/pom.xml
@@ -107,7 +107,7 @@
<_exportcontents>
!org.apache.lucene.queryparser.xml,
!org.apache.lucene.queryparser.xml.builders,
- org.apache.lucene.*;version=4.7.2-oak1
+ org.apache.lucene.*;version=4.7.2-oak2
org.apache.jackrabbit.oak.plugins.index.lucene,
diff --git
a/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
b/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
index 3dd1c87950..c088fc1c5e 100644
--- a/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
+++ b/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
@@ -43,6 +43,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
/**
* Regular Expression extension to Automaton.
@@ -872,23 +874,39 @@ public class RegExp {
}
final RegExp parseUnionExp() throws IllegalArgumentException {
-RegExp e = parseInterExp();
-if (match('|')) e = makeUnion(e, parseUnionExp());
-return e;
+return iterativeParseExp(this::parseInterExp, () -> match('|'),
RegExp::makeUnion);
}
final RegExp parseInterExp() throws IllegalArgumentException {
-RegExp e = parseConcatExp();
-if (check(INTERSECTION) && match('&')) e = makeIntersection(e,
-parseInterExp());
-return e;
+return iterativeParseExp(
+ this::parseConcatExp, () -> check(INTERSECTION) && match('&'),
RegExp::makeIntersection);
}
final RegExp parseConcatExp() throws IllegalArgumentException {
-RegExp e = parseRepeatExp();
-if (more() && !peek(")|") && (!check(INTERSECTION) || !peek("&"))) e =
makeConcatenation(
-e, parseConcatExp());
-return e;
+return iterativeParseExp(
+ this::parseRepeatExp,
+() -> (more() && !peek(")|") && (!check(INTERSECTION) || !peek("&"))),
+RegExp::makeConcatenation);
+}
+
+ /**
+ * Custom Functional Interface for a Supplying methods with signature of
RegExp(RegExp
+ * exp1, RegExp exp2)
+ */
+ @FunctionalInterface
+ private interface MakeRegexGroup {
+RegExp get(RegExp exp1, RegExp exp2);
+ }
+
+ final RegExp iterativeParseExp(
+ Supplier gather, BooleanSupplier stop, MakeRegexGroup
associativeReduce)
+ throws IllegalArgumentException {
+RegExp result = gather.get();
+while (stop.getAsBoolean() == true) {
+ RegExp e = gather.get();
+ result = associativeReduce.get(result, e);
+}
+return result;
}
final RegExp parseRepeatExp() throws IllegalArgumentException {
@@ -985,7 +1003,7 @@ public class RegExp {
try {
if (i == 0 || i == s.length() - 1 || i != s.lastIndexOf('-')) throw
new NumberFormatException();
String smin = s.substring(0, i);
- String smax = s.substring(i + 1, s.length());
+ Stri
(jackrabbit-oak) branch OAK-10786b deleted (was 76fa35c420)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786b in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 76fa35c420 OAK-10786: exclude automaton package from RAT check The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated (feace46943 -> 28f411a3ac)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from feace46943 OAK-10798: Rename to removeDescendantsAndSelfMatching. add 28f411a3ac OAK-10786: exclude automaton package from RAT check (#1452) No new revisions were added by this update. Summary of changes: oak-lucene/pom.xml | 2 ++ 1 file changed, 2 insertions(+)
(jackrabbit-oak) 01/01: OAK-10786: exclude automaton package from RAT check
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10786b in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit 76fa35c42083f1036ad83972da7df2e298661440 Author: Julian Reschke AuthorDate: Tue May 14 09:33:47 2024 +0100 OAK-10786: exclude automaton package from RAT check --- oak-lucene/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml index 73f0b05191..c1f080d0c4 100644 --- a/oak-lucene/pom.xml +++ b/oak-lucene/pom.xml @@ -142,6 +142,8 @@ **/test.txt **/fvs.csv src/test/resources/**/*.txt + +src/main/java/org/apache/lucene/util/automaton/*
(jackrabbit-oak) branch OAK-10786b created (now 76fa35c420)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786b in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 76fa35c420 OAK-10786: exclude automaton package from RAT check This branch includes the following new commits: new 76fa35c420 OAK-10786: exclude automaton package from RAT check The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10799 deleted (was cea265972b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10799 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was cea265972b OAK-10799: Update (shaded) Guava to 33.2.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10799: Update (shaded) Guava to 33.2.0 (#1449)
This is an automated email from the ASF dual-hosted git repository. reschke 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 bc73ca3107 OAK-10799: Update (shaded) Guava to 33.2.0 (#1449) bc73ca3107 is described below commit bc73ca3107021d2d0f2eb6d9b96046486389646f Author: Julian Reschke AuthorDate: Tue May 14 08:03:02 2024 +0200 OAK-10799: Update (shaded) Guava to 33.2.0 (#1449) --- oak-shaded-guava/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml index 7e09726f71..ec9ff92660 100644 --- a/oak-shaded-guava/pom.xml +++ b/oak-shaded-guava/pom.xml @@ -28,8 +28,8 @@ bundle -33.1.0-jre -33.1.0 +33.2.0-jre +33.2.0 org.apache.jackrabbit.guava
(jackrabbit-oak) branch OAK-10787 updated (b9a062aa5a -> 68e3a16fa1)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10787 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from b9a062aa5a OAK-10787: oak-lucene: backport fix for lucene-core vulnerability add dc6dc4e15f OAK-10768: query-spi: deprecate use of slf4j.event.Level in QueryInde… (#1426) add 99edbd48d7 OAK-10793: Update Logback version to 1.2.13 (#1442) add 6f9cb9b998 OAK-10797: Update to Jackrabbit 2.20.16 (#1444) add 98206cb404 OAK-10778 - Support downloading from Mongo in parallel. (#1435) add 4914c1923e OAK-10795 - Indexing job: eliminate unnecessary intermediate object creation in transform stage (#1446) add 6706898c83 OAK-10796 - Avoid creation of intermediate StringBuilder in JsopBuilder (#1445) add ecfe8f6381 OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code (#1439) add 68e3a16fa1 merge trunk No new revisions were added by this update. Summary of changes: .../jackrabbit/oak/commons/json/JsopBuilder.java | 3 +- .../oak/plugins/index/IndexingReporter.java| 3 + .../org/apache/jackrabbit/oak/query/QueryImpl.java | 16 +- oak-lucene/pom.xml | 2 +- oak-parent/pom.xml | 4 +- .../jackrabbit/oak/spi/query/QueryIndex.java | 55 +- .../jackrabbit/oak/spi/query/package-info.java | 2 +- oak-run-commons/pom.xml| 19 +- .../indexer/document/DocumentStoreIndexerBase.java | 6 + .../flatfile/FlatFileNodeStoreBuilder.java | 9 +- .../document/flatfile/pipelined/DownloadRange.java | 48 +- .../pipelined/DownloadStageStatistics.java | 104 +++ .../pipelined/MongoDownloaderRegexUtils.java | 169 .../MongoParallelDownloadCoordinator.java | 138 .../pipelined/MongoRegexPathFilterFactory.java | 4 +- .../flatfile/pipelined/NodeDocumentCodec.java | 28 +- .../pipelined/PipelinedMongoDownloadTask.java | 904 - .../pipelined/PipelinedMongoServerSelector.java| 179 .../flatfile/pipelined/PipelinedStrategy.java | 28 +- .../flatfile/pipelined/PipelinedTransformTask.java | 24 +- .../document/mongo/MongoDocumentStoreHelper.java | 4 + .../oak/run/cli/DocumentFixtureProvider.java | 1 + .../MongoParallelDownloadCoordinatorTest.java | 169 .../flatfile/pipelined/MongoTestBackend.java | 57 ++ .../flatfile/pipelined/PipelineITUtil.java | 215 + .../document/flatfile/pipelined/PipelinedIT.java | 355 +++- .../PipelinedMongoConnectionFailureIT.java | 138 .../pipelined/PipelinedMongoDownloadTaskTest.java | 152 +--- .../PipelinedMongoServerSelectorTest.java | 315 +++ .../pipelined/PipelinedParametrizedIT.java | 288 +++ .../oak/index/DocumentStoreIndexerIT.java | 3 + .../jackrabbit/oak/index/IncrementalStoreTest.java | 9 +- .../search/spi/query/FulltextIndexPlanner.java | 5 +- .../oak/plugins/document/util/MongoConnection.java | 8 + 34 files changed, 2596 insertions(+), 868 deletions(-) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/DownloadStageStatistics.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoDownloaderRegexUtils.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoParallelDownloadCoordinator.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoServerSelector.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoParallelDownloadCoordinatorTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoTestBackend.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelineITUtil.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoServerSelectorTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedParametrizedIT.java
(jackrabbit-oak) branch OAK-10786 deleted (was f14a9ed828)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was f14a9ed828 OAK-10786: tried to explain the 'oak1' modifier in the version number The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) 01/01: OAK-10799: Update (shaded) Guava to 33.2.0
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10799 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit cea265972b87fda3603399ba8891da4ad37d74ab Author: Julian Reschke AuthorDate: Mon May 13 14:20:29 2024 +0100 OAK-10799: Update (shaded) Guava to 33.2.0 --- oak-shaded-guava/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-shaded-guava/pom.xml b/oak-shaded-guava/pom.xml index 7e09726f71..ec9ff92660 100644 --- a/oak-shaded-guava/pom.xml +++ b/oak-shaded-guava/pom.xml @@ -28,8 +28,8 @@ bundle -33.1.0-jre -33.1.0 +33.2.0-jre +33.2.0 org.apache.jackrabbit.guava
(jackrabbit-oak) branch OAK-10799 created (now cea265972b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10799 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at cea265972b OAK-10799: Update (shaded) Guava to 33.2.0 This branch includes the following new commits: new cea265972b OAK-10799: Update (shaded) Guava to 33.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10786 updated (86584cf6dc -> f14a9ed828)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 86584cf6dc Merge branch 'trunk' into OAK-10786 add f14a9ed828 OAK-10786: tried to explain the 'oak1' modifier in the version number No new revisions were added by this update. Summary of changes: oak-lucene/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(jackrabbit-oak) branch OAK-10786 updated (e6fb97f394 -> 86584cf6dc)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from e6fb97f394 Merge branch 'trunk' into OAK-10786 add dc6dc4e15f OAK-10768: query-spi: deprecate use of slf4j.event.Level in QueryInde… (#1426) add 99edbd48d7 OAK-10793: Update Logback version to 1.2.13 (#1442) add 6f9cb9b998 OAK-10797: Update to Jackrabbit 2.20.16 (#1444) add 98206cb404 OAK-10778 - Support downloading from Mongo in parallel. (#1435) add 4914c1923e OAK-10795 - Indexing job: eliminate unnecessary intermediate object creation in transform stage (#1446) add 86584cf6dc Merge branch 'trunk' into OAK-10786 No new revisions were added by this update. Summary of changes: .../oak/plugins/index/IndexingReporter.java| 3 + .../org/apache/jackrabbit/oak/query/QueryImpl.java | 16 +- oak-parent/pom.xml | 4 +- .../jackrabbit/oak/spi/query/QueryIndex.java | 55 +- .../jackrabbit/oak/spi/query/package-info.java | 2 +- oak-run-commons/pom.xml| 19 +- .../indexer/document/DocumentStoreIndexerBase.java | 6 + .../flatfile/FlatFileNodeStoreBuilder.java | 9 +- .../document/flatfile/pipelined/DownloadRange.java | 48 +- .../pipelined/DownloadStageStatistics.java | 104 +++ .../pipelined/MongoDownloaderRegexUtils.java | 169 .../MongoParallelDownloadCoordinator.java | 138 .../pipelined/MongoRegexPathFilterFactory.java | 4 +- .../flatfile/pipelined/NodeDocumentCodec.java | 28 +- .../pipelined/PipelinedMongoDownloadTask.java | 904 - .../pipelined/PipelinedMongoServerSelector.java| 179 .../flatfile/pipelined/PipelinedStrategy.java | 28 +- .../flatfile/pipelined/PipelinedTransformTask.java | 24 +- .../document/mongo/MongoDocumentStoreHelper.java | 4 + .../oak/run/cli/DocumentFixtureProvider.java | 1 + .../MongoParallelDownloadCoordinatorTest.java | 169 .../flatfile/pipelined/MongoTestBackend.java | 57 ++ .../flatfile/pipelined/PipelineITUtil.java | 215 + .../document/flatfile/pipelined/PipelinedIT.java | 355 +++- .../PipelinedMongoConnectionFailureIT.java | 138 .../pipelined/PipelinedMongoDownloadTaskTest.java | 152 +--- .../PipelinedMongoServerSelectorTest.java | 315 +++ .../pipelined/PipelinedParametrizedIT.java | 288 +++ .../oak/index/DocumentStoreIndexerIT.java | 3 + .../jackrabbit/oak/index/IncrementalStoreTest.java | 9 +- .../search/spi/query/FulltextIndexPlanner.java | 5 +- .../oak/plugins/document/util/MongoConnection.java | 8 + 32 files changed, 2594 insertions(+), 865 deletions(-) create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/DownloadStageStatistics.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoDownloaderRegexUtils.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoParallelDownloadCoordinator.java create mode 100644 oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoServerSelector.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoParallelDownloadCoordinatorTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoTestBackend.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelineITUtil.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoServerSelectorTest.java create mode 100644 oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedParametrizedIT.java
(jackrabbit-oak) branch trunk updated: OAK-10797: Update to Jackrabbit 2.20.16 (#1444)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 6f9cb9b998 OAK-10797: Update to Jackrabbit 2.20.16 (#1444)
6f9cb9b998 is described below
commit 6f9cb9b9986e7b97ffccea7088f52007cc9d3859
Author: Julian Reschke
AuthorDate: Mon May 13 07:38:45 2024 +0200
OAK-10797: Update to Jackrabbit 2.20.16 (#1444)
---
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 25c9e6248c..7f089fe984 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -48,7 +48,7 @@
${project.build.sourceEncoding}
-2.20.15
+2.20.16
127.0.0.1
27017
MongoMKDB
(jackrabbit-oak) branch OAK-10797 deleted (was beba967afd)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10797 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was beba967afd OAK-10797: Update to Jackrabbit 2.20.16 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch OAK-10797 created (now beba967afd)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10797 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at beba967afd OAK-10797: Update to Jackrabbit 2.20.16 This branch includes the following new commits: new beba967afd OAK-10797: Update to Jackrabbit 2.20.16 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10797: Update to Jackrabbit 2.20.16
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10797
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit beba967afd31cc5f925a86161285eee2d86b1c02
Author: Julian Reschke
AuthorDate: Mon May 13 06:38:05 2024 +0100
OAK-10797: Update to Jackrabbit 2.20.16
---
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 25c9e6248c..7f089fe984 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -48,7 +48,7 @@
${project.build.sourceEncoding}
-2.20.15
+2.20.16
127.0.0.1
27017
MongoMKDB
(jackrabbit-oak) 01/01: OAK-10787: oak-lucene: backport fix for lucene-core vulnerability
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10787
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b9a062aa5a15011819220663e63334328e2d4286
Author: Julian Reschke
AuthorDate: Sat May 11 13:04:24 2024 +0100
OAK-10787: oak-lucene: backport fix for lucene-core vulnerability
---
oak-lucene/pom.xml | 2 +-
.../org/apache/lucene/util/automaton/RegExp.java | 42 +++---
.../plugins/index/lucene/LuceneSecurityTest.java | 2 --
.../oak/plugins/index/FullTextIndexCommonTest.java | 2 --
4 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
index 8e9121f870..2b13a5864a 100644
--- a/oak-lucene/pom.xml
+++ b/oak-lucene/pom.xml
@@ -107,7 +107,7 @@
<_exportcontents>
!org.apache.lucene.queryparser.xml,
!org.apache.lucene.queryparser.xml.builders,
- org.apache.lucene.*;version=${lucene.version}-oak1
+ org.apache.lucene.*;version=${lucene.version}-oak2
org.apache.jackrabbit.oak.plugins.index.lucene,
diff --git
a/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
b/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
index 3dd1c87950..c088fc1c5e 100644
--- a/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
+++ b/oak-lucene/src/main/java/org/apache/lucene/util/automaton/RegExp.java
@@ -43,6 +43,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
/**
* Regular Expression extension to Automaton.
@@ -872,23 +874,39 @@ public class RegExp {
}
final RegExp parseUnionExp() throws IllegalArgumentException {
-RegExp e = parseInterExp();
-if (match('|')) e = makeUnion(e, parseUnionExp());
-return e;
+return iterativeParseExp(this::parseInterExp, () -> match('|'),
RegExp::makeUnion);
}
final RegExp parseInterExp() throws IllegalArgumentException {
-RegExp e = parseConcatExp();
-if (check(INTERSECTION) && match('&')) e = makeIntersection(e,
-parseInterExp());
-return e;
+return iterativeParseExp(
+ this::parseConcatExp, () -> check(INTERSECTION) && match('&'),
RegExp::makeIntersection);
}
final RegExp parseConcatExp() throws IllegalArgumentException {
-RegExp e = parseRepeatExp();
-if (more() && !peek(")|") && (!check(INTERSECTION) || !peek("&"))) e =
makeConcatenation(
-e, parseConcatExp());
-return e;
+return iterativeParseExp(
+ this::parseRepeatExp,
+() -> (more() && !peek(")|") && (!check(INTERSECTION) || !peek("&"))),
+RegExp::makeConcatenation);
+}
+
+ /**
+ * Custom Functional Interface for a Supplying methods with signature of
RegExp(RegExp
+ * exp1, RegExp exp2)
+ */
+ @FunctionalInterface
+ private interface MakeRegexGroup {
+RegExp get(RegExp exp1, RegExp exp2);
+ }
+
+ final RegExp iterativeParseExp(
+ Supplier gather, BooleanSupplier stop, MakeRegexGroup
associativeReduce)
+ throws IllegalArgumentException {
+RegExp result = gather.get();
+while (stop.getAsBoolean() == true) {
+ RegExp e = gather.get();
+ result = associativeReduce.get(result, e);
+}
+return result;
}
final RegExp parseRepeatExp() throws IllegalArgumentException {
@@ -985,7 +1003,7 @@ public class RegExp {
try {
if (i == 0 || i == s.length() - 1 || i != s.lastIndexOf('-')) throw
new NumberFormatException();
String smin = s.substring(0, i);
- String smax = s.substring(i + 1, s.length());
+ String smax = s.substring(i + 1);
int imin = Integer.parseInt(smin);
int imax = Integer.parseInt(smax);
int digits;
diff --git
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneSecurityTest.java
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneSecurityTest.java
index 226f715308..dd8b4967d5 100755
---
a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneSecurityTest.java
+++
b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneSecurityTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -27,7 +26,6 @@ import org.junit.Test;
public class LuceneSecurityTest {
@Test
-@Ignore("OAK-10713")
public void complexRegexp() throws Exception {
// test borrowed from: https://github.com/apache/lucene/issues/11537
StringBuilder strBuilder =
(jackrabbit-oak) branch OAK-10787 created (now b9a062aa5a)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10787 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at b9a062aa5a OAK-10787: oak-lucene: backport fix for lucene-core vulnerability This branch includes the following new commits: new b9a062aa5a OAK-10787: oak-lucene: backport fix for lucene-core vulnerability The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10793 deleted (was 37f24725fe)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10793 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 37f24725fe OAK-10793: Update Logback version to 1.2.13 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch trunk updated: OAK-10793: Update Logback version to 1.2.13 (#1442)
This is an automated email from the ASF dual-hosted git repository. reschke 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 99edbd48d7 OAK-10793: Update Logback version to 1.2.13 (#1442) 99edbd48d7 is described below commit 99edbd48d7b1b63fe6b127afa7ea0fe8d960de5f Author: Julian Reschke AuthorDate: Sat May 11 13:51:37 2024 +0200 OAK-10793: Update Logback version to 1.2.13 (#1442) --- 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 3b08500c9f..25c9e6248c 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -61,7 +61,7 @@ 3.12.11 1.7.36 1.7.36 -1.2.10 +1.2.13 2.1.214 1.28.5 10.15.2.0
(jackrabbit-oak) branch OAK-10793 created (now 37f24725fe)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10793 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 37f24725fe OAK-10793: Update Logback version to 1.2.13 This branch includes the following new commits: new 37f24725fe OAK-10793: Update Logback version to 1.2.13 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10793: Update Logback version to 1.2.13
This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10793 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git commit 37f24725fe95caceff87b449702a87fedcb07c79 Author: Julian Reschke AuthorDate: Sat May 11 12:50:56 2024 +0100 OAK-10793: Update Logback version to 1.2.13 --- 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 3b08500c9f..25c9e6248c 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -61,7 +61,7 @@ 3.12.11 1.7.36 1.7.36 -1.2.10 +1.2.13 2.1.214 1.28.5 10.15.2.0
(jackrabbit-oak) branch OAK-10786 updated (4f9b01a504 -> e6fb97f394)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 4f9b01a504 OAK-10786: add copies of META-INF/services/org.apache.lucene.codecs.DocValuesFormat and META-INF/services/org.apache.lucene.codecs.PostingsFormat add f752440b0f Revert "OAK-10701: Upgrade h2db dependency to 2.2.220" add f0ac80ebd8 OAK-10776 | Add support for custom excludes in incremental index store (#1437) add 86befafe67 OAK-10784: o.a.j.o.plugins.migration.version.VersionableEditor should create the version storage node, if needed (#1438) add e6fb97f394 Merge branch 'trunk' into OAK-10786 No new revisions were added by this update. Summary of changes: .../migration/version/VersionableEditor.java | 9 +- .../version/VersionablePropertiesEditor.java | 4 +- oak-parent/pom.xml | 2 +- .../indexer/document/DocumentStoreIndexerBase.java | 30 ++ .../jackrabbit/oak/index/IncrementalStoreTest.java | 110 + 5 files changed, 131 insertions(+), 24 deletions(-)
(jackrabbit-oak) branch OAK-10786 updated (43a1b86bae -> 4f9b01a504)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 43a1b86bae OAK-10786: bump exported lucene package version to clarify that this is Oak's fork add 4f9b01a504 OAK-10786: add copies of META-INF/services/org.apache.lucene.codecs.DocValuesFormat and META-INF/services/org.apache.lucene.codecs.PostingsFormat No new revisions were added by this update. Summary of changes: .../META-INF/services/org.apache.lucene.codecs.DocValuesFormat | 3 ++- .../META-INF/services/org.apache.lucene.codecs.PostingsFormat | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) copy oak-jcr/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory => oak-lucene/src/main/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (87%) copy oak-jcr/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory => oak-lucene/src/main/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat (87%)
(jackrabbit-oak) branch OAK-10786 updated (26eea06259 -> 43a1b86bae)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 26eea06259 OAK-10786: add a comment about where the code originates from add 43a1b86bae OAK-10786: bump exported lucene package version to clarify that this is Oak's fork No new revisions were added by this update. Summary of changes: oak-lucene/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(jackrabbit-oak) branch trunk updated: Revert "OAK-10701: Upgrade h2db dependency to 2.2.220"
This is an automated email from the ASF dual-hosted git repository. reschke 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 f752440b0f Revert "OAK-10701: Upgrade h2db dependency to 2.2.220" f752440b0f is described below commit f752440b0fd3e820f3706c828ac8d629ff266321 Author: Julian Reschke AuthorDate: Tue May 7 10:51:58 2024 +0100 Revert "OAK-10701: Upgrade h2db dependency to 2.2.220" This reverts commit 54f9c18e6c8e06e0eae5380ae71a77232e2802f1. --- 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 02d57cdf6e..3b08500c9f 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -62,7 +62,7 @@ 1.7.36 1.7.36 1.2.10 -2.2.220 +2.1.214 1.28.5 10.15.2.0 2.16.2
(jackrabbit-oak) branch OAK-10786 updated: OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - remove lucene-core dependency
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10786
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-10786 by this push:
new c2c95c9b85 OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source
code - remove lucene-core dependency
c2c95c9b85 is described below
commit c2c95c9b85266a5897afa5570481cc512d1e0200
Author: Julian Reschke
AuthorDate: Mon May 6 12:02:16 2024 +0100
OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - remove
lucene-core dependency
---
oak-lucene/pom.xml | 5 -
1 file changed, 5 deletions(-)
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
index 201acbb456..21f5679969 100644
--- a/oak-lucene/pom.xml
+++ b/oak-lucene/pom.xml
@@ -213,11 +213,6 @@
-
- org.apache.lucene
- lucene-core
- ${lucene.version}
-
org.apache.lucene
lucene-analyzers-common
(jackrabbit-oak) branch OAK-10786 updated: OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - fix two issues JDK 11 incompatibility
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10786
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-10786 by this push:
new bca1e9c63c OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source
code - fix two issues JDK 11 incompatibility
bca1e9c63c is described below
commit bca1e9c63c470967e3bee363d22c2026219d49e8
Author: Julian Reschke
AuthorDate: Mon May 6 10:46:01 2024 +0100
OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - fix two
issues JDK 11 incompatibility
---
.../apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java | 7 ---
.../apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java | 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
index b2ae156821..67f14cdb2d 100644
---
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
+++
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
@@ -119,9 +119,10 @@ class Lucene42DocValuesProducer extends DocValuesProducer {
}
success = false;
+IndexInput tmp = null;
try {
String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name,
state.segmentSuffix, dataExtension);
- data = state.directory.openInput(dataName, state.context);
+ data = tmp = state.directory.openInput(dataName, state.context);
final int version2 = CodecUtil.checkHeader(data, dataCodec,
VERSION_START,
VERSION_CURRENT);
@@ -131,8 +132,8 @@ class Lucene42DocValuesProducer extends DocValuesProducer {
success = true;
} finally {
- if (!success) {
-IOUtils.closeWhileHandlingException(this.data);
+ if (!success && tmp != null) {
+IOUtils.closeWhileHandlingException(tmp);
}
}
}
diff --git
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
index d14b5b7971..5eed771fb7 100644
---
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
+++
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
@@ -104,9 +104,10 @@ public class Lucene45DocValuesProducer extends
DocValuesProducer implements Clos
}
success = false;
+IndexInput tmp = null;
try {
String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name,
state.segmentSuffix, dataExtension);
- data = state.directory.openInput(dataName, state.context);
+ data = tmp = state.directory.openInput(dataName, state.context);
final int version2 = CodecUtil.checkHeader(data, dataCodec,
Lucene45DocValuesFormat.VERSION_START,
Lucene45DocValuesFormat.VERSION_CURRENT);
@@ -116,8 +117,8 @@ public class Lucene45DocValuesProducer extends
DocValuesProducer implements Clos
success = true;
} finally {
- if (!success) {
-IOUtils.closeWhileHandlingException(this.data);
+ if (!success && tmp != null) {
+IOUtils.closeWhileHandlingException(tmp);
}
}
(jackrabbit-oak) branch OAK-10786 created (now f27a872c8b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10786 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at f27a872c8b OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - include copy of lucene-core 4.7.2 (g...@github.com:apache/lucene.git, tag releases/lucene-solr/4.7.2, path lucene/core/src/java) This branch includes the following new commits: new f27a872c8b OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - include copy of lucene-core 4.7.2 (g...@github.com:apache/lucene.git, tag releases/lucene-solr/4.7.2, path lucene/core/src/java) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch OAK-10719 updated (c2b347d3d0 -> 622689fe0a)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10719 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from c2b347d3d0 OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - include copy of lucene-core 4.7.2 (g...@github.com:apache/lucene.git, tag releases/lucene-solr/4.7.2, path lucene/core/src/java) new ce08beae1b OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - fix two issues JDK 11 incompatibility new 622689fe0a OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - remove lucene-core dependency The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: oak-lucene/pom.xml | 5 - .../apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java | 7 --- .../apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java | 7 --- 3 files changed, 8 insertions(+), 11 deletions(-)
(jackrabbit-oak) 01/02: OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - fix two issues JDK 11 incompatibility
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10719
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit ce08beae1bb379301c38b73405b96b7fa75cfbd2
Author: Julian Reschke
AuthorDate: Mon May 6 10:46:01 2024 +0100
OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - fix two
issues JDK 11 incompatibility
---
.../apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java | 7 ---
.../apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java | 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
index b2ae156821..67f14cdb2d 100644
---
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
+++
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesProducer.java
@@ -119,9 +119,10 @@ class Lucene42DocValuesProducer extends DocValuesProducer {
}
success = false;
+IndexInput tmp = null;
try {
String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name,
state.segmentSuffix, dataExtension);
- data = state.directory.openInput(dataName, state.context);
+ data = tmp = state.directory.openInput(dataName, state.context);
final int version2 = CodecUtil.checkHeader(data, dataCodec,
VERSION_START,
VERSION_CURRENT);
@@ -131,8 +132,8 @@ class Lucene42DocValuesProducer extends DocValuesProducer {
success = true;
} finally {
- if (!success) {
-IOUtils.closeWhileHandlingException(this.data);
+ if (!success && tmp != null) {
+IOUtils.closeWhileHandlingException(tmp);
}
}
}
diff --git
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
index d14b5b7971..5eed771fb7 100644
---
a/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
+++
b/oak-lucene/src/main/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
@@ -104,9 +104,10 @@ public class Lucene45DocValuesProducer extends
DocValuesProducer implements Clos
}
success = false;
+IndexInput tmp = null;
try {
String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name,
state.segmentSuffix, dataExtension);
- data = state.directory.openInput(dataName, state.context);
+ data = tmp = state.directory.openInput(dataName, state.context);
final int version2 = CodecUtil.checkHeader(data, dataCodec,
Lucene45DocValuesFormat.VERSION_START,
Lucene45DocValuesFormat.VERSION_CURRENT);
@@ -116,8 +117,8 @@ public class Lucene45DocValuesProducer extends
DocValuesProducer implements Clos
success = true;
} finally {
- if (!success) {
-IOUtils.closeWhileHandlingException(this.data);
+ if (!success && tmp != null) {
+IOUtils.closeWhileHandlingException(tmp);
}
}
(jackrabbit-oak) 02/02: OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - remove lucene-core dependency
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10719
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 622689fe0a0cfb37a17fd73b8b255c98aea5c77b
Author: Julian Reschke
AuthorDate: Mon May 6 12:02:16 2024 +0100
OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - remove
lucene-core dependency
---
oak-lucene/pom.xml | 5 -
1 file changed, 5 deletions(-)
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
index 201acbb456..21f5679969 100644
--- a/oak-lucene/pom.xml
+++ b/oak-lucene/pom.xml
@@ -213,11 +213,6 @@
-
- org.apache.lucene
- lucene-core
- ${lucene.version}
-
org.apache.lucene
lucene-analyzers-common
(jackrabbit-oak) branch OAK-10719 created (now c2b347d3d0)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10719 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at c2b347d3d0 OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - include copy of lucene-core 4.7.2 (g...@github.com:apache/lucene.git, tag releases/lucene-solr/4.7.2, path lucene/core/src/java) This branch includes the following new commits: new c2b347d3d0 OAK-10786: oak-lucene: use copy of lucene-core 4.7.2 source code - include copy of lucene-core 4.7.2 (g...@github.com:apache/lucene.git, tag releases/lucene-solr/4.7.2, path lucene/core/src/java) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) branch trunk updated: OAK-10701: Upgrade h2db dependency to 2.2.220
This is an automated email from the ASF dual-hosted git repository. reschke 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 54f9c18e6c OAK-10701: Upgrade h2db dependency to 2.2.220 54f9c18e6c is described below commit 54f9c18e6c8e06e0eae5380ae71a77232e2802f1 Author: Julian Reschke AuthorDate: Sat May 4 16:30:30 2024 +0100 OAK-10701: Upgrade h2db dependency to 2.2.220 --- 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 3b08500c9f..02d57cdf6e 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -62,7 +62,7 @@ 1.7.36 1.7.36 1.2.10 -2.1.214 +2.2.220 1.28.5 10.15.2.0 2.16.2
(jackrabbit-oak) branch trunk updated: OAK-10777: oak-lucene: add test coverage for stack overflow based on very long and complex regexp using JCR lucene native query (#1434)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 dcae752850 OAK-10777: oak-lucene: add test coverage for stack overflow
based on very long and complex regexp using JCR lucene native query (#1434)
dcae752850 is described below
commit dcae75285040b9f60d8464d5f8ea9d210d3412a6
Author: Julian Reschke
AuthorDate: Fri Apr 26 18:25:17 2024 +0200
OAK-10777: oak-lucene: add test coverage for stack overflow based on very
long and complex regexp using JCR lucene native query (#1434)
---
.../oak/plugins/index/FullTextIndexCommonTest.java | 22 ++
1 file changed, 22 insertions(+)
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 e32c77fcdd..e02d1ead07 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
@@ -22,6 +22,7 @@ import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.List;
@@ -63,6 +64,27 @@ public abstract class FullTextIndexCommonTest extends
AbstractQueryTest {
});
}
+@Test
+@Ignore("OAK-10777")
+public void fullTextQueryRegExp() throws Exception {
+Tree index = setup(builder ->
builder.indexRule("nt:base").property("propa").analyzed(), idx -> {
+},
+"propa");
+
+// test borrowed from: https://github.com/apache/lucene/issues/11537
+StringBuilder strBuilder = new StringBuilder();
+for (int i = 0; i < 5; i++) {
+strBuilder.append("b");
+}
+
+String query = "//*[rep:native('lucene', '/" + strBuilder + "/')]";
+
+assertEventually(() -> {
+assertThat(explain(query, XPATH),
containsString(indexOptions.getIndexType() + ":" + index.getName()));
+assertQuery(query, XPATH, List.of());
+});
+}
+
@Test
public void fullTextQueryWithDifferentBoosts() throws Exception {
setup(builder -> {
(jackrabbit-oak) branch OAK-10777 deleted (was 9f6dc23c0b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10777 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git was 9f6dc23c0b OAK-10777: oak-lucene: add test coverage for stack overflow based on very long and complex regexp using JCR lucene native query The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(jackrabbit-oak) branch OAK-10777 created (now 9f6dc23c0b)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch OAK-10777 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git at 9f6dc23c0b OAK-10777: oak-lucene: add test coverage for stack overflow based on very long and complex regexp using JCR lucene native query This branch includes the following new commits: new 9f6dc23c0b OAK-10777: oak-lucene: add test coverage for stack overflow based on very long and complex regexp using JCR lucene native query The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(jackrabbit-oak) 01/01: OAK-10777: oak-lucene: add test coverage for stack overflow based on very long and complex regexp using JCR lucene native query
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10777
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 9f6dc23c0be7708e568d34a79654063da8e264e1
Author: Julian Reschke
AuthorDate: Tue Apr 23 15:31:18 2024 +0100
OAK-10777: oak-lucene: add test coverage for stack overflow based on very
long and complex regexp using JCR lucene native query
---
.../oak/plugins/index/FullTextIndexCommonTest.java | 22 ++
1 file changed, 22 insertions(+)
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 e32c77fcdd..e02d1ead07 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
@@ -22,6 +22,7 @@ import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.List;
@@ -63,6 +64,27 @@ public abstract class FullTextIndexCommonTest extends
AbstractQueryTest {
});
}
+@Test
+@Ignore("OAK-10777")
+public void fullTextQueryRegExp() throws Exception {
+Tree index = setup(builder ->
builder.indexRule("nt:base").property("propa").analyzed(), idx -> {
+},
+"propa");
+
+// test borrowed from: https://github.com/apache/lucene/issues/11537
+StringBuilder strBuilder = new StringBuilder();
+for (int i = 0; i < 5; i++) {
+strBuilder.append("b");
+}
+
+String query = "//*[rep:native('lucene', '/" + strBuilder + "/')]";
+
+assertEventually(() -> {
+assertThat(explain(query, XPATH),
containsString(indexOptions.getIndexType() + ":" + index.getName()));
+assertQuery(query, XPATH, List.of());
+});
+}
+
@Test
public void fullTextQueryWithDifferentBoosts() throws Exception {
setup(builder -> {
(jackrabbit-oak) branch 1.22 updated: OAK-10218: oak-it-osgi: avoid Guava dependency (#918)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 7ec2f741bd OAK-10218: oak-it-osgi: avoid Guava dependency (#918)
7ec2f741bd is described below
commit 7ec2f741bd60471e0792451371fe2f1765906826
Author: Julian Reschke
AuthorDate: Tue May 2 17:11:00 2023 +0200
OAK-10218: oak-it-osgi: avoid Guava dependency (#918)
---
oak-it-osgi/pom.xml | 5 -
.../java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java| 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/oak-it-osgi/pom.xml b/oak-it-osgi/pom.xml
index e8713eca7d..5f964308f5 100644
--- a/oak-it-osgi/pom.xml
+++ b/oak-it-osgi/pom.xml
@@ -188,11 +188,6 @@
commons-lang3
test
-
- com.google.guava
- guava
- test
-
commons-fileupload
commons-fileupload
diff --git
a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
index ee2f92c4e5..bf4234d750 100644
---
a/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
+++
b/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/TikaExtractionOsgiIT.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.osgi;
-import com.google.common.collect.Maps;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.Parser;
@@ -43,6 +42,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -152,7 +152,7 @@ public class TikaExtractionOsgiIT {
assertEquals("Unexpected number of properties found in " +
VERSION_PROP_RESOURCE_NAME,
VERSION_KEYS.length, props.size());
-Map versions = Maps.newHashMap();
+Map versions = new HashMap<>();
for (String versionKey : VERSION_KEYS) {
String version = props.getProperty(versionKey);
(jackrabbit-oak) branch 1.22 updated: OAK-10702: oak-blob-cloud: update netty dependendy to 4.1.107 (#1358)
This is an automated email from the ASF dual-hosted git repository. reschke 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 620fbdabbc OAK-10702: oak-blob-cloud: update netty dependendy to 4.1.107 (#1358) 620fbdabbc is described below commit 620fbdabbc2d8da4c0b3df95837a4d71784efcd7 Author: Julian Reschke AuthorDate: Mon Mar 11 18:04:18 2024 +0100 OAK-10702: oak-blob-cloud: update netty dependendy to 4.1.107 (#1358) --- oak-blob-cloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index a8501361a1..41fd72f6bb 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -31,7 +31,7 @@ bundle -4.1.96.Final +4.1.107.Final 1.12.353
(jackrabbit-oak) branch 1.22 updated: OAK-10386: Bump netty dependency from 4.1.52.Final to 4.1.96.Final
This is an automated email from the ASF dual-hosted git repository. reschke 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 82c389de91 OAK-10386: Bump netty dependency from 4.1.52.Final to 4.1.96.Final 82c389de91 is described below commit 82c389de91985cb35891e2c36ef58d95bcbdc9dc Author: Julian Reschke AuthorDate: Fri Apr 19 13:23:49 2024 +0100 OAK-10386: Bump netty dependency from 4.1.52.Final to 4.1.96.Final --- oak-blob-cloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index 85c8cd4f94..a8501361a1 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -31,7 +31,7 @@ bundle -4.1.52.Final +4.1.96.Final 1.12.353
(jackrabbit-oak) branch 1.22 updated: OAK-10725: Upgrade jackson-databind dependency to 2.16.2
This is an automated email from the ASF dual-hosted git repository. reschke 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 51a2fb6880 OAK-10725: Upgrade jackson-databind dependency to 2.16.2 51a2fb6880 is described below commit 51a2fb688010fed33f31b6dbe661321fafacd3a1 Author: Julian Reschke AuthorDate: Fri Apr 19 12:04:45 2024 +0100 OAK-10725: Upgrade jackson-databind dependency to 2.16.2 --- 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 db186db1ed..dcbd848fa9 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -68,7 +68,7 @@ 15.0 com.google.common.*;version="[15.0,20)" 10.14.2.0 -2.16.1 +2.16.2 1.19.0 2.5.23 1.8
(jackrabbit-oak) branch 1.22 updated: OAK-10712: update groovy dependency to 2.5.23
This is an automated email from the ASF dual-hosted git repository. reschke 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 9f0448e62c OAK-10712: update groovy dependency to 2.5.23 9f0448e62c is described below commit 9f0448e62c73af2db5bc2c15a590f5224dafbcd2 Author: Julian Reschke AuthorDate: Fri Apr 19 10:26:12 2024 +0100 OAK-10712: update groovy dependency to 2.5.23 --- 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 6141324137..db186db1ed 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -70,7 +70,7 @@ 10.14.2.0 2.16.1 1.19.0 -2.5.22 +2.5.23 1.8 java18
(jackrabbit-oak) branch 1.22 updated: OAK-10300: update groovy dependency to 2.5.22
This is an automated email from the ASF dual-hosted git repository. reschke 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 f5cc08197d OAK-10300: update groovy dependency to 2.5.22 f5cc08197d is described below commit f5cc08197d199dbbb71cccb950ae4cb35f5b9214 Author: Julian Reschke AuthorDate: Fri Apr 19 09:10:44 2024 +0100 OAK-10300: update groovy dependency to 2.5.22 --- 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 92bc5991e4..6141324137 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -70,7 +70,7 @@ 10.14.2.0 2.16.1 1.19.0 -2.5.20 +2.5.22 1.8 java18
(jackrabbit-oak) branch 1.22 updated: OAK-10668: examples: update jetty-maven-plugin to 11.0.20 (#1324)
This is an automated email from the ASF dual-hosted git repository. reschke 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 320ed00556 OAK-10668: examples: update jetty-maven-plugin to 11.0.20 (#1324) 320ed00556 is described below commit 320ed00556884e9d83fcfa43c267ab93bcd034f4 Author: Julian Reschke AuthorDate: Sun Feb 25 21:37:56 2024 +0100 OAK-10668: examples: update jetty-maven-plugin to 11.0.20 (#1324) --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 601b2bee41..adf6332043 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -215,7 +215,7 @@ org.eclipse.jetty jetty-maven-plugin - 10.0.15 + 11.0.20 -1
(jackrabbit-oak) branch 1.22 updated: OAK-10337: mvn jetty:run fails to start oak-web
This is an automated email from the ASF dual-hosted git repository. reschke 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 b9c2c9671b OAK-10337: mvn jetty:run fails to start oak-web b9c2c9671b is described below commit b9c2c9671bb5dbc76d1cae80839d11149bfb0a0a Author: Manfred Baedke AuthorDate: Tue Jul 4 13:39:26 2023 +0200 OAK-10337: mvn jetty:run fails to start oak-web Upgrade to jetty-10.0.15. --- oak-examples/webapp/pom.xml | 19 ++- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 464bf7cb9a..601b2bee41 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -207,28 +207,21 @@ io.dropwizard.metrics metrics-core - test - -maven-war-plugin -3.2.3 - org.eclipse.jetty jetty-maven-plugin - 9.4.11.v20180605 + 10.0.15 - 0 - - - 8080 - 6 - - + -1 + + 8080 + 6 +
(jackrabbit-oak) branch 1.22 updated: OAK-10056: Provide support for Jakarta Region for AWS S3 (upgrade aws version)
This is an automated email from the ASF dual-hosted git repository. reschke 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 ecd0168ed4 OAK-10056: Provide support for Jakarta Region for AWS S3 (upgrade aws version) ecd0168ed4 is described below commit ecd0168ed439e2e37cd32e1683e5f061fc5a5638 Author: Julian Reschke AuthorDate: Thu Apr 18 12:47:48 2024 +0100 OAK-10056: Provide support for Jakarta Region for AWS S3 (upgrade aws version) --- oak-blob-cloud/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-blob-cloud/pom.xml b/oak-blob-cloud/pom.xml index fa2dedbe8b..85c8cd4f94 100644 --- a/oak-blob-cloud/pom.xml +++ b/oak-blob-cloud/pom.xml @@ -32,7 +32,7 @@ 4.1.52.Final -1.11.700 +1.12.353
(jackrabbit-oak) branch 1.22 updated: OAK-10687: Restore and cleanup SCM information
This is an automated email from the ASF dual-hosted git repository.
reschke 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 19efb8f275 OAK-10687: Restore and cleanup SCM information
19efb8f275 is described below
commit 19efb8f2758b69792d3871b49d410212b791a5b7
Author: Julian Reschke
AuthorDate: Thu Apr 18 11:17:45 2024 +0100
OAK-10687: Restore and cleanup SCM information
---
oak-parent/pom.xml | 13 +++--
pom.xml| 7 ---
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index cfe2e7a228..92bc5991e4 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -37,7 +37,7 @@
1709307307
-3.3.9
+3.6.1
${java.version}
-Xmx512m
${test.opts.coverage} ${test.opts.memory}
-XX:+HeapDumpOnOutOfMemoryError -Dupdate.limit=100
-Djava.awt.headless=true
@@ -1245,10 +1245,11 @@
-
-
scm:svn:https://svn.apache.org/repos/asf/maven/pom/branches/1.22/oak-parent
-
scm:svn:https://svn.apache.org/repos/asf/maven/pom/branches/1.22/oak-parent
-https://svn.apache.org/viewvc/maven/pom/branches/1.22/oak-parent
-jackrabbit-oak-1.22.9
+
+
+
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/tree/${project.scm.tag}
+1.22
diff --git a/pom.xml b/pom.xml
index 34a4a2b4b6..c7a24a845d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,13 +78,6 @@
oak-search-elastic
-
-
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) branch 1.22 updated: OAK-10723: Update commons-lang3 dependency to 3.14.0 (#1382)
This is an automated email from the ASF dual-hosted git repository. reschke 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 4e5026cf76 OAK-10723: Update commons-lang3 dependency to 3.14.0 (#1382) 4e5026cf76 is described below commit 4e5026cf7698ed49d07377dc5b77636728d6697e Author: Julian Reschke AuthorDate: Tue Mar 26 15:05:52 2024 +0100 OAK-10723: Update commons-lang3 dependency to 3.14.0 (#1382) --- 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 6b7c9f5353..cfe2e7a228 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -598,7 +598,7 @@ org.apache.commons commons-lang3 -3.13.0 +3.14.0 commons-io
(jackrabbit-oak) branch 1.22 updated: OAK-10678: update gmavenplus plugin to 3.0.2 (#1334)
This is an automated email from the ASF dual-hosted git repository. reschke 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 96730aeefb OAK-10678: update gmavenplus plugin to 3.0.2 (#1334) 96730aeefb is described below commit 96730aeefb8b6235dd4282dc03a1d1c407d47c53 Author: Julian Reschke AuthorDate: Thu Feb 29 10:11:02 2024 +0100 OAK-10678: update gmavenplus plugin to 3.0.2 (#1334) --- 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 214e8434d2..6b7c9f5353 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -259,7 +259,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.13.1 + 3.0.2 maven-deploy-plugin
(jackrabbit-oak) 01/02: OAK-10695: oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.26.0 (#1348)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 5020310ad8792b9a2e47867957ca173a99b7fe38
Author: Julian Reschke
AuthorDate: Thu Mar 7 07:14:32 2024 +0100
OAK-10695: oak-benchmarks/oak-it-osgi: update commons-compress dependency
to 1.26.0 (#1348)
---
oak-benchmarks/pom.xml | 2 +-
oak-it-osgi/src/test/resources/versions.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml
index a484d4e10d..8eb2512c98 100644
--- a/oak-benchmarks/pom.xml
+++ b/oak-benchmarks/pom.xml
@@ -201,7 +201,7 @@
org.apache.commons
commons-compress
-1.23.0
+1.26.0
org.mongodb
diff --git a/oak-it-osgi/src/test/resources/versions.properties
b/oak-it-osgi/src/test/resources/versions.properties
index 54a95e7f3b..9724b8b928 100644
--- a/oak-it-osgi/src/test/resources/versions.properties
+++ b/oak-it-osgi/src/test/resources/versions.properties
@@ -17,6 +17,6 @@
tika=${tika.version}
poi=5.2.2
commons-collections4=4.4
-commons-compress=1.23.0
+commons-compress=1.26.0
commons-lang3=3.13.0
commons-math3=3.6.1
(jackrabbit-oak) branch 1.22 updated (7f01673771 -> fbe20072c3)
This is an automated email from the ASF dual-hosted git repository. reschke pushed a change to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git from 7f01673771 OAK-10683: Update spring-boot dependency to version 2.7.18 (#1335) new 5020310ad8 OAK-10695: oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.26.0 (#1348) new fbe20072c3 OAK-10695: oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.26.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: oak-benchmarks/pom.xml | 2 +- oak-it-osgi/src/test/resources/versions.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(jackrabbit-oak) 02/02: OAK-10695: oak-benchmarks/oak-it-osgi: update commons-compress dependency to 1.26.1
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit fbe20072c30d40beb8f51b076ba03800da1c48d9
Author: Julian Reschke
AuthorDate: Thu Mar 21 11:39:50 2024 +0100
OAK-10695: oak-benchmarks/oak-it-osgi: update commons-compress dependency
to 1.26.1
---
oak-benchmarks/pom.xml | 2 +-
oak-it-osgi/src/test/resources/versions.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oak-benchmarks/pom.xml b/oak-benchmarks/pom.xml
index 8eb2512c98..330948909d 100644
--- a/oak-benchmarks/pom.xml
+++ b/oak-benchmarks/pom.xml
@@ -201,7 +201,7 @@
org.apache.commons
commons-compress
-1.26.0
+1.26.1
org.mongodb
diff --git a/oak-it-osgi/src/test/resources/versions.properties
b/oak-it-osgi/src/test/resources/versions.properties
index 9724b8b928..9529caea30 100644
--- a/oak-it-osgi/src/test/resources/versions.properties
+++ b/oak-it-osgi/src/test/resources/versions.properties
@@ -17,6 +17,6 @@
tika=${tika.version}
poi=5.2.2
commons-collections4=4.4
-commons-compress=1.26.0
+commons-compress=1.26.1
commons-lang3=3.13.0
commons-math3=3.6.1
(jackrabbit-oak) branch 1.22 updated: OAK-10683: Update spring-boot dependency to version 2.7.18 (#1335)
This is an automated email from the ASF dual-hosted git repository. reschke 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 7f01673771 OAK-10683: Update spring-boot dependency to version 2.7.18 (#1335) 7f01673771 is described below commit 7f01673771180908ca1c018acddd0f27b3f12ad3 Author: Julian Reschke AuthorDate: Fri Mar 1 16:00:01 2024 +0100 OAK-10683: Update spring-boot dependency to version 2.7.18 (#1335) --- oak-examples/standalone/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/standalone/pom.xml b/oak-examples/standalone/pom.xml index 4343e0bcf9..eded6074ba 100644 --- a/oak-examples/standalone/pom.xml +++ b/oak-examples/standalone/pom.xml @@ -36,7 +36,7 @@ true -2.7.13 +2.7.18
(jackrabbit-oak) branch 1.22 updated: OAK-10350: Update spring-boot dependency to version 2.7.13 (#1027)
This is an automated email from the ASF dual-hosted git repository. reschke 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 f45e6564ce OAK-10350: Update spring-boot dependency to version 2.7.13 (#1027) f45e6564ce is described below commit f45e6564cead04dc11a0720764def914b76b9fcf Author: mbaedke AuthorDate: Wed Jul 19 09:58:58 2023 +0200 OAK-10350: Update spring-boot dependency to version 2.7.13 (#1027) Co-authored-by: Manfred Baedke --- oak-examples/standalone/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/standalone/pom.xml b/oak-examples/standalone/pom.xml index 318f48cb10..4343e0bcf9 100644 --- a/oak-examples/standalone/pom.xml +++ b/oak-examples/standalone/pom.xml @@ -36,7 +36,7 @@ true -2.5.14 +2.7.13
(jackrabbit-oak) branch 1.22 updated: OAK-10697: webapp: update Tomcat dependency to 9.0.86 (#1351)
This is an automated email from the ASF dual-hosted git repository. reschke 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 f73111a87e OAK-10697: webapp: update Tomcat dependency to 9.0.86 (#1351) f73111a87e is described below commit f73111a87e5ec43c673ab7921a93d7b7241825c7 Author: Julian Reschke AuthorDate: Thu Mar 7 14:01:33 2024 +0100 OAK-10697: webapp: update Tomcat dependency to 9.0.86 (#1351) --- oak-examples/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 823b4dedae..464bf7cb9a 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -35,7 +35,7 @@ Web application that hosts and serves a Jackrabbit Oak content repository -9.0.78 +9.0.86 true
(jackrabbit-oak) branch 1.22 updated: OAK-10686: parent: add project.build.outputTimestamp property for Reproducable Builds (#1338)
This is an automated email from the ASF dual-hosted git repository.
reschke 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 dcc92c160f OAK-10686: parent: add project.build.outputTimestamp
property for Reproducable Builds (#1338)
dcc92c160f is described below
commit dcc92c160f9b54584a6917ff352cff844259685d
Author: Julian Reschke
AuthorDate: Mon Mar 4 10:33:21 2024 +0100
OAK-10686: parent: add project.build.outputTimestamp property for
Reproducable Builds (#1338)
---
oak-parent/pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 3c5e42f557..214e8434d2 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -34,6 +34,9 @@
pom
+
+
+1709307307
3.3.9
${java.version}
-Xmx512m
