OOZIE-1876 use pom properties rather than specific version numbers in the pom files of hbaselibs, hcataloglibs, sharelib, etc (shwethags)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d8aca11d Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d8aca11d Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d8aca11d Branch: refs/heads/master Commit: d8aca11d815364528d7d3876f3adc9b59c17b9f9 Parents: 30b29c8 Author: shwethags <[email protected]> Authored: Tue Dec 30 11:30:51 2014 +0530 Committer: shwethags <[email protected]> Committed: Tue Dec 30 11:30:51 2014 +0530 ---------------------------------------------------------------------- client/src/main/bin/oozie | 9 + core/pom.xml | 41 +- distro/src/main/bin/oozie-setup.sh | 11 +- distro/src/main/bin/oozied.sh | 17 +- docs/src/site/twiki/DG_QuickStart.twiki | 48 +- docs/src/site/twiki/ENG_Building.twiki | 44 +- examples/pom.xml | 16 +- hadooplibs/hadoop-0.23/pom.xml | 66 -- hadooplibs/hadoop-1/pom.xml | 61 -- hadooplibs/hadoop-2/pom.xml | 71 -- hadooplibs/hadoop-3/pom.xml | 76 -- hadooplibs/hadoop-auth-0.23/pom.xml | 17 +- hadooplibs/hadoop-auth-1/pom.xml | 95 +-- hadooplibs/hadoop-auth-2/pom.xml | 19 +- hadooplibs/hadoop-distcp-0.23/pom.xml | 10 +- hadooplibs/hadoop-distcp-1/pom.xml | 10 +- hadooplibs/hadoop-distcp-2/pom.xml | 4 +- hadooplibs/hadoop-distcp-3/pom.xml | 4 +- hadooplibs/hadoop-test-0.23/pom.xml | 59 -- hadooplibs/hadoop-test-1/pom.xml | 59 -- hadooplibs/hadoop-test-2/pom.xml | 59 -- hadooplibs/hadoop-test-3/pom.xml | 59 -- hadooplibs/hadoop-utils-0.23/pom.xml | 11 +- hadooplibs/hadoop-utils-1/pom.xml | 12 +- hadooplibs/hadoop-utils-2/pom.xml | 7 +- hadooplibs/hadoop-utils-3/pom.xml | 7 +- hadooplibs/pom.xml | 64 +- hbaselibs/hbase-0.94/pom.xml | 275 ------- hbaselibs/pom.xml | 61 -- hcataloglibs/hive-hcatalog-0.13.1/pom.xml | 215 ------ hcataloglibs/pom.xml | 61 -- minitest/pom.xml | 19 +- pom.xml | 729 +++++++++++++++++-- release-log.txt | 1 + sharelib/distcp/pom.xml | 18 +- sharelib/hcatalog/pom.xml | 20 +- sharelib/hive/pom.xml | 19 +- sharelib/hive2/pom.xml | 334 +-------- sharelib/oozie/pom.xml | 13 +- sharelib/pig/pom.xml | 25 +- sharelib/spark/pom.xml | 116 +-- sharelib/sqoop/pom.xml | 17 +- sharelib/streaming/pom.xml | 17 +- src/main/assemblies/distro.xml | 8 +- src/main/assemblies/hadooplib.xml | 35 - src/main/assemblies/hadooplibs.xml | 37 - src/main/assemblies/hbaselib.xml | 35 - src/main/assemblies/hbaselibs.xml | 33 - src/main/assemblies/hcataloglib.xml | 35 - src/main/assemblies/hcataloglibs.xml | 33 - tools/pom.xml | 88 +-- tools/src/main/bin/ooziedb.sh | 12 + .../java/org/apache/oozie/tools/OozieDBCLI.java | 27 +- webapp/pom.xml | 140 ++-- zookeeper-security-tests/pom.xml | 25 +- 55 files changed, 1073 insertions(+), 2331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/client/src/main/bin/oozie ---------------------------------------------------------------------- diff --git a/client/src/main/bin/oozie b/client/src/main/bin/oozie index 44943fa..266e0fa 100644 --- a/client/src/main/bin/oozie +++ b/client/src/main/bin/oozie @@ -33,6 +33,15 @@ done BASEDIR=`dirname ${PRG}` BASEDIR=`cd ${BASEDIR}/..;pwd` +#Create lib directory from war if lib doesn't exist +if [ ! -d "${BASEDIR}/lib" ]; then + mkdir ${BASEDIR}/lib + unzip ${BASEDIR}/oozie.war WEB-INF/lib/*.jar -d ${BASEDIR}/lib > /dev/null + mv ${BASEDIR}/lib/WEB-INF/lib/*.jar ${BASEDIR}/lib/ + rmdir ${BASEDIR}/lib/WEB-INF/lib + rmdir ${BASEDIR}/lib/WEB-INF +fi + OOZIECPPATH="" for i in "${BASEDIR}/lib/"*.jar; do OOZIECPPATH="${OOZIECPPATH}:$i" http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index ca40e2e..c62556c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -35,41 +35,38 @@ </properties> <dependencies> - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <scope>provided</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hbase</artifactId> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>provided</scope> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-webhcat-java-client</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-server-extensions</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-client</artifactId> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-auth</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -114,6 +111,12 @@ </dependency> <dependency> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hadoop-distcp</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -257,7 +260,7 @@ <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-distcp</artifactId> - <scope>compile</scope> + <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/distro/src/main/bin/oozie-setup.sh ---------------------------------------------------------------------- diff --git a/distro/src/main/bin/oozie-setup.sh b/distro/src/main/bin/oozie-setup.sh index 45f21de..663d2c9 100644 --- a/distro/src/main/bin/oozie-setup.sh +++ b/distro/src/main/bin/oozie-setup.sh @@ -133,8 +133,17 @@ do OOZIE_OPTS="${OOZIE_OPTS} -Doozie.data.dir=${OOZIE_DATA}"; OOZIE_OPTS="${OOZIE_OPTS} -Dderby.stream.error.file=${OOZIE_LOG}/derby.log" + #Create lib directory from war if lib doesn't exist + if [ ! -d "${BASEDIR}/lib" ]; then + mkdir ${BASEDIR}/lib + unzip ${BASEDIR}/oozie.war WEB-INF/lib/*.jar -d ${BASEDIR}/lib > /dev/null + mv ${BASEDIR}/lib/WEB-INF/lib/*.jar ${BASEDIR}/lib/ + rmdir ${BASEDIR}/lib/WEB-INF/lib + rmdir ${BASEDIR}/lib/WEB-INF + fi + OOZIECPPATH="" - OOZIECPPATH=${BASEDIR}/libtools/'*':${BASEDIR}/libext/'*' + OOZIECPPATH=${BASEDIR}/lib/'*':${BASEDIR}/libtools/'*':${BASEDIR}/libext/'*' if test -z ${JAVA_HOME}; then JAVA_BIN=java http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/distro/src/main/bin/oozied.sh ---------------------------------------------------------------------- diff --git a/distro/src/main/bin/oozied.sh b/distro/src/main/bin/oozied.sh index 8eafc96..a869c3d 100644 --- a/distro/src/main/bin/oozied.sh +++ b/distro/src/main/bin/oozied.sh @@ -80,8 +80,8 @@ setup_catalina_opts() { setup_oozie() { if [ ! -e "${CATALINA_BASE}/webapps/oozie.war" ]; then - echo "WARN: Oozie WAR has not been set up at ''${CATALINA_BASE}/webapps'', doing default set up" - ${BASEDIR}/bin/oozie-setup.sh + echo "WARN: Oozie WAR has not been set up at '${CATALINA_BASE}/webapps', doing default set up" + ${BASEDIR}/bin/oozie-setup.sh prepare-war if [ "$?" != "0" ]; then exit -1 fi @@ -89,10 +89,21 @@ setup_oozie() { echo } +setup_ooziedb() { + echo "Setting up oozie DB" + ${BASEDIR}/bin/ooziedb.sh create -run + if [ "$?" != "0" ]; then + exit -1 + fi + echo +} + case $actionCmd in (start|run) setup_catalina_opts - setup_oozie + setup_oozie + setup_ooziedb + #TODO setup default oozie sharelib ;; (stop) setup_catalina_opts http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/docs/src/site/twiki/DG_QuickStart.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_QuickStart.twiki b/docs/src/site/twiki/DG_QuickStart.twiki index 526fbc3..a348df4 100644 --- a/docs/src/site/twiki/DG_QuickStart.twiki +++ b/docs/src/site/twiki/DG_QuickStart.twiki @@ -31,19 +31,34 @@ Expand the source distribution =tar.gz= and change directories into it. The simplest way to build Oozie is to run the =mkdistro.sh= script: <verbatim> -$ bin/mkdistro.sh +$ bin/mkdistro.sh [-DskipTests] + +Running =mkdistro.sh= will create the binary distribution of Oozie. By default, oozie war will not contain hadoop and +hcatalog libraries, however they are required for oozie to work. There are 2 options to add these libraries: + +1. At install time, copy the hadoop and hcatalog libraries to libext and run oozie-setup.sh to setup oozie war. This is +suitable when same oozie package needs to be used in multiple set-ups with different hadoop/hcatalog versions. + +2. Build with -Puber which will bundle the required libraries in the oozie war. Further, the following options are +available to customise the versions of the dependencies: +-P<profile> - default hadoop-1. Valid are hadoop-1, hadoop-0.23, hadoop-2 or hadoop-3. Choose the correct hadoop +profile depending on the hadoop version used. +-Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 0.23.5 for hadoop-0.23, 2.3.0 for hadoop-2 and 3.0.0-SNAPSHOT + for hadoop-3 +-Dhadoop.auth.version=<version> - defaults to hadoop version +-Ddistcp.version=<version> - defaults to hadoop version +-Dpig.version=<version> - default 0.12.1 +-Dpig.classifier=<classifier> - default none +-Dsqoop.version=<version> - default 1.4.3 +-Dsqoop.classifier=<classifier> - default hadoop100 +-Dtomcat.version=<version> - default 6.0.41 +-Dopenjpa.version=<version> - default 2.2.2 +-Dxerces.version=<version> - default 2.10.0 +-Dcurator.version=<version> - default 2.5.0 +-Dhive.version=<version> - default 0.13.1 +-Dhbase.version=<version> - default 0.94.2 </verbatim> -If you'd like to skip all of the tests, which can take some time: -<verbatim> -$ bin/mkdistro.sh -DskipTests -</verbatim> -Running =mkdistro.sh= will create the binary distribution of Oozie. - -*IMPORTANT:* By default it builds against Hadoop 1.1.1. It's possible to build against Hadoop 2.x versions as well, but it is -strongly recommend to use a [[http://bigtop.apache.org][Bigtop]] distribution if using Hadoop 2.x because the Oozie sharelibs built -from the tarball distribution will not work with it. - More details on building Oozie can be found on the [[ENG_Building][Building Oozie]] page. ---++ Server Installation @@ -95,10 +110,6 @@ The following two properties are required in Hadoop core-site.xml: Replace the capital letter sections with specific values and then restart Hadoop. -Expand the Oozie hadooplibs =tar.gz= in the same location Oozie distribution =tar.gz= was expanded. A -*hadooplibs/* directory will be created containing the Hadoop JARs for the versions of Hadoop that -the Oozie distribution supports. - The ExtJS library is optional (only required for the Oozie web-console to work) *IMPORTANT:* all Oozie server scripts (=oozie-setup.sh=, =oozied.sh=, =oozie-start.sh=, =oozie-run.sh= @@ -112,11 +123,8 @@ behaviors of =oozie-start.sh=, =oozie-run.sh=, and =oozie-stop.sh= respectively. Create a *libext/* directory in the directory where Oozie was expanded. -If using a version of Hadoop bundled in Oozie *hadooplibs/*, copy the corresponding Hadoop JARs -from *hadooplibs/* to the *libext/* directory. If using a different version of Hadoop, copy the -required Hadoop JARs from such version in the *libext/* directory. - -If using the ExtJS library copy the ZIP file to the *libext/* directory. +If using the ExtJS library copy the ZIP file to the *libext/* directory. If hadoop and hcatalog libraries are not +already included in the war, add the corresponding libraries to *libext/* directory. A "sharelib create -fs fs_default_name [-locallib sharelib]" command is available when running oozie-setup.sh for uploading new sharelib into hdfs where the first argument is the default fs name http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/docs/src/site/twiki/ENG_Building.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/ENG_Building.twiki b/docs/src/site/twiki/ENG_Building.twiki index 8d74b72..efd0b2e 100644 --- a/docs/src/site/twiki/ENG_Building.twiki +++ b/docs/src/site/twiki/ENG_Building.twiki @@ -31,7 +31,7 @@ $ mvn install </verbatim> #SshSetup ----++ Passphare-less SSH Setup +---++ Passphrase-less SSH Setup *NOTE: SSH actions are deprecated in Oozie 2.* @@ -206,30 +206,30 @@ the 'SKIPPING TEST..." message would appear in the testcase log file of both tes An Oozie distribution bundles an embedded Tomcat server. The Oozie distro module downloads Tomcat TAR.GZ from Apache once (in the =distro/downloads/= directory) and uses it when creating the distro. -The following Maven invocation builds an Oozie distribution: - +The simplest way to build Oozie is to run the =mkdistro.sh= script: <verbatim> -$ mvn clean package assembly:single +$ bin/mkdistro.sh [-DskipTests] +Running =mkdistro.sh= will create the binary distribution of Oozie. The following options are available to customise +the versions of the dependencies: +-Puber - Bundle required hadoop and hcatalog libraries in oozie war +-P<profile> - default hadoop-1. Valid are hadoop-1, hadoop-0.23, hadoop-2 or hadoop-3. Choose the correct hadoop +profile depending on the hadoop version used. +-Dhadoop.version=<version> - default 1.2.1 for hadoop-1, 0.23.5 for hadoop-0.23, 2.3.0 for hadoop-2 and 3.0 +.0-SNAPSHOT for hadoop-3 +-Dhadoop.auth.version=<version> - defaults to hadoop version +-Ddistcp.version=<version> - defaults to hadoop version +-Dpig.version=<version> - default 0.12.1 +-Dpig.classifier=<classifier> - default none +-Dsqoop.version=<version> - default 1.4.3 +-Dsqoop.classifier=<classifier> - default hadoop100 +-Dtomcat.version=<version> - default 6.0.41 +-Dopenjpa.version=<version> - default 2.2.2 +-Dxerces.version=<version> - default 2.10.0 +-Dcurator.version=<version> - default 2.5.0 +-Dhive.version=<version> - default 0.13.1 +-Dhbase.version=<version> - default 0.94.2 </verbatim> -*Build instructions with Hadoop Yarn (Hadoop-2.x)* - -Following values can be passed as maven properties - * -Dhadoop.version : *2.0.0-alpha* - * -Dpig.version (optional) : either *0.9.2* or *0.10.2* - -For e.g. -<verbatim> -$ mvn clean package assembly:single -Dhadoop.version=2.0.0-alpha -</verbatim> - -If none of these parameters are specified, the defaults are - * -Dhadoop.version : *1.0.1* - * -Dpig.version : *0.9.0* - -*IMPORTANT:* It is strongly recommend to use a [[http://bigtop.apache.org][Bigtop]] distribution if using Hadoop 2.x because the -Oozie sharelibs built from the tarball distribution will not work with it. - The following properties should be specified when building a release: * -DgenerateDocs : forces the generation of Oozie documentation http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 852d222..c5af129 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,29 +32,27 @@ <packaging>jar</packaging> <dependencies> - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-core</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-core</artifactId> - <classifier>tests</classifier> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <artifactId>oozie-core</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> + <artifactId>oozie-core</artifactId> + <classifier>tests</classifier> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-0.23/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-0.23/pom.xml b/hadooplibs/hadoop-0.23/pom.xml deleted file mode 100644 index 6297dbd..0000000 --- a/hadooplibs/hadoop-0.23/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>0.23.5.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version}</description> - <name>Apache Oozie Hadoop ${project.version}</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>0.23.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>0.23.5</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/hadooplib.xml</descriptor> - </descriptors> - <finalName>hadooplibs</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-1/pom.xml b/hadooplibs/hadoop-1/pom.xml deleted file mode 100644 index f0a32a5..0000000 --- a/hadooplibs/hadoop-1/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version}</description> - <name>Apache Oozie Hadoop ${project.version}</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>1.2.1</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/hadooplib.xml</descriptor> - </descriptors> - <finalName>hadooplibs</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-2/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-2/pom.xml b/hadooplibs/hadoop-2/pom.xml deleted file mode 100644 index 32d4b6c..0000000 --- a/hadooplibs/hadoop-2/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>2.3.0.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version}</description> - <name>Apache Oozie Hadoop ${project.version}</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>2.3.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <artifactId>protobuf-java</artifactId> - <groupId>com.google.protobuf</groupId> - <version>2.5.0</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/hadooplib.xml</descriptor> - </descriptors> - <finalName>hadooplibs</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-3/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-3/pom.xml b/hadooplibs/hadoop-3/pom.xml deleted file mode 100644 index 4fd8f29..0000000 --- a/hadooplibs/hadoop-3/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>3.0.0-SNAPSHOT.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version}</description> - <name>Apache Oozie Hadoop ${project.version}</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>3.0.0-SNAPSHOT</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>jasper-runtime</artifactId> - <groupId>tomcat</groupId> - </exclusion> - <exclusion> - <artifactId>jsp-api</artifactId> - <groupId>javax.servlet.jsp</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/hadooplib.xml</descriptor> - </descriptors> - <finalName>hadooplibs</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-auth-0.23/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-auth-0.23/pom.xml b/hadooplibs/hadoop-auth-0.23/pom.xml index 59cc7f1..5769f66 100644 --- a/hadooplibs/hadoop-auth-0.23/pom.xml +++ b/hadooplibs/hadoop-auth-0.23/pom.xml @@ -27,27 +27,16 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-auth</artifactId> - <version>0.23.5.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> + <version>hadoop-0.23-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop Auth</description> + <name>Apache Oozie Hadoop Auth ${project.version} Test</name> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>0.23.5</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-auth-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-auth-1/pom.xml b/hadooplibs/hadoop-auth-1/pom.xml index 7da7639..ac36798 100644 --- a/hadooplibs/hadoop-auth-1/pom.xml +++ b/hadooplibs/hadoop-auth-1/pom.xml @@ -27,106 +27,17 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-auth</artifactId> - <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> + <version>hadoop-1-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop Auth</description> + <name>Apache Oozie Hadoop Auth ${project.version}</name> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>1.2.1</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>xmlenc</groupId> - <artifactId>xmlenc</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - </exclusion> - <exclusion> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - </exclusion> - <exclusion> - <groupId>commons-el</groupId> - <artifactId>commons-el</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-api-2.1</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> - - </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-auth-2/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-auth-2/pom.xml b/hadooplibs/hadoop-auth-2/pom.xml index cbdb523..977d49c 100644 --- a/hadooplibs/hadoop-auth-2/pom.xml +++ b/hadooplibs/hadoop-auth-2/pom.xml @@ -27,30 +27,17 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-auth</artifactId> - <version>2.3.0.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> + <version>hadoop-2-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop</description> + <name>Apache Oozie Hadoop Auth ${project.version} Test</name> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>2.3.0</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> - - </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-distcp-0.23/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-distcp-0.23/pom.xml b/hadooplibs/hadoop-distcp-0.23/pom.xml index 6e42986..c13b78d 100644 --- a/hadooplibs/hadoop-distcp-0.23/pom.xml +++ b/hadooplibs/hadoop-distcp-0.23/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-distcp</artifactId> - <version>0.23.5.oozie-4.2.0-SNAPSHOT</version> + <version>hadoop-0.23-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Distcp ${project.version}</description> <name>Apache Oozie Hadoop Distcp ${project.version}</name> <packaging>jar</packaging> @@ -36,16 +36,8 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> - <version>0.23.5</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>hadoop-core</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - </exclusions> </dependency> </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-distcp-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-distcp-1/pom.xml b/hadooplibs/hadoop-distcp-1/pom.xml index 01eb123..5b4f96f 100644 --- a/hadooplibs/hadoop-distcp-1/pom.xml +++ b/hadooplibs/hadoop-distcp-1/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-distcp</artifactId> - <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> + <version>hadoop-1-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Distcp ${project.version}</description> <name>Apache Oozie Hadoop Distcp ${project.version}</name> <packaging>jar</packaging> @@ -36,16 +36,8 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-tools</artifactId> - <version>1.2.1</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>hadoop-core</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - </exclusions> </dependency> </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-distcp-2/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-distcp-2/pom.xml b/hadooplibs/hadoop-distcp-2/pom.xml index 7971eb5..4097cc4 100644 --- a/hadooplibs/hadoop-distcp-2/pom.xml +++ b/hadooplibs/hadoop-distcp-2/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-distcp</artifactId> - <version>2.3.0.oozie-4.2.0-SNAPSHOT</version> + <version>hadoop-2-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Distcp ${project.version}</description> <name>Apache Oozie Hadoop Distcp ${project.version}</name> <packaging>jar</packaging> @@ -36,10 +36,8 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> - <version>2.3.0</version> <scope>compile</scope> </dependency> </dependencies> - </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-distcp-3/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-distcp-3/pom.xml b/hadooplibs/hadoop-distcp-3/pom.xml index 598ee13..8d8180d 100644 --- a/hadooplibs/hadoop-distcp-3/pom.xml +++ b/hadooplibs/hadoop-distcp-3/pom.xml @@ -27,7 +27,7 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-distcp</artifactId> - <version>3.0.0-SNAPSHOT.oozie-4.2.0-SNAPSHOT</version> + <version>hadoop-3-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Distcp ${project.version}</description> <name>Apache Oozie Hadoop Distcp ${project.version}</name> <packaging>jar</packaging> @@ -36,8 +36,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> - <version>3.0.0-SNAPSHOT</version> - <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-test-0.23/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-test-0.23/pom.xml b/hadooplibs/hadoop-test-0.23/pom.xml deleted file mode 100644 index addcd11..0000000 --- a/hadooplibs/hadoop-test-0.23/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <version>0.23.5.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>0.23.5</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/empty.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-test-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-test-1/pom.xml b/hadooplibs/hadoop-test-1/pom.xml deleted file mode 100644 index baf5a4c..0000000 --- a/hadooplibs/hadoop-test-1/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>1.2.1</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/empty.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-test-2/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-test-2/pom.xml b/hadooplibs/hadoop-test-2/pom.xml deleted file mode 100644 index 027c813..0000000 --- a/hadooplibs/hadoop-test-2/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <version>2.3.0.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>2.3.0</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/empty.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-test-3/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-test-3/pom.xml b/hadooplibs/hadoop-test-3/pom.xml deleted file mode 100644 index 7176f51..0000000 --- a/hadooplibs/hadoop-test-3/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <version>3.0.0-SNAPSHOT.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop ${project.version} Test</description> - <name>Apache Oozie Hadoop ${project.version} Test</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>3.0.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/empty.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-utils-0.23/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-utils-0.23/pom.xml b/hadooplibs/hadoop-utils-0.23/pom.xml index 91985fc..1bd243e 100644 --- a/hadooplibs/hadoop-utils-0.23/pom.xml +++ b/hadooplibs/hadoop-utils-0.23/pom.xml @@ -27,16 +27,15 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> - <version>0.23.5.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop Utils ${project.version}</description> - <name>Apache Oozie Hadoop Utils ${project.version}</name> + <version>hadoop-0.23-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop Utils</description> + <name>Apache Oozie Hadoop Utils</name> <packaging>jar</packaging> <dependencies> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>${project.version}</version> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-utils-1/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-utils-1/pom.xml b/hadooplibs/hadoop-utils-1/pom.xml index c81ea91..48d97b0 100644 --- a/hadooplibs/hadoop-utils-1/pom.xml +++ b/hadooplibs/hadoop-utils-1/pom.xml @@ -27,17 +27,15 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> - <version>1.2.1.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hadoop Utils ${project.version}</description> - <name>Apache Oozie Hadoop Utils ${project.version}</name> + <version>hadoop-1-4.2.0-SNAPSHOT</version> + <description>Apache Oozie Hadoop Utils</description> + <name>Apache Oozie Hadoop Utils</name> <packaging>jar</packaging> <dependencies> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>${project.version}</version> - <scope>provided</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-utils-2/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-utils-2/pom.xml b/hadooplibs/hadoop-utils-2/pom.xml index 2d3dbdd..832cf5b 100644 --- a/hadooplibs/hadoop-utils-2/pom.xml +++ b/hadooplibs/hadoop-utils-2/pom.xml @@ -27,16 +27,15 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> - <version>2.3.0.oozie-4.2.0-SNAPSHOT</version> + <version>hadoop-2-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Utils ${project.version}</description> <name>Apache Oozie Hadoop Utils ${project.version}</name> <packaging>jar</packaging> <dependencies> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>${project.version}</version> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/hadoop-utils-3/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/hadoop-utils-3/pom.xml b/hadooplibs/hadoop-utils-3/pom.xml index 7270bfd..e7df53b 100644 --- a/hadooplibs/hadoop-utils-3/pom.xml +++ b/hadooplibs/hadoop-utils-3/pom.xml @@ -27,16 +27,15 @@ </parent> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> - <version>3.0.0-SNAPSHOT.oozie-4.2.0-SNAPSHOT</version> + <version>hadoop-3-4.2.0-SNAPSHOT</version> <description>Apache Oozie Hadoop Utils ${project.version}</description> <name>Apache Oozie Hadoop Utils ${project.version}</name> <packaging>jar</packaging> <dependencies> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <version>${project.version}</version> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hadooplibs/pom.xml ---------------------------------------------------------------------- diff --git a/hadooplibs/pom.xml b/hadooplibs/pom.xml index e5ea2e7..a41b734 100644 --- a/hadooplibs/pom.xml +++ b/hadooplibs/pom.xml @@ -31,24 +31,6 @@ <name>Apache Oozie Hadoop Libs</name> <packaging>pom</packaging> - <modules> - <module>hadoop-1</module> - <module>hadoop-distcp-1</module> - <module>hadoop-test-1</module> - <module>hadoop-utils-1</module> - <module>hadoop-auth-1</module> - <module>hadoop-2</module> - <module>hadoop-test-2</module> - <module>hadoop-distcp-2</module> - <module>hadoop-utils-2</module> - <module>hadoop-auth-2</module> - <module>hadoop-0.23</module> - <module>hadoop-test-0.23</module> - <module>hadoop-distcp-0.23</module> - <module>hadoop-utils-0.23</module> - <module>hadoop-auth-0.23</module> - </modules> - <build> <plugins> <plugin> @@ -58,29 +40,51 @@ <skip>true</skip> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../src/main/assemblies/hadooplibs.xml</descriptor> - </descriptors> - <finalName>oozie-${project.version}</finalName> - </configuration> - </plugin> </plugins> </build> <profiles> <profile> + <id>hadoop-1</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>hadoop-utils-1</module> + <module>hadoop-distcp-1</module> + <module>hadoop-auth-1</module> + </modules> + </profile> + <profile> + <id>hadoop-0.23</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>hadoop-utils-0.23</module> + <module>hadoop-distcp-0.23</module> + <module>hadoop-auth-0.23</module> + </modules> + </profile> + <profile> + <id>hadoop-2</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>hadoop-utils-2</module> + <module>hadoop-distcp-2</module> + <module>hadoop-auth-2</module> + </modules> + </profile> + <profile> <id>hadoop-3</id> <activation> <activeByDefault>false</activeByDefault> </activation> <modules> - <module>hadoop-3</module> - <module>hadoop-test-3</module> <module>hadoop-distcp-3</module> + <module>hadoop-auth-3</module> <module>hadoop-utils-3</module> </modules> </profile> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hbaselibs/hbase-0.94/pom.xml ---------------------------------------------------------------------- diff --git a/hbaselibs/hbase-0.94/pom.xml b/hbaselibs/hbase-0.94/pom.xml deleted file mode 100644 index a65904e..0000000 --- a/hbaselibs/hbase-0.94/pom.xml +++ /dev/null @@ -1,275 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hbase</artifactId> - <version>0.94.2.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hbase ${project.version}</description> - <name>Apache Oozie Hbase ${project.version}</name> - <packaging>jar</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>0.94.2</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </exclusion> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.thrift</groupId> - <artifactId>thrift</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-api-2.1</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jsp-2.1</artifactId> - </exclusion> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </exclusion> - <exclusion> - <groupId>xmlenc</groupId> - <artifactId>xmlenc</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </exclusion> - <exclusion> - <groupId>commons-el</groupId> - <artifactId>commons-el</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.kosmosfs</groupId> - <artifactId>kfs</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - <exclusion> - <groupId>com.github.stephenc.high-scale-lib</groupId> - <artifactId>high-scale-lib</artifactId> - </exclusion> - <exclusion> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </exclusion> - <exclusion> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - <exclusion> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>org.jamon</groupId> - <artifactId>jamon-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro-ipc</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/hbaselib.xml</descriptor> - </descriptors> - <finalName>hbaselibs</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hbaselibs/pom.xml ---------------------------------------------------------------------- diff --git a/hbaselibs/pom.xml b/hbaselibs/pom.xml deleted file mode 100644 index 24051c5..0000000 --- a/hbaselibs/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hbaselibs</artifactId> - <version>4.2.0-SNAPSHOT</version> - <description>Apache Oozie Hbase Libs</description> - <name>Apache Oozie Hbase Libs</name> - <packaging>pom</packaging> - - <modules> - <module>hbase-0.94</module> - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../src/main/assemblies/hbaselibs.xml</descriptor> - </descriptors> - <finalName>oozie-${project.version}</finalName> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hcataloglibs/hive-hcatalog-0.13.1/pom.xml ---------------------------------------------------------------------- diff --git a/hcataloglibs/hive-hcatalog-0.13.1/pom.xml b/hcataloglibs/hive-hcatalog-0.13.1/pom.xml deleted file mode 100644 index b738741..0000000 --- a/hcataloglibs/hive-hcatalog-0.13.1/pom.xml +++ /dev/null @@ -1,215 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <version>0.13.1.oozie-4.2.0-SNAPSHOT</version> - <description>Apache Oozie HCatalog ${project.version}</description> - <name>Apache Oozie HCatalog ${project.version}</name> - <packaging>jar</packaging> - - <!-- src/main/assemblies/hcataloglib.xml is configured with useTransitiveDependencies as false - as the required jars are very less and too many dependencies to exclude --> - <dependencies> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-server-extensions</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>kahadb</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activeio-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq.protobuf</groupId> - <artifactId>activemq-protobuf</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-core</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-service</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-cli</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-builtins</artifactId> - </exclusion> - <exclusion> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-webhcat-java-client</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-common</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-exec</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-serde</artifactId> - <version>0.13.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libfb303</artifactId> - <version>0.7.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.8.8</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.8.8</version> - <scope>compile</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../../src/main/assemblies/hcataloglib.xml</descriptor> - </descriptors> - <finalName>hcataloglibs</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </plugin> - </plugins> - </build> - -</project> - http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/hcataloglibs/pom.xml ---------------------------------------------------------------------- diff --git a/hcataloglibs/pom.xml b/hcataloglibs/pom.xml deleted file mode 100644 index a96806b..0000000 --- a/hcataloglibs/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-main</artifactId> - <version>4.2.0-SNAPSHOT</version> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcataloglibs</artifactId> - <version>4.2.0-SNAPSHOT</version> - <description>Apache Oozie HCatalog Libs</description> - <name>Apache Oozie HCatalog Libs</name> - <packaging>pom</packaging> - - <modules> - <module>hive-hcatalog-0.13.1</module> - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>../src/main/assemblies/hcataloglibs.xml</descriptor> - </descriptors> - <finalName>oozie-${project.version}</finalName> - </configuration> - </plugin> - </plugins> - </build> - -</project> -
