Repository: oozie
Updated Branches:
refs/heads/master 7d59ce9ba -> ebf38e8fd
OOZIE-2999 minioozie can't compile (Artem Ervits via gezapeti)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/ebf38e8f
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/ebf38e8f
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/ebf38e8f
Branch: refs/heads/master
Commit: ebf38e8fda10d1b580f66169da7e770dc93b7075
Parents: 7d59ce9
Author: Gezapeti Cseh <gezapeti@gmail.com>
Authored: Wed Aug 9 10:59:26 2017 +0200
Committer: Gezapeti Cseh <gezapeti@gmail.com>
Committed: Wed Aug 9 10:59:26 2017 +0200
----------------------------------------------------------------------
.../oozie/action/hadoop/BlockingMapper.java | 52 --------------------
release-log.txt | 1 +
.../oozie/action/hadoop/BlockingMapper.java | 52 ++++++++++++++++++++
3 files changed, 53 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/ebf38e8f/core/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java b/core/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
deleted file mode 100644
index 0f4dcd6..0000000
--- a/core/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.oozie.action.hadoop;
-
-import java.io.IOException;
-
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.Mapper;
-import org.apache.hadoop.mapred.OutputCollector;
-import org.apache.hadoop.mapred.Reporter;
-
-// A mapper task that blocks forever
-public class BlockingMapper implements Mapper<Object, Object, Object, Object> {
-
- @Override
- public void configure(JobConf job) {
- // nop
- }
-
- @Override
- public void close() throws IOException {
- // nop
- }
-
- @Override
- public void map(Object key, Object value, OutputCollector<Object, Object> output,
Reporter reporter)
- throws IOException {
- try {
- synchronized (this) {
- wait();
- }
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/oozie/blob/ebf38e8f/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 7b6a4a7..de5fb66 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.0.0 release (trunk - unreleased)
+OOZIE-2999 minioozie can't compile (Artem Ervits via gezapeti)
OOZIE-2978 Remove code that handles Pig versions before 0.8 (asasvari)
OOZIE-2852 Remove simple-json dependency from oozie sharelib (Artem Ervits via gezapeti)
OOZIE-3021 Error on job or SLA event listening: WARN logs instead of DEBUG (andras.piros
via asasvari)
http://git-wip-us.apache.org/repos/asf/oozie/blob/ebf38e8f/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
----------------------------------------------------------------------
diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
new file mode 100644
index 0000000..0f4dcd6
--- /dev/null
+++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/BlockingMapper.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oozie.action.hadoop;
+
+import java.io.IOException;
+
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.Mapper;
+import org.apache.hadoop.mapred.OutputCollector;
+import org.apache.hadoop.mapred.Reporter;
+
+// A mapper task that blocks forever
+public class BlockingMapper implements Mapper<Object, Object, Object, Object> {
+
+ @Override
+ public void configure(JobConf job) {
+ // nop
+ }
+
+ @Override
+ public void close() throws IOException {
+ // nop
+ }
+
+ @Override
+ public void map(Object key, Object value, OutputCollector<Object, Object> output,
Reporter reporter)
+ throws IOException {
+ try {
+ synchronized (this) {
+ wait();
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
|