This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10461 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 9ea277530269b8896e4c474ce62785d69b8f8d3f Author: Julian Reschke <julian.resc...@gmx.de> AuthorDate: Thu Sep 28 15:42:50 2023 +0100 OAK-10461: oak-search-elastic does not build under Java 17 - disable Felix SCR plugin --- oak-search-elastic/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml index 0f218c7e53..25437d9a82 100644 --- a/oak-search-elastic/pom.xml +++ b/oak-search-elastic/pom.xml @@ -43,7 +43,7 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <configuration> - <instructions> + <instructions combine.self="override"> <_exportcontents> org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexProviderService </_exportcontents> @@ -74,6 +74,8 @@ *;scope=compile|runtime </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> + <!-- needed to override value from oak-parent; can be removed when OAK-6741 is resolved --> + <_plugin/> </instructions> </configuration> </plugin>