Michael Blow has submitted this change and it was merged. Change subject: Align Jetty Version, ResultExtractor.extract Accessible ......................................................................
Align Jetty Version, ResultExtractor.extract Accessible Aligns jetty version with hyracks Change-Id: Iaa0a6cbd5dc6a4aaa153b0f0e2414ec6402256ce Reviewed-on: https://asterix-gerrit.ics.uci.edu/1047 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 70c777d..be1c124 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -184,14 +184,14 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>8.0.0.M2</version> + <version>8.0.0.RC0</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.0.0.M2</version> + <version>8.0.0.RC0</version> <type>jar</type> <scope>compile</scope> </dependency> diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java index 13ab717..efadc8d 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java +++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java @@ -38,7 +38,7 @@ private static final Logger LOGGER = Logger.getLogger(ResultExtractor.class.getName()); - static InputStream extract(InputStream resultStream) throws Exception { + public static InputStream extract(InputStream resultStream) throws Exception { String result = IOUtils.toString(resultStream, Charset.forName("UTF-8")); LOGGER.fine("+++++++\n" + result + "\n+++++++\n"); -- To view, visit https://asterix-gerrit.ics.uci.edu/1047 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa0a6cbd5dc6a4aaa153b0f0e2414ec6402256ce Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
