You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by jl...@apache.org on 2020/08/28 16:29:22 UTC
[incubator-pinot] branch revert-swagger-version-bump created (now
b942df9)
This is an automated email from the ASF dual-hosted git repository.
jlli pushed a change to branch revert-swagger-version-bump
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
at b942df9 Revert the commit 41dc432e775aeeb841f57bd25525832950698739
This branch includes the following new commits:
new b942df9 Revert the commit 41dc432e775aeeb841f57bd25525832950698739
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/01: Revert the commit
41dc432e775aeeb841f57bd25525832950698739
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlli pushed a commit to branch revert-swagger-version-bump
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit b942df9c7175d92a45d97da1191b85cd49dc7492
Author: Jack Li(Analytics Engineering) <jl...@jlli-mn1.linkedin.biz>
AuthorDate: Fri Aug 28 09:28:58 2020 -0700
Revert the commit 41dc432e775aeeb841f57bd25525832950698739
---
LICENSE-binary | 2 +-
.../java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java | 2 +-
.../org/apache/pinot/controller/api/ControllerAdminApiApplication.java | 2 +-
.../java/org/apache/pinot/server/starter/helix/AdminApiApplication.java | 2 +-
.../pinot/tools/service/PinotServiceManagerAdminApiApplication.java | 2 +-
pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 5b47fd2..c15cc1b 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -353,7 +353,7 @@ org.lz4:lz4-java:1.4.1
org.roaringbitmap:RoaringBitmap:0.8.0
org.roaringbitmap:shims:0.8.0
org.scala-lang:scala-library:2.11.11
-org.webjars:swagger-ui:2.2.2
+org.webjars:swagger-ui:3.18.2
org.xerial.java:xerial-core:2.1
org.xerial.larray:larray:0.2.1
org.xerial.larray:larray-buffer:0.2.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 ba262fd..51e7a2e 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
@@ -81,7 +81,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/2.2.10-1/");
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 54342fa..c5978ba 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
@@ -156,7 +156,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/2.2.10-1/");
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 a8d01ee..e3e8c12 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
@@ -110,7 +110,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/2.2.10-1/");
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 5243164..8be7308 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
@@ -77,7 +77,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/2.2.10-1/");
CLStaticHttpHandler swaggerDist = new CLStaticHttpHandler(new URLClassLoader(new URL[]{swaggerDistLocation}));
_httpServer.getServerConfiguration().addHttpHandler(swaggerDist, "/swaggerui-dist/");
}
diff --git a/pom.xml b/pom.xml
index 670d5b2..aa9d858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -897,7 +897,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>3.18.2</version>
+ <version>2.2.10-1</version>
</dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org