Repository: knox Updated Branches: refs/heads/master 5c4e4d2ec -> c9b24897e
KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. More debugging. Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/c9b24897 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c9b24897 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c9b24897 Branch: refs/heads/master Commit: c9b24897e3cdbbd9a1e60fde76b459828ab2ee52 Parents: 5c4e4d2 Author: Kevin Minder <[email protected]> Authored: Mon Nov 9 13:13:11 2015 -0500 Committer: Kevin Minder <[email protected]> Committed: Mon Nov 9 13:13:11 2015 -0500 ---------------------------------------------------------------------- gateway-shell/pom.xml | 2 +- .../src/main/java/org/apache/hadoop/gateway/shell/Shell.java | 2 +- gateway-test/pom.xml | 6 ++++++ .../java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java | 4 ++-- gateway-test/src/test/resources/log4j.properties | 4 ++++ pom.xml | 6 +++--- 6 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/c9b24897/gateway-shell/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-shell/pom.xml b/gateway-shell/pom.xml index c97067f..616bcfd 100644 --- a/gateway-shell/pom.xml +++ b/gateway-shell/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> + <artifactId>groovy-all</artifactId> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId> http://git-wip-us.apache.org/repos/asf/knox/blob/c9b24897/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java index 23227ab..145d22a 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java @@ -53,7 +53,7 @@ public class Shell { //setup.println( "set show-last-result false;" ); Groovysh shell = new Groovysh(); shell.execute( buffer.toString() ); - shell.run(); + //shell.run(""); } } http://git-wip-us.apache.org/repos/asf/knox/blob/c9b24897/gateway-test/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml index feb7adb..844118e 100644 --- a/gateway-test/pom.xml +++ b/gateway-test/pom.xml @@ -81,6 +81,12 @@ <scope>test</scope> </dependency> + + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>com.jayway.restassured</groupId> <artifactId>rest-assured</artifactId> http://git-wip-us.apache.org/repos/asf/knox/blob/c9b24897/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java index cd8965f..efc9782 100644 --- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java +++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java @@ -210,10 +210,10 @@ public class GatewaySampleFuncTest { String password = "guest-password"; String serviceUrl = clusterUrl + "/test-service-path/test-service-resource"; given() - //.log().all() + .log().all() .auth().preemptive().basic( username, password ) .expect() - //.log().all() + .log().all() .statusCode( HttpStatus.SC_OK ) .contentType( "text/plain" ) .body( is( "test-service-response" ) ) http://git-wip-us.apache.org/repos/asf/knox/blob/c9b24897/gateway-test/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/resources/log4j.properties b/gateway-test/src/test/resources/log4j.properties index 627ec61..70a371b 100644 --- a/gateway-test/src/test/resources/log4j.properties +++ b/gateway-test/src/test/resources/log4j.properties @@ -24,6 +24,10 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n log4j.logger.org.apache.hadoop.gateway=DEBUG +log4j.logger.org.apache.hadoop.gateway.http=TRACE +log4j.logger.org.apache.hadoop.gateway.http.request.body=OFF +log4j.logger.org.apache.hadoop.gateway.http.response.body=OFF + log4j.logger.org.apache.directory=ERROR #log4j.logger.org.eclipse.jetty=DEBUG http://git-wip-us.apache.org/repos/asf/knox/blob/c9b24897/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dd3c640..80bc831 100644 --- a/pom.xml +++ b/pom.xml @@ -658,8 +658,8 @@ <dependency> <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - <version>1.8.3</version> + <artifactId>groovy-all</artifactId> + <version>2.4.5</version> </dependency> <dependency> <groupId>org.fusesource.jansi</groupId> @@ -1035,7 +1035,7 @@ <dependency> <groupId>com.jayway.restassured</groupId> <artifactId>rest-assured</artifactId> - <version>1.8.1</version> + <version>2.7.0</version> <scope>test</scope> </dependency>
