Repository: tajo Updated Branches: refs/heads/master 20174415c -> 5defb26c4
TAJO-1884: Add missing jetty-util dependency. Closes #779 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/5defb26c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5defb26c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5defb26c Branch: refs/heads/master Commit: 5defb26c436a199eb690a98f9e0366b32e9acddf Parents: 2017441 Author: Jinho Kim <[email protected]> Authored: Thu Sep 24 10:38:41 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Thu Sep 24 10:38:41 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ tajo-core/pom.xml | 12 ++++-------- tajo-project/pom.xml | 22 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5defb26c/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 81a1e1a..ea5f1de 100644 --- a/CHANGES +++ b/CHANGES @@ -290,6 +290,8 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1884: Add missing jetty-util dependency. (jinho) + TAJO-1861: TSQL should change line after printout error message during connecting other database. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/5defb26c/tajo-core/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml index 0cb0185..a2a373d 100644 --- a/tajo-core/pom.xml +++ b/tajo-core/pom.xml @@ -273,18 +273,14 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.14</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-2.1</artifactId> - <version>6.1.14</version> - <exclusions> - <exclusion> - <artifactId>core</artifactId> - <groupId>org.eclipse.jdt</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> http://git-wip-us.apache.org/repos/asf/tajo/blob/5defb26c/tajo-project/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml index ce546c1..ef6435f 100644 --- a/tajo-project/pom.xml +++ b/tajo-project/pom.xml @@ -40,6 +40,7 @@ <hive.version>1.1.0</hive.version> <netty.version>4.0.29.Final</netty.version> <jersey.version>2.6</jersey.version> + <jetty.version>6.1.14</jetty.version> <tajo.root>${project.parent.relativePath}/..</tajo.root> <extra.source.path>src/main/hadoop-${hadoop.version}</extra.source.path> </properties> @@ -1169,6 +1170,27 @@ <artifactId>snappy</artifactId> <version>0.4</version> </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-2.1</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <artifactId>core</artifactId> + <groupId>org.eclipse.jdt</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> <profiles>
