Repository: gora Updated Branches: refs/heads/master 578f5f886 -> 97d584510
GORA-417 Deploy Hadoop-1 compatible binaries for Apache Gora Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/983bed4f Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/983bed4f Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/983bed4f Branch: refs/heads/master Commit: 983bed4f395e876c75d8419eddac9806f45a24da Parents: cfd1c52 Author: Lewis John McGibbney <lewis.j.mcgibb...@jpl.nasa.gov> Authored: Sat Aug 29 15:44:16 2015 -0700 Committer: Lewis John McGibbney <lewis.j.mcgibb...@jpl.nasa.gov> Committed: Sat Aug 29 15:44:16 2015 -0700 ---------------------------------------------------------------------- pom.xml | 185 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 91 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/983bed4f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 01a7fee..84cb096 100644 --- a/pom.xml +++ b/pom.xml @@ -367,7 +367,7 @@ <mavenExecutorId>forked-path</mavenExecutorId> <useReleaseProfile>false</useReleaseProfile> <tagNameFormat>apache-gora-@{project.version}</tagNameFormat> - <arguments>-Papache-release,release</arguments> + <arguments>-Papache-release,release,hadoop2</arguments> <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> <dependencies> @@ -593,6 +593,54 @@ </plugins> </build> </profile> + <profile> + <id>hadoop1</id> + <properties> + <hadoop.classifier>hadoop1</hadoop.classifier> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-1.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + </profile> + <profile> + <id>hadoop2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <hadoop.classifier>hadoop2</hadoop.classifier> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop-2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-2.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-common</artifactId> + <version>${hadoop-2.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + </profile> </profiles> <modules> @@ -799,61 +847,10 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>${hadoop-2.version}</version> + <artifactId>hadoop-client</artifactId> + <version>${hadoop-2.version}</version> </dependency> - <!-- Hadoop Dependencies --> -<!-- <dependency> --> -<!-- <groupId>org.apache.hadoop</groupId> --> -<!-- <artifactId>hadoop-core</artifactId> --> -<!-- <version>${hadoop-1.version}</version> --> -<!-- <exclusions> --> -<!-- jackson is conflicting with the Avro dep --> -<!-- <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>hsqldb</groupId> --> -<!-- <artifactId>hsqldb</artifactId> --> -<!-- </exclusion> --> -<!-- <exclusion> --> -<!-- <groupId>net.sf.kosmos</groupId> --> -<!-- <artifactId>kfs</artifactId> --> -<!-- </exclusion> --> -<!-- <exclusion> --> -<!-- <groupId>net.java.dev.jets3t</groupId> --> -<!-- <artifactId>jets3t</artifactId> --> -<!-- </exclusion> --> -<!-- <exclusion> --> -<!-- <groupId>org.eclipse.jdt</groupId> --> -<!-- <artifactId>core</artifactId> --> -<!-- </exclusion> --> -<!-- </exclusions> --> -<!-- </dependency> --> -<!-- <dependency> --> -<!-- <groupId>org.apache.hadoop</groupId> --> -<!-- <artifactId>hadoop-common</artifactId> --> -<!-- <version>${hadoop-2.version}</version> --> -<!-- <classifier>tests</classifier> --> -<!-- </dependency> --> -<!-- <dependency> --> -<!-- <groupId>org.apache.hadoop</groupId> --> -<!-- <artifactId>hadoop-mapreduce-client-jobclient</artifactId> --> -<!-- <version>${hadoop-2.version}</version> --> -<!-- <classifier>tests</classifier> --> -<!-- </dependency> --> -<!-- <dependency> --> -<!-- <groupId>org.apache.hadoop</groupId> --> -<!-- <artifactId>hadoop-mapreduce-client-core</artifactId> --> -<!-- <version>${hadoop-2.version}</version> --> -<!-- </dependency> --> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> @@ -905,26 +902,26 @@ <groupId>org.apache.hadoop</groupId> <artifactId>avro</artifactId> </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-common</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-yarn-common</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-auth</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-yarn-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-auth</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -937,26 +934,26 @@ <groupId>org.apache.hadoop</groupId> <artifactId>avro</artifactId> </exclusion> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-common</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-yarn-common</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-auth</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-yarn-common</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-auth</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> </exclusions> </dependency>
