Repository: oozie Updated Branches: refs/heads/master 7c15406f0 -> 619952f3f
OOZIE-1586 upgrade oozie to hive 13.1 (including hcatalog) (raviprak via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/619952f3 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/619952f3 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/619952f3 Branch: refs/heads/master Commit: 619952f3fad4dc7f7ded28c7ef0257b676530bb3 Parents: 7c15406 Author: Robert Kanter <[email protected]> Authored: Wed Jul 16 13:33:18 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Wed Jul 16 13:46:04 2014 -0700 ---------------------------------------------------------------------- core/pom.xml | 2 +- hcataloglibs/hcatalog-0.5/pom.xml | 215 ------------------------- hcataloglibs/hcatalog-0.6/pom.xml | 215 ------------------------- hcataloglibs/hive-hcatalog-0.13.1/pom.xml | 215 +++++++++++++++++++++++++ hcataloglibs/pom.xml | 3 +- pom.xml | 10 +- release-log.txt | 1 + sharelib/hive/pom.xml | 6 - src/main/assemblies/hcataloglibs.xml | 2 +- webapp/pom.xml | 12 ++ 10 files changed, 233 insertions(+), 448 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index e152266..c72b50e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -244,7 +244,7 @@ <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>3.0.1</version> + <version>3.4</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/hcataloglibs/hcatalog-0.5/pom.xml ---------------------------------------------------------------------- diff --git a/hcataloglibs/hcatalog-0.5/pom.xml b/hcataloglibs/hcatalog-0.5/pom.xml deleted file mode 100644 index 457874d..0000000 --- a/hcataloglibs/hcatalog-0.5/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.1.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <version>0.5.0.oozie-4.1.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.hcatalog</groupId> - <artifactId>hcatalog-server-extensions</artifactId> - <version>0.5.0-incubating</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.hcatalog</groupId> - <artifactId>hcatalog-core</artifactId> - <version>0.5.0-incubating</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.hcatalog</groupId> - <artifactId>webhcat-java-client</artifactId> - <version>0.5.0-incubating</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-common</artifactId> - <version>${hive.version}</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>${hive.version}</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>${hive.version}</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>${hive.version}</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/619952f3/hcataloglibs/hcatalog-0.6/pom.xml ---------------------------------------------------------------------- diff --git a/hcataloglibs/hcatalog-0.6/pom.xml b/hcataloglibs/hcatalog-0.6/pom.xml deleted file mode 100644 index 98ae13e..0000000 --- a/hcataloglibs/hcatalog-0.6/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.1.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <groupId>org.apache.oozie</groupId> - <artifactId>oozie-hcatalog</artifactId> - <version>0.6.0.oozie-4.1.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.hcatalog</groupId> - <artifactId>hcatalog-server-extensions</artifactId> - <version>0.6.0-SNAPSHOT</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.hcatalog</groupId> - <artifactId>hcatalog-core</artifactId> - <version>0.6.0-SNAPSHOT</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.hcatalog</groupId> - <artifactId>webhcat-java-client</artifactId> - <version>0.6.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-common</artifactId> - <version>${hive.version}</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>${hive.version}</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>${hive.version}</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>${hive.version}</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/619952f3/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 new file mode 100644 index 0000000..bfcf468 --- /dev/null +++ b/hcataloglibs/hive-hcatalog-0.13.1/pom.xml @@ -0,0 +1,215 @@ +<?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.1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <groupId>org.apache.oozie</groupId> + <artifactId>oozie-hcatalog</artifactId> + <version>0.13.1.oozie-4.1.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/619952f3/hcataloglibs/pom.xml ---------------------------------------------------------------------- diff --git a/hcataloglibs/pom.xml b/hcataloglibs/pom.xml index cde7bb9..68567ff 100644 --- a/hcataloglibs/pom.xml +++ b/hcataloglibs/pom.xml @@ -32,8 +32,7 @@ <packaging>pom</packaging> <modules> - <module>hcatalog-0.5</module> - <module>hcatalog-0.6</module> + <module>hive-hcatalog-0.13.1</module> </modules> <build> http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bad1e0f..027988e 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ <hadoop.version>1.1.1</hadoop.version> <hbase.version>0.94.2</hbase.version> - <hcatalog.version>0.5.0</hcatalog.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> @@ -85,7 +85,7 @@ <hadoop.auth.version>2.0.2-alpha</hadoop.auth.version> <!-- Sharelib component versions --> - <hive.version>0.10.0</hive.version> + <hive.version>0.13.1</hive.version> <pig.version>0.12.1</pig.version> <pig.classifier></pig.classifier> <sqoop.version>1.4.3</sqoop.version> @@ -505,12 +505,6 @@ <version>1.6.6</version> </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-builtins</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index e94cdb8..912e277 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1586 upgrade oozie to hive 13.1 (including hcatalog) (raviprak via rkanter) OOZIE-1932 Services should load CallableQueueService after MemoryLocksService (mona) OOZIE-1740 Add a new function hadoop:conf() that can be invoked from the workflow.xml and will return a hadoop configuration option (sam liu via rkanter) OOZIE-1911 SLA calculation in HA mode does wrong bit comparison for 'start' and 'duration' (mna) http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/sharelib/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/hive/pom.xml b/sharelib/hive/pom.xml index 5ca5cb8..1d1dab7 100644 --- a/sharelib/hive/pom.xml +++ b/sharelib/hive/pom.xml @@ -101,14 +101,8 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-builtins</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> - <version>3.0.1</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/src/main/assemblies/hcataloglibs.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/hcataloglibs.xml b/src/main/assemblies/hcataloglibs.xml index d00d34b..3d32a8f 100644 --- a/src/main/assemblies/hcataloglibs.xml +++ b/src/main/assemblies/hcataloglibs.xml @@ -26,7 +26,7 @@ <fileSets> <!-- HCatalog libs --> <fileSet> - <directory>${basedir}/../hcataloglibs/hcatalog-0.5/target/hcataloglibs</directory> + <directory>${basedir}/../hcataloglibs/hive-hcatalog-0.13.1/target/hcataloglibs</directory> <outputDirectory>/hcataloglibs</outputDirectory> </fileSet> </fileSets> http://git-wip-us.apache.org/repos/asf/oozie/blob/619952f3/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 93cfcef..949a299 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -129,6 +129,18 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3</version> + </dependency> + + <dependency> <groupId>org.apache.oozie</groupId> <artifactId>oozie-sharelib-distcp</artifactId> <scope>provided</scope>
