This is an automated email from the ASF dual-hosted git repository.
fortino 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 9d3d31127d OAK-10548: bump zookeeper to 3.9.1, re-organized optional
import packages (#1205)
9d3d31127d is described below
commit 9d3d31127de246a93c1db10a866d5ff75d74ccf6
Author: Fabrizio Fortino <[email protected]>
AuthorDate: Wed Nov 15 08:45:43 2023 +0100
OAK-10548: bump zookeeper to 3.9.1, re-organized optional import packages
(#1205)
* OAK-10548: bump zookeeper to 3.9.1, re-organized optional import packages
* OAK-10548: upgrade jackson runtime dependencies to 2.15.2
* OAK-10548: use jackson version from oak-parent, removed unused runtime
dependency
---
oak-solr-osgi/pom.xml | 48 ++++++++++++++++--------------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 1ee81c0603..72aad7926c 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -40,36 +40,18 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.lucene.*;resolution:=optional,
- com.googlecode.*;resolution:=optional,
- com.vividsolutions.jts.*;resolution:=optional,
com.sun.*;resolution:=optional,
- jline;resolution:=optional,
- org.apache.hadoop.*;resolution:=optional,
- org.apache.regexp.*;resolution:=optional,
+ io.netty.*;resolution:=optional,
+ jline.*;resolution:=optional,
+ javax.annotation;resolution:=optional,
+ org.apache.jute.*;resolution:=optional,
org.apache.log4j.*;resolution:=optional,
org.apache.yetus.audience.*;resolution:=optional,
- org.jboss.netty.*;resolution:=optional,
- org.restlet.*;resolution:=optional,
- org.joda.time.*;resolution:=optional,
+ org.apache.zookeeper.data.*;resolution:=optional,
+ org.apache.zookeeper.proto.*;resolution:=optional,
+ org.apache.zookeeper.txn.*;resolution:=optional,
org.eclipse.*;resolution:=optional,
- javax.servlet.*;resolution:=optional,
- com.tdunning.math.*;resolution:=optional,
- com.codahale.metrics.*;resolution:=optional,
- info.ganglia.gmetric4j.*;resolution:=optional,
- org.apache.calcite.adapter.*;resolution:=optional,
- org.apache.calcite.ling4j.*;resolution:=optional,
- org.apache.calcite.rel.*;resolution:=optional,
- org.apache.calcite.schema.*;resolution:=optional,
- org.apache.calcite.sql.*;resolution:=optional,
- org.apache.calcite.*;resolution:=optional,
-
org.apache.curator.framework.*;resolution:=optional,
- org.apache.curator.*;resolution:=optional,
-
com.github.benmanes.caffeine.*;resolution:=optional,
-
org.apache.solr.handler.extraction.*;resolution:=optional,
-
com.ibm.security.krb5.internal.*;resolution:=optional,
- sun.misc.*;resolution:=optional,
- sun.security.krb5.*;resolution:=optional,
+ org.xerial.snappy.*;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>*;scope=runtime;inline=true</Embed-Dependency>
@@ -153,25 +135,27 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.14</version>
+ <version><!-- see OAK-10548-->3.9.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version><!-- see OAK-8829-->2.9.10</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
- <version><!-- see OAK-8829-->2.9.10</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-exec</artifactId>
- <version>1.3</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
