oozie-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gezap...@apache.org
Subject oozie git commit: OOZIE-2974 Change TestLiteWorkflowAppParser so that it works with Hadoop 3 (asasvari via gezapeti)
Date Tue, 01 Aug 2017 14:57:26 GMT
Repository: oozie
Updated Branches:
  refs/heads/master ecccdcf73 -> 018261023


OOZIE-2974 Change TestLiteWorkflowAppParser so that it works with Hadoop 3 (asasvari via gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/01826102
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/01826102
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/01826102

Branch: refs/heads/master
Commit: 01826102302e8c62f7b5bf2156aa2c0bb1c84c9e
Parents: ecccdcf
Author: Gezapeti Cseh <gezapeti@gmail.com>
Authored: Tue Aug 1 16:57:17 2017 +0200
Committer: Gezapeti Cseh <gezapeti@gmail.com>
Committed: Tue Aug 1 16:57:17 2017 +0200

----------------------------------------------------------------------
 .../org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java   | 1 +
 release-log.txt                                                     | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/01826102/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
index 0557166..2133240 100644
--- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
+++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
@@ -54,6 +54,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
     private String cleanupXml(String xml) {
         xml = xml.replaceAll(" xmlns=?(\"|\')(\"|\')", "");
         xml = xml.replaceAll("\\s*<source>.*</source>", "");    // remove the
<source> added by Hadoop 2
+        xml = xml.replaceAll("\\s*<final>.*</final>", "");      // remove the
<final> added by Hadoop 3
         return xml;
     }
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/01826102/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 2441e24..2419972 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2974 Change TestLiteWorkflowAppParser so that it works with Hadoop 3 (asasvari via
gezapeti)
 OOZIE-2977 Fix javafoc error: self-closing element not allowed (Artem Ervits via gezapeti)
 OOZIE-2960 Fix warnings for @return tag has no argument (Artem Ervits via gezapeti)
 OOZIE-3019 Remove getPasswordMethod in ConfigurationService (gezapeti)


Mime
View raw message