Merge remote-tracking branch 'origin/master' into cdh6.x-wip Change-Id: Ieecddad1866e958499d3cb48468e71e6cf731db7
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2c54db40 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2c54db40 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2c54db40 Branch: refs/heads/oya Commit: 2c54db404a361ae34c51f9292c9f75c20bf666bb Parents: 4a9542c 7e7bdc5 Author: Peter Cseh <[email protected]> Authored: Tue Nov 8 12:34:27 2016 +0100 Committer: Peter Cseh <[email protected]> Committed: Tue Nov 8 12:34:27 2016 +0100 ---------------------------------------------------------------------- bin/findbugs-diff-0.1.0-all.jar.md5 | 1 + bin/test-patch-11-findbugs-diff | 325 +++++++++++++++++ .../org/apache/oozie/client/OozieClient.java | 86 +++-- core/pom.xml | 36 +- .../oozie/service/InstrumentationService.java | 6 +- .../org/apache/oozie/util/Instrumentation.java | 8 +- .../org/apache/oozie/util/PasswordMasker.java | 121 +++++++ .../action/hadoop/TestFsActionExecutor.java | 3 + .../org/apache/oozie/client/TestOozieCLI.java | 10 +- .../command/coord/TestCoordRerunXCommand.java | 3 + .../oozie/dependency/TestHCatURIHandler.java | 3 + .../org/apache/oozie/test/MiniHCatServer.java | 10 - .../apache/oozie/util/TestPasswordMasker.java | 92 +++++ .../test/resources/instrumentation-os-env.json | 47 +++ .../instrumentation-system-properties.json | 88 +++++ docs/src/site/twiki/DG_CommandLineTool.twiki | 353 ++++++++++--------- docs/src/site/twiki/DG_QuickStart.twiki | 6 +- docs/src/site/twiki/ENG_Building.twiki | 2 +- .../src/site/twiki/WorkflowFunctionalSpec.twiki | 2 +- examples/src/main/apps/hcatalog/README | 29 +- examples/src/main/apps/hcatalog/job.properties | 2 +- pom.xml | 103 ++++-- release-log.txt | 11 + .../oozie/action/hadoop/TestHiveMain.java | 4 +- sharelib/hive2/pom.xml | 60 ++++ .../action/hadoop/TestHive2ActionExecutor.java | 1 + sharelib/pig/pom.xml | 24 ++ sharelib/spark/pom.xml | 4 +- .../apache/oozie/action/hadoop/SparkMain.java | 196 +++++++--- .../oozie/action/hadoop/TestSparkMain.java | 42 ++- 30 files changed, 1356 insertions(+), 322 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/core/src/test/java/org/apache/oozie/action/hadoop/TestFsActionExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index ce0bbde,a3db3da..bc4be5e --- a/pom.xml +++ b/pom.xml @@@ -85,18 -88,21 +85,21 @@@ <clover.license>/home/jenkins/tools/clover/latest/lib/clover.license</clover.license> + <!-- Sharelib component versions --> - <hive.version>0.13.1</hive.version> - <hive.jline.version>0.9.94</hive.jline.version> - <pig.version>0.12.1</pig.version> - <pig.classifier>h2</pig.classifier> + <hive.version>1.2.0</hive.version> + <hive.jline.version>2.12</hive.jline.version> + <hive.classifier>core</hive.classifier> + <pig.version>0.16.0</pig.version> + <pig.classifier></pig.classifier> <sqoop.version>1.4.3</sqoop.version> <spark.version>1.6.1</spark.version> + <spark.streaming.kafka.version>1.6.1</spark.streaming.kafka.version> + <spark.bagel.version>1.6.1</spark.bagel.version> <spark.guava.version>14.0.1</spark.guava.version> <spark.scala.binary.version>2.10</spark.scala.binary.version> - <sqoop.classifier>hadoop100</sqoop.classifier> + <sqoop.classifier>hadoop200</sqoop.classifier> <streaming.version>${hadoop.version}</streaming.version> - <distcp.version>${hadoop.version}</distcp.version> <hadoop.auth.version>${hadoop.version}</hadoop.auth.version> <!-- Tomcat version --> @@@ -1839,7 -1888,48 +1878,7 @@@ </properties> </profile> <profile> - <id>wfgen</id> - <id>hadoop-1</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>1.2.1</hadoop.version> - <hadoop.majorversion>1</hadoop.majorversion> - <pig.classifier></pig.classifier> - <sqoop.classifier>hadoop100</sqoop.classifier> - <hive.version>0.13.1</hive.version> - <hive.classifier></hive.classifier> - <hive.jline.version>0.9.94</hive.jline.version> - </properties> - </profile> - <profile> - <id>hadoop-2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <hadoop.version>2.4.0</hadoop.version> - <hadoop.majorversion>2</hadoop.majorversion> - <pig.classifier>h2</pig.classifier> - <sqoop.classifier>hadoop200</sqoop.classifier> - <jackson.version>1.9.13</jackson.version> - </properties> - </profile> - <profile> - <id>hadoop-3</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> - <hadoop.majorversion>3</hadoop.majorversion> - <pig.classifier>h2</pig.classifier> - <sqoop.classifier>hadoop200</sqoop.classifier> - <jackson.version>1.9.13</jackson.version> - </properties> - </profile> - <profile> + <id>loginServerExample</id> <activation> <activeByDefault>false</activeByDefault> </activation> http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/release-log.txt ---------------------------------------------------------------------- diff --cc release-log.txt index af44107,77cc5ad..159cc11 --- a/release-log.txt +++ b/release-log.txt @@@ -1,10 -1,20 +1,21 @@@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2590 OYA: Create basic Oozie Launcher Application Master (rkanter) +OOZIE-2316 Drop support for Hadoop 1 and 0.23 (asasvari via rkanter) + OOZIE-1986 Add FindBugs report to pre-commit build (andras.piros via rkanter) + OOZIE-2634 Queue dump command message is confusing when the queue is empty (andras.piros via rkanter) - -- Oozie 4.3.0 release + OOZIE-2674 Improve oozie commads documentation (abhishekbafna via rkanter) + OOZIE-2710 Oozie HCatalog example workflow fails (abhishekbafna via shwethags) + OOZIE-2705 Oozie Spark action ignores spark.executor.extraJavaOptions and spark.driver.extraJavaOptions (gezapeti via rkanter) + OOZIE-2621 Use hive-exec-<version>-core instead of hive-exec in oozie-core (gezapeti via rkanter) + OOZIE-2613 Upgrade hive version from 0.13.1 to 1.2.0 (abhishekbafna via rkanter) + OOZIE-2658 --driver-class-path can overwrite the classpath in SparkMain (gezapeti via rkanter) + OOZIE-1814 Oozie should mask any passwords in logs and REST interfaces (andras.piros via rkanter) + OOZIE-2622 ExtJS 2.2 is no longer available (rkanter) + OOZIE-2606 Set spark.yarn.jars to fix Spark 2.0 with Oozie (satishsaley via rohini) OOZIE-2673 Include XSD for shell-action:0.3 in documentation (abhishekbafna via rkanter) OOZIE-2194 oozie job -kill doesn't work with spark action (abhishekbafna via rohini) OOZIE-2501 ZK reentrant lock doesn't work for few cases (puru) http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/sharelib/hive2/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/sharelib/pig/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/sharelib/spark/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2c54db40/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java ----------------------------------------------------------------------
