HIVE-14663. Change ptest java language version to 1.7, other version changes and fixes. (Siddharth Seth, reviewed by Prasanth Jayachandran and Sergio Peña)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/60ec753e Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/60ec753e Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/60ec753e Branch: refs/heads/hive-14535 Commit: 60ec753e0bf3988b4190f14d20910e938842fed0 Parents: 406e935 Author: Siddharth Seth <[email protected]> Authored: Mon Aug 29 17:27:02 2016 -0700 Committer: Siddharth Seth <[email protected]> Committed: Mon Aug 29 17:27:02 2016 -0700 ---------------------------------------------------------------------- testutils/ptest2/pom.xml | 28 ++++++++++++-------- .../hive/ptest/execution/conf/TestParser.java | 3 --- ...tScripts.testAlternativeTestJVM.approved.txt | 8 +++++- .../TestScripts.testBatch.approved.txt | 8 +++++- 4 files changed, 31 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/60ec753e/testutils/ptest2/pom.xml ---------------------------------------------------------------------- diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml index 375c2a1..2f35680 100644 --- a/testutils/ptest2/pom.xml +++ b/testutils/ptest2/pom.xml @@ -26,7 +26,7 @@ limitations under the License. <name>hive-ptest</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <log4j2.version>2.4.1</log4j2.version> + <log4j2.version>2.6.2</log4j2.version> <spring.framework.version>3.2.16.RELEASE</spring.framework.version> </properties> @@ -48,7 +48,7 @@ limitations under the License. <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.1</version> + <version>2.4</version> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -58,12 +58,12 @@ limitations under the License. <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> + <version>2.6</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>15.0</version> + <version>18.0</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -83,7 +83,7 @@ limitations under the License. <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.2.5</version> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.jclouds</groupId> @@ -114,6 +114,12 @@ limitations under the License. <groupId>org.apache.jclouds.driver</groupId> <artifactId>jclouds-log4j</artifactId> <version>1.7.3</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.velocity</groupId> @@ -128,13 +134,13 @@ limitations under the License. <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> + <version>1.7.10</version> </dependency> - <dependency> + <!--dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> - </dependency> + <version>1.7.10</version> + </dependency--> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> @@ -179,8 +185,8 @@ limitations under the License. <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/hive/blob/60ec753e/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java index e38cbb4..5da804f 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -35,8 +34,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.PatternLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/hive/blob/60ec753e/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt index 83bcbee..092461b 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt @@ -85,10 +85,16 @@ fi echo $pid >> batch.pid wait $pid ret=$? -find ./ -type f -name hive.log -o -name spark.log | \ +find ./ -type f -name hive.log -o -name spark.log -o -name derby.log | \ xargs -I {} sh -c 'f=$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' find ./ -type f -name 'TEST-*.xml' | \ xargs -I {} sh -c 'f=TEST-batch-1-$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' +find ./ -path "*/spark/work" | \ + xargs -I {} sh -c 'mv {} /some/log/dir/spark-log' +find ./ -type f -name 'syslog*' | \ + xargs -I {} sh -c 'mkdir -p /some/log/dir/syslogs; mv {} /some/log/dir/syslogs' + + if [[ -f /some/log/dir/.log ]] then mv /some/log/dir/.log /some/log/dir/dot.log http://git-wip-us.apache.org/repos/asf/hive/blob/60ec753e/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt index 5705839..3270167 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt @@ -85,10 +85,16 @@ fi echo $pid >> batch.pid wait $pid ret=$? -find ./ -type f -name hive.log -o -name spark.log | \ +find ./ -type f -name hive.log -o -name spark.log -o -name derby.log | \ xargs -I {} sh -c 'f=$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' find ./ -type f -name 'TEST-*.xml' | \ xargs -I {} sh -c 'f=TEST-batch-1-$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' +find ./ -path "*/spark/work" | \ + xargs -I {} sh -c 'mv {} /some/log/dir/spark-log' +find ./ -type f -name 'syslog*' | \ + xargs -I {} sh -c 'mkdir -p /some/log/dir/syslogs; mv {} /some/log/dir/syslogs' + + if [[ -f /some/log/dir/.log ]] then mv /some/log/dir/.log /some/log/dir/dot.log
