Repository: hive Updated Branches: refs/heads/master 0d7015468 -> 1002e89b6
HIVE-20638 : Upgrade version of Jetty to 9.3.25.v20180904 (Laszlo Bodor via Thejas Nair) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1002e89b Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1002e89b Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1002e89b Branch: refs/heads/master Commit: 1002e89b6501afca7f886323e96f2f37b4b9ac60 Parents: 0d70154 Author: Thejas M Nair <[email protected]> Authored: Fri Oct 26 09:37:34 2018 -0700 Committer: Thejas M Nair <[email protected]> Committed: Fri Oct 26 09:37:34 2018 -0700 ---------------------------------------------------------------------- hbase-handler/pom.xml | 12 +++++++++++- hcatalog/webhcat/svr/pom.xml | 10 +++++----- pom.xml | 8 +++++++- serde/pom.xml | 20 ++++++++++++++++++++ 4 files changed, 43 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1002e89b/hbase-handler/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml index 06939a4..58666f8 100644 --- a/hbase-handler/pom.xml +++ b/hbase-handler/pom.xml @@ -51,7 +51,7 @@ <version>${hadoop.version}</version> <optional>true</optional> <exclusions> - <exclusion> + <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> @@ -59,6 +59,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -130,6 +134,12 @@ <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> http://git-wip-us.apache.org/repos/asf/hive/blob/1002e89b/hcatalog/webhcat/svr/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index d19e99a..4dfade5 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -164,13 +164,13 @@ <version>${hadoop.version}</version> <exclusions> <exclusion> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty</artifactId> </exclusion> <exclusion> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - </exclusion> + </exclusion> </exclusions> </dependency> <dependency> @@ -179,11 +179,11 @@ <version>${hadoop.version}</version> <exclusions> <exclusion> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty</artifactId> </exclusion> <exclusion> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> </exclusion> </exclusions> http://git-wip-us.apache.org/repos/asf/hive/blob/1002e89b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 716db28..842a143 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <javolution.version>5.5.1</javolution.version> <jdo-api.version>3.0.1</jdo-api.version> <jettison.version>1.1</jettison.version> - <jetty.version>9.3.20.v20170531</jetty.version> + <jetty.version>9.3.25.v20180904</jetty.version> <jersey.version>1.19</jersey.version> <!-- Glassfish jersey is included for Spark client test only --> <glassfish.jersey.version>2.22.2</glassfish.jersey.version> @@ -1003,6 +1003,12 @@ <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hive/blob/1002e89b/serde/pom.xml ---------------------------------------------------------------------- diff --git a/serde/pom.xml b/serde/pom.xml index 8c37414..3756582 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -114,6 +114,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -163,6 +167,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -176,6 +184,12 @@ <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -183,6 +197,12 @@ <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies>
