http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/minitest/pom.xml ---------------------------------------------------------------------- diff --git a/minitest/pom.xml b/minitest/pom.xml index 8f656d2..895a9a8 100644 --- a/minitest/pom.xml +++ b/minitest/pom.xml @@ -46,16 +46,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> <version>1.5.2</version> @@ -78,6 +68,13 @@ <version>0.11</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + </dependency> </dependencies> - </project>
http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9fa81e2..6af7f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,12 +76,10 @@ <oozie.test.config.file>${oozie.test.default.config.file}</oozie.test.config.file> <hadoop.version>1.2.1</hadoop.version> + <hadoop.majorversion>1</hadoop.majorversion> + <hadooplib.version>hadoop-${hadoop.majorversion}-${project.version}</hadooplib.version> + <oozie.hadoop-utils.version>hadoop-${hadoop.majorversion}-${project.version}</oozie.hadoop-utils.version> <hbase.version>0.94.2</hbase.version> - <hcatalog.version>0.13.1</hcatalog.version> - - <hadooplib.version>${hadoop.version}.oozie-${project.version}</hadooplib.version> - <hbaselib.version>${hbase.version}.oozie-${project.version}</hbaselib.version> - <hcataloglib.version>${hcatalog.version}.oozie-${project.version}</hcataloglib.version> <clover.license>/home/jenkins/tools/clover/latest/lib/clover.license</clover.license> @@ -94,7 +92,8 @@ <spark.guava.version>14.0.1</spark.guava.version> <sqoop.classifier>hadoop100</sqoop.classifier> <streaming.version>${hadoop.version}</streaming.version> - <distcp.version>${hadooplib.version}</distcp.version> + <distcp.version>${hadoop.version}</distcp.version> + <hadoop.auth.version>${hadoop.version}</hadoop.auth.version> <!-- Tomcat version --> <tomcat.version>6.0.41</tomcat.version> @@ -102,18 +101,17 @@ <openjpa.version>2.2.2</openjpa.version> <xerces.version>2.10.0</xerces.version> <curator.version>2.5.0</curator.version> + <oozie.dependencies.scope>provided</oozie.dependencies.scope> </properties> <modules> - <module>client</module> <module>hadooplibs</module> - <module>hbaselibs</module> - <module>hcataloglibs</module> + <module>client</module> <module>core</module> + <module>sharelib</module> <module>webapp</module> <module>examples</module> <module>docs</module> - <module>sharelib</module> <module>tools</module> <module>minitest</module> <module>distro</module> @@ -271,12 +269,6 @@ <!-- client --> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-auth</artifactId> - <version>${hadooplib.version}</version> - </dependency> - - <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> <version>1.1</version> @@ -292,6 +284,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.10</version> + <scope>test</scope> </dependency> <dependency> @@ -320,27 +313,446 @@ <!-- core --> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <version>${hcataloglib.version}</version> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hbase</artifactId> - <version>${hbaselib.version}</version> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <artifactId>oozie-hadoop-auth</artifactId> <version>${hadooplib.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop.auth.version}</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> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop.auth.version}</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> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-distcp</artifactId> + <version>${distcp.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>hadoop-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-tools</artifactId> + <version>${distcp.version}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>hadoop-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> + <artifactId>oozie-hadoop-distcp</artifactId> <version>${hadooplib.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-webhcat-java-client</artifactId> + <version>${hive.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-cli</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-server-extensions</artifactId> + <version>${hive.version}</version> + <scope>provided</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.hbase</groupId> + <artifactId>hbase</artifactId> + <version>${hbase.version}</version> + <scope>provided</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> <dependency> @@ -398,12 +810,6 @@ </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-distcp</artifactId> - <version>${distcp.version}</version> - </dependency> - - <dependency> <groupId>org.apache.pig</groupId> <artifactId>pig</artifactId> <version>${pig.version}</version> @@ -465,6 +871,10 @@ <groupId>oro</groupId> <artifactId>oro</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>avro</artifactId> + </exclusion> </exclusions> </dependency> @@ -497,6 +907,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> @@ -508,30 +919,213 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + </exclusion> + <exclusion> + <artifactId>avro-ipc</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>avro-mapred</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>avro</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>bonecp</artifactId> + <groupId>com.jolbox</groupId> + </exclusion> + <exclusion> + <artifactId>commons-cli</artifactId> + <groupId>commons-cli</groupId> + </exclusion> + <exclusion> + <artifactId>commons-codec</artifactId> + <groupId>commons-codec</groupId> + </exclusion> + <exclusion> + <artifactId>commons-compress</artifactId> + <groupId>org.apache.commons</groupId> + </exclusion> + <exclusion> + <artifactId>commons-dbcp</artifactId> + <groupId>commons-dbcp</groupId> + </exclusion> + <exclusion> + <artifactId>commons-io</artifactId> + <groupId>commons-io</groupId> + </exclusion> + <exclusion> + <artifactId>commons-lang</artifactId> + <groupId>commons-lang</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging-api</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-pool</artifactId> + <groupId>commons-pool</groupId> + </exclusion> + <exclusion> + <artifactId>derby</artifactId> + <groupId>org.apache.derby</groupId> + </exclusion> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + <exclusion> + <artifactId>hive-builtins</artifactId> + <groupId>org.apache.hive</groupId> + </exclusion> + <exclusion> + <artifactId>hive-common</artifactId> + <groupId>org.apache.hive</groupId> + </exclusion> + <exclusion> + <artifactId>hive-serde</artifactId> + <groupId>org.apache.hive</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-core-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + <exclusion> + <artifactId>jetty</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>zookeeper</artifactId> + <groupId>org.apache.zookeeper</groupId> + </exclusion> + </exclusions> </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-serde</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-service</artifactId> - <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>JavaEWAH</artifactId> + <groupId>com.googlecode.javaewah</groupId> + </exclusion> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>avro-ipc</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>avro-mapred</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>avro</artifactId> + <groupId>org.apache.avro</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils-core</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>commons-compress</artifactId> + <groupId>org.apache.commons</groupId> + </exclusion> + <exclusion> + <artifactId>commons-configuration</artifactId> + <groupId>commons-configuration</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging-api</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>groovy-all</artifactId> + <groupId>org.codehaus.groovy</groupId> + </exclusion> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + <exclusion> + <artifactId>haivvreo</artifactId> + <groupId>com.linkedin</groupId> + </exclusion> + <exclusion> + <artifactId>hive-ant</artifactId> + <groupId>org.apache.hive</groupId> + </exclusion> + <exclusion> + <artifactId>hive-common</artifactId> + <groupId>org.apache.hive</groupId> + </exclusion> + <exclusion> + <artifactId>hive-contrib</artifactId> + <groupId>org.apache.hive</groupId> + </exclusion> + <exclusion> + <artifactId>jetty-util</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>jetty</artifactId> + <groupId>org.mortbay.jetty</groupId> + </exclusion> + <exclusion> + <artifactId>parquet-hadoop-bundle</artifactId> + <groupId>com.twitter</groupId> + </exclusion> + <exclusion> + <artifactId>sqlline</artifactId> + <groupId>sqlline</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>stax</groupId> + </exclusion> + <exclusion> + <artifactId>zookeeper</artifactId> + <groupId>org.apache.zookeeper</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -612,9 +1206,9 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>apache-log4j-extras</artifactId> - <version>1.1</version> + <groupId>log4j</groupId> + <artifactId>apache-log4j-extras</artifactId> + <version>1.1</version> </dependency> <dependency> @@ -841,7 +1435,7 @@ <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> - <version>${hadooplib.version}</version> + <version>${oozie.hadoop-utils.version}</version> </dependency> <dependency> @@ -1107,6 +1701,8 @@ <exclude>**/build/**</exclude> <exclude>.git/**</exclude> <exclude>test-patch/**</exclude> + <exclude>**/.idea/**</exclude> + <exclude>*.patch</exclude> </excludes> </configuration> </plugin> @@ -1154,14 +1750,27 @@ </build> </profile> <profile> - <id>hadoop-23</id> + <id>hadoop-1</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <hadoop.version>1.2.1</hadoop.version> + <hadoop.majorversion>1</hadoop.majorversion> + <pig.classifier></pig.classifier> + <sqoop.classifier>hadoop100</sqoop.classifier> + </properties> + </profile> + <profile> + <id>hadoop-0.23</id> <activation> <activeByDefault>false</activeByDefault> </activation> <properties> - <hadoop.version>0.23.5</hadoop.version> - <pig.classifier>h2</pig.classifier> - <sqoop.classifier>hadoop23</sqoop.classifier> + <hadoop.version>0.23.5</hadoop.version> + <hadoop.majorversion>0.23</hadoop.majorversion> + <pig.classifier>h2</pig.classifier> + <sqoop.classifier>hadoop23</sqoop.classifier> </properties> </profile> <profile> @@ -1170,9 +1779,10 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <hadoop.version>2.3.0</hadoop.version> - <pig.classifier>h2</pig.classifier> - <sqoop.classifier>hadoop200</sqoop.classifier> + <hadoop.version>2.3.0</hadoop.version> + <hadoop.majorversion>2</hadoop.majorversion> + <pig.classifier>h2</pig.classifier> + <sqoop.classifier>hadoop200</sqoop.classifier> </properties> </profile> <profile> @@ -1181,9 +1791,10 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> - <pig.classifier>h2</pig.classifier> - <sqoop.classifier>hadoop200</sqoop.classifier> + <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> + <hadoop.majorversion>3</hadoop.majorversion> + <pig.classifier>h2</pig.classifier> + <sqoop.classifier>hadoop200</sqoop.classifier> </properties> </profile> <profile> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 363c3d6..c551ec9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-1876 use pom properties rather than specific version numbers in the pom files of hbaselibs, hcataloglibs, sharelib, etc (shwethags) OOZIE-2027 Disable re-runs using the workflow directly if it has a parent (jaydeepvishwakarma via shwethags) OOZIE-2098 Add Apache parent POM to oozie (sureshms via bzhang) OOZIE-2093 TestSubmitXCommand.testProtoConfStorage fails against Hadoop 2 (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/distcp/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/distcp/pom.xml b/sharelib/distcp/pom.xml index b788ed0..a329b7b 100644 --- a/sharelib/distcp/pom.xml +++ b/sharelib/distcp/pom.xml @@ -43,26 +43,24 @@ <artifactId>oozie-hadoop-distcp</artifactId> <scope>compile</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-oozie</artifactId> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hcatalog/pom.xml b/sharelib/hcatalog/pom.xml index b934be1..fb6bc34 100644 --- a/sharelib/hcatalog/pom.xml +++ b/sharelib/hcatalog/pom.xml @@ -39,15 +39,11 @@ <dependencies> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-webhcat-java-client</artifactId> <scope>compile</scope> <exclusions> <exclusion> - <groupId>org.apache.hcatalog</groupId> - <artifactId>hcatalog-server-extensions</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.hive</groupId> <artifactId>hive-builtins</artifactId> </exclusion> @@ -205,16 +201,18 @@ </exclusion> </exclusions> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-oozie</artifactId> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml index ea088ff..1a0c10c 100644 --- a/sharelib/hive/pom.xml +++ b/sharelib/hive/pom.xml @@ -89,6 +89,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> @@ -100,6 +101,7 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> @@ -116,27 +118,24 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/hive2/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive2/pom.xml b/sharelib/hive2/pom.xml index e4c2465..5e9dc72 100644 --- a/sharelib/hive2/pom.xml +++ b/sharelib/hive2/pom.xml @@ -42,278 +42,14 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>commons-cli</artifactId> - <groupId>commons-cli</groupId> - </exclusion> - <exclusion> - <artifactId>commons-codec</artifactId> - <groupId>commons-codec</groupId> - </exclusion> - <exclusion> - <artifactId>commons-io</artifactId> - <groupId>commons-io</groupId> - </exclusion> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging-api</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>hive-builtins</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-core-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-mapper-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - <exclusion> - <artifactId>commons-compress</artifactId> - <groupId>org.apache.commons</groupId> - </exclusion> - <exclusion> - <artifactId>hive-common</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - </exclusions> </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>sqlline</artifactId> - <groupId>sqlline</groupId> - </exclusion> - <exclusion> - <artifactId>groovy-all</artifactId> - <groupId>org.codehaus.groovy</groupId> - </exclusion> - <exclusion> - <artifactId>ant</artifactId> - <groupId>org.apache.ant</groupId> - </exclusion> - <exclusion> - <artifactId>avro</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>avro-ipc</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>avro-mapred</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>commons-compress</artifactId> - <groupId>org.apache.commons</groupId> - </exclusion> - <exclusion> - <artifactId>hive-ant</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>parquet-hadoop-bundle</artifactId> - <groupId>com.twitter</groupId> - </exclusion> - <exclusion> - <artifactId>stax-api</artifactId> - <groupId>stax</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - <exclusion> - <artifactId>hive-common</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>asm</artifactId> - <groupId>asm</groupId> - </exclusion> - <exclusion> - <artifactId>avro</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>avro-ipc</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>avro-mapred</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>commons-cli</artifactId> - <groupId>commons-cli</groupId> - </exclusion> - <exclusion> - <artifactId>commons-codec</artifactId> - <groupId>commons-codec</groupId> - </exclusion> - <exclusion> - <artifactId>commons-compress</artifactId> - <groupId>org.apache.commons</groupId> - </exclusion> - <exclusion> - <artifactId>commons-dbcp</artifactId> - <groupId>commons-dbcp</groupId> - </exclusion> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging-api</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>commons-pool</artifactId> - <groupId>commons-pool</groupId> - </exclusion> - <exclusion> - <artifactId>derby</artifactId> - <groupId>org.apache.derby</groupId> - </exclusion> - <exclusion> - <artifactId>hive-common</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>hive-serde</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-api</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>jetty</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - <exclusion> - <artifactId>bonecp</artifactId> - <groupId>com.jolbox</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-service</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>JavaEWAH</artifactId> - <groupId>com.googlecode.javaewah</groupId> - </exclusion> - <exclusion> - <artifactId>avro</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>avro-mapred</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>commons-beanutils</artifactId> - <groupId>commons-beanutils</groupId> - </exclusion> - <exclusion> - <artifactId>commons-beanutils-core</artifactId> - <groupId>commons-beanutils</groupId> - </exclusion> - <exclusion> - <artifactId>commons-codec</artifactId> - <groupId>commons-codec</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>commons-configuration</artifactId> - <groupId>commons-configuration</groupId> - </exclusion> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging-api</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>haivvreo</artifactId> - <groupId>com.linkedin</groupId> - </exclusion> - <exclusion> - <artifactId>hive-contrib</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>hive-exec</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>jetty</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jetty-util</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - </exclusions> </dependency> + <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-core</artifactId> @@ -361,58 +97,22 @@ </exclusion> </exclusions> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>avro</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>commons-compress</artifactId> - <groupId>org.apache.commons</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-core-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-mapper-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jetty-util</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jsr305</artifactId> - <groupId>com.google.code.findbugs</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - </exclusions> </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-test</artifactId> + <artifactId>oozie-core</artifactId> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> @@ -421,11 +121,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -489,13 +184,6 @@ </execution> </executions> </plugin> - <!--<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> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/oozie/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/oozie/pom.xml b/sharelib/oozie/pom.xml index 053cf1c..087b6de 100644 --- a/sharelib/oozie/pom.xml +++ b/sharelib/oozie/pom.xml @@ -43,21 +43,24 @@ <artifactId>json-simple</artifactId> <scope>compile</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-hadoop-utils</artifactId> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/pig/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/pig/pom.xml b/sharelib/pig/pom.xml index ce75c68..fd3cd66 100644 --- a/sharelib/pig/pom.xml +++ b/sharelib/pig/pom.xml @@ -43,13 +43,8 @@ <artifactId>pig</artifactId> <classifier>${pig.classifier}</classifier> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>avro</artifactId> - </exclusion> - </exclusions> </dependency> + <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> @@ -78,22 +73,25 @@ <artifactId>oozie-core</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-core</artifactId> <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -101,11 +99,6 @@ </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-oozie</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/spark/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml index 744c95c..7df4b57 100644 --- a/sharelib/spark/pom.xml +++ b/sharelib/spark/pom.xml @@ -38,7 +38,6 @@ </properties> <dependencies> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -77,6 +76,13 @@ </dependency> <dependency> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-core</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-examples_2.10</artifactId> <version>${spark.version}</version> @@ -135,117 +141,17 @@ <groupId>org.apache.oozie</groupId> <artifactId>oozie-core</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-core-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-mapper-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jetty</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jetty-util</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api-2.5</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - <exclusion> - <artifactId>hive-common</artifactId> - <groupId>org.apache.hive</groupId> - </exclusion> - <exclusion> - <artifactId>derby</artifactId> - <groupId>org.apache.derby</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>avro</artifactId> - <groupId>org.apache.avro</groupId> - </exclusion> - <exclusion> - <artifactId>commons-compress</artifactId> - <groupId>org.apache.commons</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-core-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-mapper-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - <exclusion> - <artifactId>jetty-util</artifactId> - <groupId>org.mortbay.jetty</groupId> - </exclusion> - <exclusion> - <artifactId>jsr305</artifactId> - <groupId>com.google.code.findbugs</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>zookeeper</artifactId> - <groupId>org.apache.zookeeper</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-core</artifactId> - <classifier>tests</classifier> - <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-utils</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>provided</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/sqoop/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/sqoop/pom.xml b/sharelib/sqoop/pom.xml index 09f0b66..5308bd5 100644 --- a/sharelib/sqoop/pom.xml +++ b/sharelib/sqoop/pom.xml @@ -187,16 +187,18 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -204,11 +206,6 @@ </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-hive</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/sharelib/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/streaming/pom.xml b/sharelib/streaming/pom.xml index 50d15f7..4b47fd9 100644 --- a/sharelib/streaming/pom.xml +++ b/sharelib/streaming/pom.xml @@ -60,16 +60,18 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hadoop-test</artifactId> - <scope>test</scope> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -77,11 +79,6 @@ </dependency> <dependency> <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-oozie</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/distro.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distro.xml b/src/main/assemblies/distro.xml index 8e2bbae..bdb5351 100644 --- a/src/main/assemblies/distro.xml +++ b/src/main/assemblies/distro.xml @@ -60,13 +60,6 @@ </includes> <fileMode>0755</fileMode> </fileSet> - <fileSet> - <directory>${basedir}/../client/target/oozie-client-${project.version}-client/oozie-client-${project.version}/lib</directory> - <outputDirectory>/lib</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> <!-- Tools --> <fileSet> <directory>${basedir}/../tools/target/oozie-tools-${project.version}-tools/oozie-tools-${project.version}/bin</directory> @@ -124,6 +117,7 @@ <file> <source>${basedir}/../core/src/main/resources/oozie-default.xml</source> <outputDirectory>/conf</outputDirectory> + <destName>oozie-default.xml.reference</destName> </file> <!-- Oozie core jar --> <file> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/hadooplib.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hadooplib.xml b/src/main/assemblies/hadooplib.xml deleted file mode 100644 index b32ca82..0000000 --- a/src/main/assemblies/hadooplib.xml +++ /dev/null @@ -1,35 +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. ---> -<assembly> - <id>hadooplib</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <useTransitiveDependencies>true</useTransitiveDependencies> - <useTransitiveFiltering>true</useTransitiveFiltering> - <unpack>false</unpack> - <outputDirectory>hadooplib-${project.version}</outputDirectory> - </dependencySet> - </dependencySets> - -</assembly> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/hadooplibs.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hadooplibs.xml b/src/main/assemblies/hadooplibs.xml deleted file mode 100644 index 9884efa..0000000 --- a/src/main/assemblies/hadooplibs.xml +++ /dev/null @@ -1,37 +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. ---> -<assembly> - <id>hadooplibs</id> - <formats> - <format>dir</format> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>oozie-${project.version}</baseDirectory> - <fileSets> - <!-- Hadoop libs --> - <fileSet> - <directory>${basedir}/../hadooplibs/hadoop-1/target/hadooplibs</directory> - <outputDirectory>/hadooplibs</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../hadooplibs/hadoop-2/target/hadooplibs</directory> - <outputDirectory>/hadooplibs</outputDirectory> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/hbaselib.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hbaselib.xml b/src/main/assemblies/hbaselib.xml deleted file mode 100644 index 6e4db33..0000000 --- a/src/main/assemblies/hbaselib.xml +++ /dev/null @@ -1,35 +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. ---> -<assembly> - <id>hbaselib</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <useTransitiveDependencies>true</useTransitiveDependencies> - <useTransitiveFiltering>true</useTransitiveFiltering> - <unpack>false</unpack> - <outputDirectory>hbaselib-${project.version}</outputDirectory> - </dependencySet> - </dependencySets> - -</assembly> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/hbaselibs.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hbaselibs.xml b/src/main/assemblies/hbaselibs.xml deleted file mode 100644 index eb71624..0000000 --- a/src/main/assemblies/hbaselibs.xml +++ /dev/null @@ -1,33 +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. ---> -<assembly> - <id>hbaselibs</id> - <formats> - <format>dir</format> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>oozie-${project.version}</baseDirectory> - <fileSets> - <!-- Hbase libs --> - <fileSet> - <directory>${basedir}/../hbaselibs/hbase-0.94/target/hbaselibs</directory> - <outputDirectory>/hbaselibs</outputDirectory> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/hcataloglib.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hcataloglib.xml b/src/main/assemblies/hcataloglib.xml deleted file mode 100644 index 1002308..0000000 --- a/src/main/assemblies/hcataloglib.xml +++ /dev/null @@ -1,35 +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. ---> -<assembly> - <id>hcataloglib</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <useTransitiveDependencies>false</useTransitiveDependencies> - <useTransitiveFiltering>true</useTransitiveFiltering> - <unpack>false</unpack> - <outputDirectory>hcataloglib-${project.version}</outputDirectory> - </dependencySet> - </dependencySets> - -</assembly> http://git-wip-us.apache.org/repos/asf/oozie/blob/d8aca11d/src/main/assemblies/hcataloglibs.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hcataloglibs.xml b/src/main/assemblies/hcataloglibs.xml deleted file mode 100644 index 3d32a8f..0000000 --- a/src/main/assemblies/hcataloglibs.xml +++ /dev/null @@ -1,33 +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. ---> -<assembly> - <id>hcataloglibs</id> - <formats> - <format>dir</format> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>oozie-${project.version}</baseDirectory> - <fileSets> - <!-- HCatalog libs --> - <fileSet> - <directory>${basedir}/../hcataloglibs/hive-hcatalog-0.13.1/target/hcataloglibs</directory> - <outputDirectory>/hcataloglibs</outputDirectory> - </fileSet> - </fileSets> -</assembly>
