This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/SLING-12452 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git
commit bed6e571830c3fe4e402b0bad0734484ba1035b7 Author: Robert Munteanu <[email protected]> AuthorDate: Mon Oct 14 10:42:56 2024 +0200 SLING-12452 - Investigate removing embeding of Oak classes - IndexHelper is no longer used, remove the embedding - LuceneIndexHelper is used but exported by oak-lucene, remove the emebedding - add oak-lucene and oak-store-document to the test setup to satisfy dependencies --- bnd.bnd | 4 ---- .../java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bnd.bnd b/bnd.bnd index 073d1b6..5b1ccad 100644 --- a/bnd.bnd +++ b/bnd.bnd @@ -11,10 +11,6 @@ Import-Package:\ Provide-Capability:\ osgi.service;objectClass:List<String>="java.util.concurrent.Executor,org.apache.sling.commons.threads.ThreadPool" --includeresource:\ - @oak-lucene-*.jar!/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.*,\ - @oak-search-*.jar!/org/apache/jackrabbit/oak/plugins/index/search/util/IndexHelper.* - -removeheaders:\ Include-Resource,\ Private-Package diff --git a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java index d6b4eff..8206641 100644 --- a/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java +++ b/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java @@ -177,6 +177,8 @@ public abstract class OakServerTestSupport extends TestSupport { return new Option[]{ baseConfiguration(), quickstart(), + mavenBundle("org.apache.jackrabbit", "oak-lucene", "1.56.0"), // needed for LuceneIndexHelper + mavenBundle("org.apache.jackrabbit", "oak-store-document", "1.56.0"), // needed by oak-lucene // Sling JCR Oak Server testBundle("bundle.filename"), };
