This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch release-0.9.2-rc
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/release-0.9.2-rc by this push:
new 1dfbf1d Upgrade swagger-ui version for CVE-2019-17495 (#7902)
1dfbf1d is described below
commit 1dfbf1d84d0e07d4d09249547f17f7c1d74b6311
Author: Xiang Fu <[email protected]>
AuthorDate: Tue Dec 14 15:24:56 2021 -0800
Upgrade swagger-ui version for CVE-2019-17495 (#7902)
---
LICENSE-binary | 2 +-
.../java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java | 2 +-
.../org/apache/pinot/controller/api/ControllerAdminApiApplication.java | 2 +-
.../main/java/org/apache/pinot/minion/MinionAdminApiApplication.java | 2 +-
.../java/org/apache/pinot/server/starter/helix/AdminApiApplication.java | 2 +-
.../pinot/tools/service/PinotServiceManagerAdminApiApplication.java | 2 +-
pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 430f8a5..3b51d13 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -392,7 +392,7 @@ org.quartz-scheduler:quartz:2.3.2
org.roaringbitmap:RoaringBitmap:0.9.22
org.roaringbitmap:shims:0.9.22
org.typelevel:macro-compat_2.12:1.1.1
-org.webjars:swagger-ui:3.18.2
+org.webjars:swagger-ui:3.23.11
org.wildfly.openssl:wildfly-openssl:1.0.7.Final
org.xerial.larray:larray-buffer:0.4.1
org.xerial.larray:larray-mmap:0.4.1
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
index 54192d8..b21e3d2 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
@@ -92,7 +92,7 @@ public class BrokerAdminApiApplication extends ResourceConfig
{
_httpServer.getServerConfiguration().addHttpHandler(httpHandler, "/api/",
"/help/");
URL swaggerDistLocation =
-
BrokerAdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.18.2/");
+
BrokerAdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new
URLClassLoader(new URL[]{swaggerDistLocation}));
_httpServer.getServerConfiguration().addHttpHandler(swaggerDist,
"/swaggerui-dist/");
}
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
index 22d7105..def0b2a 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
@@ -115,7 +115,7 @@ public class ControllerAdminApiApplication extends
ResourceConfig {
httpServer.getServerConfiguration().addHttpHandler(apiStaticHttpHandler,
"/api/");
httpServer.getServerConfiguration().addHttpHandler(apiStaticHttpHandler,
"/help/");
- URL swaggerDistLocation =
loader.getResource("META-INF/resources/webjars/swagger-ui/3.18.2/");
+ URL swaggerDistLocation =
loader.getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new
URLClassLoader(new URL[]{swaggerDistLocation}));
httpServer.getServerConfiguration().addHttpHandler(swaggerDist,
"/swaggerui-dist/");
}
diff --git
a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
index e94b069..7d439f6 100644
---
a/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
+++
b/pinot-minion/src/main/java/org/apache/pinot/minion/MinionAdminApiApplication.java
@@ -92,7 +92,7 @@ public class MinionAdminApiApplication extends ResourceConfig
{
_httpServer.getServerConfiguration().addHttpHandler(httpHandler, "/api/",
"/help/");
URL swaggerDistLocation =
-
MinionAdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.18.2/");
+
MinionAdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new
URLClassLoader(new URL[]{swaggerDistLocation}));
_httpServer.getServerConfiguration().addHttpHandler(swaggerDist,
"/swaggerui-dist/");
}
diff --git
a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/AdminApiApplication.java
b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/AdminApiApplication.java
index 123f6c2..a3f9700 100644
---
a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/AdminApiApplication.java
+++
b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/AdminApiApplication.java
@@ -132,7 +132,7 @@ public class AdminApiApplication extends ResourceConfig {
httpServer.getServerConfiguration().addHttpHandler(staticHttpHandler,
"/help/");
URL swaggerDistLocation =
-
AdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.18.2/");
+
AdminApiApplication.class.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new
URLClassLoader(new URL[]{swaggerDistLocation}));
httpServer.getServerConfiguration().addHttpHandler(swaggerDist,
"/swaggerui-dist/");
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
index c43ac03..75684f3 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManagerAdminApiApplication.java
@@ -80,7 +80,7 @@ public class PinotServiceManagerAdminApiApplication extends
ResourceConfig {
_httpServer.getServerConfiguration().addHttpHandler(httpHandler, "/api/",
"/help/");
URL swaggerDistLocation =
PinotServiceManagerAdminApiApplication.class.getClassLoader()
- .getResource("META-INF/resources/webjars/swagger-ui/3.18.2/");
+ .getResource("META-INF/resources/webjars/swagger-ui/3.23.11/");
CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new
URLClassLoader(new URL[]{swaggerDistLocation}));
_httpServer.getServerConfiguration().addHttpHandler(swaggerDist,
"/swaggerui-dist/");
}
diff --git a/pom.xml b/pom.xml
index 5b69929..e2b0cc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1046,7 +1046,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>3.18.2</version>
+ <version>3.23.11</version>
</dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
