You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by an...@apache.org on 2018/05/15 09:59:07 UTC
oozie git commit: OOZIE-3219 Cannot compile with hadoop 3.1.0
(dbist13, andras.piros)
Repository: oozie
Updated Branches:
refs/heads/master 7804e7447 -> 648009e35
OOZIE-3219 Cannot compile with hadoop 3.1.0 (dbist13, andras.piros)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/648009e3
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/648009e3
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/648009e3
Branch: refs/heads/master
Commit: 648009e35ef2c0dceab725c76c933009a1e0f964
Parents: 7804e74
Author: Andras Piros <an...@cloudera.com>
Authored: Tue May 15 11:58:26 2018 +0200
Committer: Andras Piros <an...@cloudera.com>
Committed: Tue May 15 11:58:26 2018 +0200
----------------------------------------------------------------------
.../org/apache/oozie/util/db/FailingConnectionWrapper.java | 4 ++--
examples/pom.xml | 6 ++++++
release-log.txt | 1 +
sharelib/pig/pom.xml | 5 +++++
.../org/apache/oozie/action/hadoop/SparkArgsExtractor.java | 4 ++--
.../src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java | 4 ++--
webapp/pom.xml | 6 ++++++
7 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/core/src/main/java/org/apache/oozie/util/db/FailingConnectionWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/db/FailingConnectionWrapper.java b/core/src/main/java/org/apache/oozie/util/db/FailingConnectionWrapper.java
index 3b87cc9..9e603ed 100644
--- a/core/src/main/java/org/apache/oozie/util/db/FailingConnectionWrapper.java
+++ b/core/src/main/java/org/apache/oozie/util/db/FailingConnectionWrapper.java
@@ -20,8 +20,8 @@ package org.apache.oozie.util.db;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
+import com.google.common.base.Strings;
import com.google.common.collect.Sets;
-import org.apache.directory.api.util.Strings;
import org.apache.oozie.util.XLog;
import javax.annotation.Nullable;
@@ -354,7 +354,7 @@ public class FailingConnectionWrapper implements Connection {
@Override
public boolean apply(@Nullable String input) {
- Preconditions.checkArgument(Strings.isNotEmpty(input));
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(input));
boolean isDmlStatement = false;
for (final String dmlPrefix : DML_PREFIXES) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2bfc7c8..c13febc 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -40,6 +40,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 9c066a7..e1c359d 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.1.0 release (trunk - unreleased)
+OOZIE-3219 Cannot compile with hadoop 3.1.0 (dbist13, andras.piros)
OOZIE-3232 Reduce heap waste by reducing duplicate string count (Misha Dmitriev via andras.piros)
OOZIE-2914 Consolidate trim calls (Jan Hentschel via andras.piros)
OOZIE-2934 [sharelib/spark] Fix Findbugs error (Jan Hentschel via andras.piros)
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/sharelib/pig/pom.xml
----------------------------------------------------------------------
diff --git a/sharelib/pig/pom.xml b/sharelib/pig/pom.xml
index 5084b61..6619a0a 100644
--- a/sharelib/pig/pom.xml
+++ b/sharelib/pig/pom.xml
@@ -108,6 +108,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>dk.brics.automaton</groupId>
<artifactId>automaton</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
index 2f3cfbe..5af39cd 100644
--- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
+++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
@@ -19,9 +19,9 @@
package org.apache.oozie.action.hadoop;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.api.util.Strings;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.Path;
@@ -424,7 +424,7 @@ class SparkArgsExtractor {
private void addUserDefined(final String userList, final Map<String, URI> urisMap) {
if (userList != null) {
for (final String file : userList.split(OPT_VALUE_SEPARATOR)) {
- if (!Strings.isEmpty(file)) {
+ if (!Strings.isNullOrEmpty(file)) {
final Path p = new Path(file);
urisMap.put(p.getName(), p.toUri());
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
----------------------------------------------------------------------
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
index 8529409..f21fd3b 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
@@ -19,6 +19,7 @@
package org.apache.oozie.tools;
import com.google.common.base.Charsets;
+import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
@@ -26,7 +27,6 @@ import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.directory.api.util.Strings;
import org.apache.oozie.BundleActionBean;
import org.apache.oozie.BundleJobBean;
import org.apache.oozie.CoordinatorActionBean;
@@ -166,7 +166,7 @@ public class OozieDBImportCLI {
}
private static void setImportBatchSize() {
- if (Strings.isNotEmpty(System.getProperty(OOZIE_DB_IMPORT_BATCH_SIZE_KEY))) {
+ if (!Strings.isNullOrEmpty(System.getProperty(OOZIE_DB_IMPORT_BATCH_SIZE_KEY))) {
try {
IMPORT_BATCH_SIZE = Integer.parseInt(System.getProperty(OOZIE_DB_IMPORT_BATCH_SIZE_KEY));
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/648009e3/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 7979969..67526d9 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -148,6 +148,12 @@
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>