Repository: tajo Updated Branches: refs/heads/branch-0.11.0 4a22d1da4 -> a9bf62008
TAJO-1884: Add missing jetty-util dependency. Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/a9bf6200 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/a9bf6200 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/a9bf6200 Branch: refs/heads/branch-0.11.0 Commit: a9bf6200800c5005bcd2aeaff2de64d4ed930c36 Parents: 4a22d1d Author: Jinho Kim <[email protected]> Authored: Thu Sep 24 10:39:59 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Thu Sep 24 10:39:59 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/a9bf6200/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index fe3f1ff..f2f1352 100644 --- a/CHANGES +++ b/CHANGES @@ -280,6 +280,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/a9bf6200/tajo-core/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml index 1d1c11e..7eb3b09 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/a9bf6200/tajo-project/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml index 52c6ef9..fb20584 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>
