Repository: oozie Updated Branches: refs/heads/master 4e02bfa88 -> f9be9f0c1
OOZIE-2997 files contain trailing white spaces in client lib (dbist13 via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f9be9f0c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f9be9f0c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f9be9f0c Branch: refs/heads/master Commit: f9be9f0c1a4b0ae44c3d89e64593a4d60e57a903 Parents: 4e02bfa Author: Gezapeti Cseh <gezap...@apache.org> Authored: Sat Nov 11 22:01:47 2017 +0100 Committer: Gezapeti Cseh <gezap...@apache.org> Committed: Sat Nov 11 22:01:47 2017 +0100 ---------------------------------------------------------------------- client/src/main/java/org/apache/oozie/cli/CLIParser.java | 3 --- .../main/java/org/apache/oozie/client/AuthOozieClient.java | 3 ++- client/src/main/java/org/apache/oozie/client/BundleJob.java | 2 +- .../main/java/org/apache/oozie/client/WorkflowAction.java | 8 ++++---- .../src/main/java/org/apache/oozie/client/WorkflowJob.java | 2 +- .../main/java/org/apache/oozie/client/rest/JsonUtils.java | 2 +- release-log.txt | 1 + 7 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/client/src/main/java/org/apache/oozie/cli/CLIParser.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/cli/CLIParser.java b/client/src/main/java/org/apache/oozie/cli/CLIParser.java index c3dd9b3..3930276 100644 --- a/client/src/main/java/org/apache/oozie/cli/CLIParser.java +++ b/client/src/main/java/org/apache/oozie/cli/CLIParser.java @@ -162,7 +162,6 @@ public class CLIParser { /** * Print the help for the parser to standard output. - * * @param commandLine the command line */ public void showHelp(CommandLine commandLine) { @@ -213,5 +212,3 @@ public class CLIParser { } } - - http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java b/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java index 45f856e..98f421f 100644 --- a/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java +++ b/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java @@ -288,7 +288,8 @@ public class AuthOozieClient extends XOozieClient { return authClass.newInstance(); } catch (IllegalArgumentException iae) { - throw new OozieClientException(OozieClientException.AUTHENTICATION, "Invalid options provided for auth: " + authOption + throw new OozieClientException(OozieClientException.AUTHENTICATION, + "Invalid options provided for auth: " + authOption + ", (" + AuthType.KERBEROS + " or " + AuthType.SIMPLE + " expected.)"); } catch (InstantiationException ex) { http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/client/src/main/java/org/apache/oozie/client/BundleJob.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/BundleJob.java b/client/src/main/java/org/apache/oozie/client/BundleJob.java index 1adf4e2..0aede71 100644 --- a/client/src/main/java/org/apache/oozie/client/BundleJob.java +++ b/client/src/main/java/org/apache/oozie/client/BundleJob.java @@ -53,7 +53,7 @@ public interface BundleJob extends Job { * @return the list of CoordinatorJob. */ List<CoordinatorJob> getCoordinators(); - + /** * Return the JOB Kickoff time. * http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/client/src/main/java/org/apache/oozie/client/WorkflowAction.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/WorkflowAction.java b/client/src/main/java/org/apache/oozie/client/WorkflowAction.java index 18154ff..088d8f5 100644 --- a/client/src/main/java/org/apache/oozie/client/WorkflowAction.java +++ b/client/src/main/java/org/apache/oozie/client/WorkflowAction.java @@ -62,7 +62,7 @@ public interface WorkflowAction { * @return the Credential. */ String getCred(); - + /** * Return the action type. * @@ -91,21 +91,21 @@ public interface WorkflowAction { * @return the number of retries of the action. */ int getRetries(); - + /** * Return the number of user retry of the action. * * @return the number of user retry of the action. */ int getUserRetryCount(); - + /** * Return the max number of user retry of the action. * * @return the max number of user retry of the action. */ int getUserRetryMax(); - + /** * Return the interval of user retry of the action, in minutes. * http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/client/src/main/java/org/apache/oozie/client/WorkflowJob.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/WorkflowJob.java b/client/src/main/java/org/apache/oozie/client/WorkflowJob.java index 131d9b2..2d1cb4c 100644 --- a/client/src/main/java/org/apache/oozie/client/WorkflowJob.java +++ b/client/src/main/java/org/apache/oozie/client/WorkflowJob.java @@ -135,7 +135,7 @@ public interface WorkflowJob { * @return the workflow job console URL. */ String getConsoleUrl(); - + /** * Return the coordinator action ID or the parent workflow ID * http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/client/src/main/java/org/apache/oozie/client/rest/JsonUtils.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/rest/JsonUtils.java b/client/src/main/java/org/apache/oozie/client/rest/JsonUtils.java index 174e09a..b13ad3a 100644 --- a/client/src/main/java/org/apache/oozie/client/rest/JsonUtils.java +++ b/client/src/main/java/org/apache/oozie/client/rest/JsonUtils.java @@ -56,7 +56,7 @@ public class JsonUtils { } return null; } - + /** * Format a Date in RFC822 GMT. * http://git-wip-us.apache.org/repos/asf/oozie/blob/f9be9f0c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index c058df0..f71cf5c 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2997 files contain trailing white spaces in client lib (dbist13 via gezapeti) OOZIE-3101 Oozie should add error message to the response body (satishsaley) OOZIE-2964 Add -Xdoclint:all to javadoc opts (dbist13 via andras.piros) OOZIE-3022 Fix for warning has no file and won't be listed in dependency files details (dbist13 via gezapeti and andras.piros)
