This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e7e4888ef7 Upgrade Jersey related libraries (#12772)
e7e4888ef7 is described below
commit e7e4888ef765495a0b219b40a01bb283d1828c8e
Author: Xiaotian (Jackie) Jiang <[email protected]>
AuthorDate: Tue Apr 2 10:55:04 2024 -0700
Upgrade Jersey related libraries (#12772)
---
.../pinot-input-format/pinot-protobuf/pom.xml | 8 -----
.../apache/pinot/spi/utils/CommonConstants.java | 2 +-
pinot-tools/pom.xml | 4 ---
pom.xml | 40 +++++++++++++++-------
4 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
index 3c4f92097f..2d301bb2fd 100644
--- a/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-protobuf/pom.xml
@@ -101,14 +101,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
index 80f45652ca..a59948c5f9 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
@@ -51,7 +51,7 @@ public class CommonConstants {
"org.apache.pinot.spi.eventlistener.query.NoOpBrokerQueryEventListener";
public static final String SWAGGER_AUTHORIZATION_KEY = "oauth";
- public static final String CONFIG_OF_SWAGGER_RESOURCES_PATH =
"META-INF/resources/webjars/swagger-ui/5.1.0/";
+ public static final String CONFIG_OF_SWAGGER_RESOURCES_PATH =
"META-INF/resources/webjars/swagger-ui/5.13.0/";
public static final String CONFIG_OF_TIMEZONE = "pinot.timezone";
public static final String DATABASE = "database";
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 115a79d6d2..323f4675c8 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -163,10 +163,6 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
diff --git a/pom.xml b/pom.xml
index 933256b350..71abe67a34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,9 +140,11 @@
<jackson.version>2.12.7.20221012</jackson.version>
<zookeeper.version>3.9.2</zookeeper.version>
<async-http-client.version>2.12.3</async-http-client.version>
- <jersey.version>2.39</jersey.version>
+ <jersey.version>2.42</jersey.version>
<hk2.version>2.6.1</hk2.version>
- <swagger.version>1.6.9</swagger.version>
+ <javassist.version>3.30.2-GA</javassist.version>
+ <swagger.version>1.6.14</swagger.version>
+ <swagger-ui.version>5.13.0</swagger-ui.version>
<hadoop.version>3.3.6</hadoop.version>
<jsonpath.version>2.9.0</jsonpath.version>
<jsonsmart.version>2.5.0</jsonsmart.version>
@@ -191,6 +193,7 @@
<!-- Jakarta Libraries -->
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+ <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
@@ -762,6 +765,11 @@
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject-api.version}</version>
+ </dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
@@ -1188,11 +1196,6 @@
<version>${dropwizard-metrics.version}</version>
</dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>swagger-ui</artifactId>
- <version>5.1.0</version>
- </dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
@@ -1261,11 +1264,6 @@
<artifactId>commons-compiler</artifactId>
<version>${janino.version}</version>
</dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.19.0-GA</version>
- </dependency>
<!-- Jersey Libraries -->
<dependency>
@@ -1318,11 +1316,28 @@
<artifactId>hk2-metadata-generator</artifactId>
<version>${hk2.version}</version>
</dependency>
+ <!-- Used by HK2 and reflections -->
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<version>${swagger.version}</version>
</dependency>
+ <!-- Also used by pulsar-common -->
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>${swagger-ui.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
@@ -1754,7 +1769,6 @@
<exclude>commons-logging:commons-logging</exclude>
<!-- Use org.glassfish.hk2.external:jakarta.inject -->
<exclude>javax.inject:javax.inject</exclude>
- <exclude>jakarta.inject:jakarta.inject-api</exclude>
</excludes>
</bannedDependencies>
</rules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
