Repository: knox Updated Branches: refs/heads/master 2b1386557 -> 93f49e4e1
KNOX-1456 - Clarify Jetty property difference Signed-off-by: Kevin Risden <kris...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/93f49e4e Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/93f49e4e Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/93f49e4e Branch: refs/heads/master Commit: 93f49e4e1b61f750c8d935f63876f167d5c35b55 Parents: 2b13865 Author: Kevin Risden <kris...@apache.org> Authored: Tue Oct 2 16:20:45 2018 -0400 Committer: Kevin Risden <kris...@apache.org> Committed: Tue Oct 2 16:21:54 2018 -0400 ---------------------------------------------------------------------- gateway-test-release/pom.xml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/93f49e4e/gateway-test-release/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml index 2271630..4858e58 100644 --- a/gateway-test-release/pom.xml +++ b/gateway-test-release/pom.xml @@ -35,14 +35,17 @@ </modules> <properties> - <jetty.version>9.3.19.v20170502</jetty.version> + <!-- This property name must be different thant jetty.version + Otherwise Jetty 9.2.x and 9.3.x will not both be available. + Jetty 9.2.x is needed for Knox and Jetty 9.3.x for Hadoop --> + <hadoop-jetty.version>9.3.19.v20170502</hadoop-jetty.version> </properties> <dependencies> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -62,7 +65,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -74,7 +77,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -86,7 +89,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -98,13 +101,13 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -116,7 +119,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -132,7 +135,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-xml</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -144,7 +147,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>${jetty.version}</version> + <version>${hadoop-jetty.version}</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId>
