Repository: oozie Updated Branches: refs/heads/oya 34a96f774 -> a1537e1bb (forced update)
Merge branch 'apache_forked_master' into apache_forked_oya Change-Id: I447eeadb5d4b7469999d057544aff4f33551c7b9 Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b99933b7 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b99933b7 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b99933b7 Branch: refs/heads/oya Commit: b99933b7c9253c1d3f5e8b1e933c04b5fdb677d8 Parents: 4a9542c 1b7da69 Author: Peter Bacsko <[email protected]> Authored: Tue Nov 8 16:37:43 2016 +0100 Committer: Peter Bacsko <[email protected]> Committed: Tue Nov 8 16:37:43 2016 +0100 ---------------------------------------------------------------------- bin/findbugs-diff-0.1.0-all.jar.md5 | 1 + bin/test-patch-11-findbugs-diff | 325 +++++++++++++++++ .../java/org/apache/oozie/cli/OozieCLI.java | 7 +- .../org/apache/oozie/client/OozieClient.java | 88 +++-- core/pom.xml | 52 ++- .../org/apache/oozie/CoordinatorEngine.java | 1 + .../main/java/org/apache/oozie/DagEngine.java | 1 + .../jpa/WorkflowsJobGetJPAExecutor.java | 8 +- .../oozie/service/InstrumentationService.java | 6 +- .../apache/oozie/store/StoreStatusFilter.java | 33 ++ .../org/apache/oozie/util/Instrumentation.java | 8 +- .../org/apache/oozie/util/JobsFilterUtils.java | 1 + .../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 + .../jpa/TestBundleJobInfoGetJPAExecutor.java | 94 +++++ .../jpa/TestCoordJobInfoGetJPAExecutor.java | 95 ++++- .../jpa/TestWorkflowsJobGetJPAExecutor.java | 73 ++++ .../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 +++++ distro/pom.xml | 1 - docs/src/site/twiki/DG_CommandLineTool.twiki | 354 +++++++++++-------- docs/src/site/twiki/DG_QuickStart.twiki | 6 +- docs/src/site/twiki/ENG_Building.twiki | 2 +- docs/src/site/twiki/WebServicesAPI.twiki | 1 + .../src/site/twiki/WorkflowFunctionalSpec.twiki | 2 +- examples/src/main/apps/hcatalog/README | 29 +- examples/src/main/apps/hcatalog/job.properties | 2 +- pom.xml | 98 ++++- release-log.txt | 15 + sharelib/distcp/pom.xml | 1 - sharelib/hcatalog/pom.xml | 1 - sharelib/hive/pom.xml | 1 - .../oozie/action/hadoop/TestHiveMain.java | 4 +- sharelib/hive2/pom.xml | 60 ++++ .../action/hadoop/TestHive2ActionExecutor.java | 1 + sharelib/oozie/pom.xml | 1 - .../hadoop/OozieLauncherOutputCommitter.java | 14 + sharelib/pig/pom.xml | 25 +- sharelib/spark/pom.xml | 5 +- .../apache/oozie/action/hadoop/SparkMain.java | 196 +++++++--- .../oozie/action/hadoop/TestSparkMain.java | 42 ++- sharelib/sqoop/pom.xml | 1 - sharelib/streaming/pom.xml | 32 ++ 48 files changed, 1751 insertions(+), 313 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index c2c005e,163bb3b..8783d1f --- a/core/pom.xml +++ b/core/pom.xml @@@ -80,6 -92,6 +92,22 @@@ <dependency> <groupId>org.apache.hadoop</groupId> ++ <artifactId>hadoop-yarn-api</artifactId> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.hadoop</groupId> ++ <artifactId>hadoop-yarn-common</artifactId> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.commons</groupId> ++ <artifactId>commons-lang3</artifactId> ++ <scope>test</scope> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/core/src/test/java/org/apache/oozie/action/hadoop/TestFsActionExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index ce0bbde,a3db3da..7ea789d --- a/pom.xml +++ b/pom.xml @@@ -78,25 -78,31 +78,31 @@@ </oozie.test.default.config.file> <oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file> -- <hadoop.version>2.4.0</hadoop.version> ++ <hadoop.version>2.6.0</hadoop.version> + <hadoop.majorversion>2</hadoop.majorversion> + <hadooplib.version>hadoop-${hadoop.majorversion}-${project.version}</hadooplib.version> + <oozie.hadoop-utils.version>hadoop-${hadoop.majorversion}-${project.version}</oozie.hadoop-utils.version> <hbase.version>0.94.27</hbase.version> <dropwizard.metrics.version>3.1.2</dropwizard.metrics.version> <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> + <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> + <pig.classifier>h2</pig.classifier> ++ <hive.classifier>core</hive.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 --> @@@ -332,6 -348,6 +340,18 @@@ <dependency> <groupId>org.apache.hadoop</groupId> ++ <artifactId>hadoop-yarn-api</artifactId> ++ <version>${hadoop.version}</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.hadoop</groupId> ++ <artifactId>hadoop-yarn-common</artifactId> ++ <version>${hadoop.version}</version> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> <version>${hadoop.auth.version}</version> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/release-log.txt ---------------------------------------------------------------------- diff --cc release-log.txt index af44107,70ffaa6..e850a24 --- a/release-log.txt +++ b/release-log.txt @@@ -1,10 -1,24 +1,25 @@@ -- 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-1459 Remove the version in the child poms for maven-antrun-plugin (Jan Hentschel via rkanter) + OOZIE-2225 Add wild card filter for gathering jobs (sai-krish via rkanter) + OOZIE-2536 Hadoop's cleanup of local directory in uber mode causing failures (satishsaley via rohini) + 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-2719 Test case failure (abhishekbafna via jaydeepvishwakarma) + 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/b99933b7/sharelib/distcp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/hcatalog/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/hive/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/hive2/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/oozie/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/pig/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/spark/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b99933b7/sharelib/sqoop/pom.xml ----------------------------------------------------------------------
