| From 55f14ed095900fa7cd3bbfe3b32b8d84d750925d Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=92?= |
| =?UTF-8?q?=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=92=D0=BB=D0=B0=D0=B4=D0=B8?= |
| =?UTF-8?q?=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B8=D1=87?= |
| <victor.v.mikhaylov@gmail.com> |
| Date: Fri, 5 Oct 2018 16:19:43 +0300 |
| Subject: [PATCH] Build oozie |
| |
| --- |
| examples/pom.xml | 10 ++--- |
| examples/src/main/apps/custom-main/workflow.xml | 28 ------------- |
| examples/src/main/apps/pig/id.pig | 20 --------- |
| examples/src/main/apps/pig/job.properties | 26 ------------ |
| examples/src/main/apps/pig/workflow.xml | 48 ---------------------- |
| .../java/org/apache/oozie/example/DemoPigMain.java | 24 ----------- |
| pom.xml | 10 +++++ |
| sharelib/pom.xml | 2 +- |
| webapp/pom.xml | 4 +- |
| 9 files changed, 18 insertions(+), 154 deletions(-) |
| delete mode 100644 examples/src/main/apps/pig/id.pig |
| delete mode 100644 examples/src/main/apps/pig/job.properties |
| delete mode 100644 examples/src/main/apps/pig/workflow.xml |
| delete mode 100644 examples/src/main/java/org/apache/oozie/example/DemoPigMain.java |
| |
| diff --git a/examples/pom.xml b/examples/pom.xml |
| index 3e36ec1..e11df02 100644 |
| --- a/examples/pom.xml |
| +++ b/examples/pom.xml |
| @@ -68,11 +68,11 @@ |
| <scope>provided</scope> |
| </dependency> |
| |
| - <dependency> |
| - <groupId>org.apache.oozie</groupId> |
| - <artifactId>oozie-sharelib-pig</artifactId> |
| - <scope>compile</scope> |
| - </dependency> |
| + <!--<dependency>--> |
| + <!--<groupId>org.apache.oozie</groupId>--> |
| + <!--<artifactId>oozie-sharelib-pig</artifactId>--> |
| + <!--<scope>compile</scope>--> |
| + <!--</dependency>--> |
| |
| <dependency> |
| <groupId>org.apache.oozie</groupId> |
| diff --git a/examples/src/main/apps/custom-main/workflow.xml b/examples/src/main/apps/custom-main/workflow.xml |
| index 828dfaa..47cc5de 100644 |
| --- a/examples/src/main/apps/custom-main/workflow.xml |
| +++ b/examples/src/main/apps/custom-main/workflow.xml |
| @@ -70,34 +70,6 @@ |
| <error to="fail"/> |
| </action> |
| |
| - <action name="pig-node"> |
| - <pig> |
| - <job-tracker>${jobTracker}</job-tracker> |
| - <name-node>${nameNode}</name-node> |
| - <prepare> |
| - <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/custom-main/pig-node"/> |
| - </prepare> |
| - <configuration> |
| - <property> |
| - <name>mapred.job.queue.name</name> |
| - <value>${queueName}</value> |
| - </property> |
| - |
| - <!-- Using a custom PigMain class--> |
| - <property> |
| - <name>oozie.launcher.action.main.class</name> |
| - <value>org.apache.oozie.example.DemoPigMain</value> |
| - </property> |
| - |
| - </configuration> |
| - <script>id.pig</script> |
| - <param>INPUT=/user/${wf:user()}/${examplesRoot}/output-data/custom-main/mr-node</param> |
| - <param>OUTPUT=/user/${wf:user()}/${examplesRoot}/output-data/custom-main/pig-node</param> |
| - </pig> |
| - <ok to="end"/> |
| - <error to="fail"/> |
| - </action> |
| - |
| <kill name="fail"> |
| <message>Demo workflow failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message> |
| </kill> |
| diff --git a/examples/src/main/apps/pig/id.pig b/examples/src/main/apps/pig/id.pig |
| deleted file mode 100644 |
| index a8a3249..0000000 |
| --- a/examples/src/main/apps/pig/id.pig |
| +++ /dev/null |
| @@ -1,20 +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. |
| --- |
| -A = load '$INPUT' using PigStorage(':'); |
| -B = foreach A generate $0 as id; |
| -store B into '$OUTPUT' USING PigStorage(); |
| diff --git a/examples/src/main/apps/pig/job.properties b/examples/src/main/apps/pig/job.properties |
| deleted file mode 100644 |
| index 53e94ea..0000000 |
| --- a/examples/src/main/apps/pig/job.properties |
| +++ /dev/null |
| @@ -1,26 +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. |
| -# |
| - |
| -nameNode=hdfs://localhost:8020 |
| -jobTracker=localhost:8021 |
| -queueName=default |
| -examplesRoot=examples |
| - |
| -oozie.use.system.libpath=true |
| - |
| -oozie.wf.application.path=${nameNode}/user/${user.name}/${examplesRoot}/apps/pig |
| diff --git a/examples/src/main/apps/pig/workflow.xml b/examples/src/main/apps/pig/workflow.xml |
| deleted file mode 100644 |
| index 8da2b66..0000000 |
| --- a/examples/src/main/apps/pig/workflow.xml |
| +++ /dev/null |
| @@ -1,48 +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. |
| ---> |
| -<workflow-app xmlns="uri:oozie:workflow:0.2" name="pig-wf"> |
| - <start to="pig-node"/> |
| - <action name="pig-node"> |
| - <pig> |
| - <job-tracker>${jobTracker}</job-tracker> |
| - <name-node>${nameNode}</name-node> |
| - <prepare> |
| - <delete path="${nameNode}/user/${wf:user()}/${examplesRoot}/output-data/pig"/> |
| - </prepare> |
| - <configuration> |
| - <property> |
| - <name>mapred.job.queue.name</name> |
| - <value>${queueName}</value> |
| - </property> |
| - <property> |
| - <name>mapred.compress.map.output</name> |
| - <value>true</value> |
| - </property> |
| - </configuration> |
| - <script>id.pig</script> |
| - <param>INPUT=/user/${wf:user()}/${examplesRoot}/input-data/text</param> |
| - <param>OUTPUT=/user/${wf:user()}/${examplesRoot}/output-data/pig</param> |
| - </pig> |
| - <ok to="end"/> |
| - <error to="fail"/> |
| - </action> |
| - <kill name="fail"> |
| - <message>Pig failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message> |
| - </kill> |
| - <end name="end"/> |
| -</workflow-app> |
| diff --git a/examples/src/main/java/org/apache/oozie/example/DemoPigMain.java b/examples/src/main/java/org/apache/oozie/example/DemoPigMain.java |
| deleted file mode 100644 |
| index 65c4e9b..0000000 |
| --- a/examples/src/main/java/org/apache/oozie/example/DemoPigMain.java |
| +++ /dev/null |
| @@ -1,24 +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.example; |
| - |
| -import org.apache.oozie.action.hadoop.PigMain; |
| - |
| -public class DemoPigMain extends PigMain { |
| -} |
| diff --git a/pom.xml b/pom.xml |
| index 5d92d77..d8fa9ae 100644 |
| --- a/pom.xml |
| +++ b/pom.xml |
| @@ -481,6 +481,10 @@ |
| <groupId>org.apache.hive</groupId> |
| <artifactId>hive-cli</artifactId> |
| </exclusion> |
| + <exclusion> |
| + <groupId>org.apache.logging.log4j</groupId> |
| + <artifactId>log4j-1.2-api</artifactId> |
| + </exclusion> |
| </exclusions> |
| </dependency> |
| |
| @@ -1403,6 +1407,12 @@ |
| <artifactId>hive-exec</artifactId> |
| <version>${hive.version}</version> |
| <classifier>${hive.classifier}</classifier> |
| + <exclusions> |
| + <exclusion> |
| + <groupId>org.apache.logging.log4j</groupId> |
| + <artifactId>log4j-1.2-api</artifactId> |
| + </exclusion> |
| + </exclusions> |
| </dependency> |
| |
| <!-- examples --> |
| diff --git a/sharelib/pom.xml b/sharelib/pom.xml |
| index 9f8aff1..538641f 100644 |
| --- a/sharelib/pom.xml |
| +++ b/sharelib/pom.xml |
| @@ -34,7 +34,7 @@ |
| <modules> |
| <module>streaming</module> |
| <module>hcatalog</module> |
| - <module>pig</module> |
| + <!--<module>pig</module>--> |
| <module>hive</module> |
| <module>hive2</module> |
| <module>sqoop</module> |
| diff --git a/webapp/pom.xml b/webapp/pom.xml |
| index dc2298c..4aea7f3 100644 |
| --- a/webapp/pom.xml |
| +++ b/webapp/pom.xml |
| @@ -170,10 +170,10 @@ |
| </goals> |
| <configuration> |
| <artifactItems> |
| - <artifactItem> |
| + <!--<artifactItem> |
| <groupId>org.apache.oozie</groupId> |
| <artifactId>oozie-sharelib-pig</artifactId> |
| - </artifactItem> |
| + </artifactItem>--> |
| <artifactItem> |
| <groupId>org.apache.oozie</groupId> |
| <artifactId>oozie-sharelib-hive</artifactId> |
| -- |
| 1.9.1 |
| |
