Repository: phoenix Updated Branches: refs/heads/master 980783288 -> c72c4a65d
PHOENIX-103 Drop hadoop1.0 specifics from code Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c72c4a65 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c72c4a65 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c72c4a65 Branch: refs/heads/master Commit: c72c4a65dc7b8406301fc6f9909f81195bc134a0 Parents: 9807832 Author: Jesse Yates <jya...@apache.org> Authored: Mon Sep 22 14:15:56 2014 -0700 Committer: Jesse Yates <jya...@apache.org> Committed: Tue Sep 23 14:22:34 2014 -0700 ---------------------------------------------------------------------- bin/hadoop-metrics2-hbase.properties | 20 ++ bin/hadoop-metrics2-phoenix.properties | 53 +++ phoenix-assembly/pom.xml | 4 +- phoenix-assembly/src/build/hadoop-one-all.xml | 53 --- phoenix-assembly/src/build/hadoop-two-all.xml | 64 ---- .../src/build/package-to-tar-all.xml | 38 +++ phoenix-core/pom.xml | 280 +++++----------- phoenix-flume/pom.xml | 276 +++++----------- phoenix-hadoop1-compat/pom.xml | 40 --- .../bin/hadoop-metrics2-hbase.properties | 20 -- .../bin/hadoop-metrics2-phoenix.properties | 53 --- phoenix-pig/pom.xml | 292 +++++----------- pom.xml | 329 ++++++------------- 13 files changed, 475 insertions(+), 1047 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/bin/hadoop-metrics2-hbase.properties ---------------------------------------------------------------------- diff --git a/bin/hadoop-metrics2-hbase.properties b/bin/hadoop-metrics2-hbase.properties new file mode 100644 index 0000000..499ab6b --- /dev/null +++ b/bin/hadoop-metrics2-hbase.properties @@ -0,0 +1,20 @@ +# HBase Server Sink Configuration +################################# +# +# Configuration for the metrics2 system for the HBase RegionServers +# to enable phoenix trace collection on the HBase servers. +# +# See hadoop-metrics2-phoenix.properties for how these configurations +# are utilized. +# +# Either this file can be used in place of the standard +# hadoop-metrics2-hbase.properties file or the below +# properties should be added to the file of the same name on +# the HBase classpath (likely in the HBase conf/ folder) + +# ensure that we receive traces on the server +hbase.sink.tracing.class=org.apache.phoenix.trace.PhoenixMetricsSink +# Tell the sink where to write the metrics +hbase.sink.tracing.writer-class=org.apache.phoenix.trace.PhoenixTableMetricsWriter +# Only handle traces with a context of "tracing" +hbase.sink.tracing.context=tracing http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/bin/hadoop-metrics2-phoenix.properties ---------------------------------------------------------------------- diff --git a/bin/hadoop-metrics2-phoenix.properties b/bin/hadoop-metrics2-phoenix.properties new file mode 100644 index 0000000..4a5794d --- /dev/null +++ b/bin/hadoop-metrics2-phoenix.properties @@ -0,0 +1,53 @@ +# Metrics properties for phoenix +#################################### +# +#There are two options with file names: +# 1. hadoop-metrics2-[prefix].properties +# 2. hadoop-metrics2.properties +# Either will be loaded by the metrics system (but not both). +# +# NOTE: The metrics system is only initialized once per JVM (but does ref-counting, so we can't +#shutdown and restart), so we only load the first prefix that we find. Generally, this will be +#phoenix (unless someone else registers first, but for many clients, there should only be one). +# +# Usually, you would use hadoop-metrics2-phoenix.properties, but we use the generic +# hadoop-metrics2.properties to ensure it these are loaded regardless of where we are running, +# assuming there isn't another config on the classpath. + +# When specifying sinks, the syntax to use is: +# [prefix].[source|sink].[instance].[options] +# The interesting thing to note is that [instance] can literally be anything (as long as its +# not zero-length). It is only there to differentiate the properties that are stored for +# objects of the same type (e.g. differentiating between two phoenix.sink objects). +# +#You could the following lines in your config +# +# phoenix.sink.thingA.class=com.your-company.SpecialSink +# phoenix.sink.thingA.option1=value1 +# +# and also +# +# phoenix.sink.thingB.class=org.apache.phoenix.trace.PhoenixMetricsSink +# phoenix.sink.thingB.doGoodStuff=true +# +# which will create both SpecialSink and PhoenixMetricsSink and register them +# as a MetricsSink, but Special sink will only see option1=value1 in its +# configuration, which similarly, the instantiated PhoenixMetricsSink will +# only see doGoodStuff=true in its configuration +# +# See javadoc of package-info.java for org.apache.hadoop.metrics2 for detail + +# Uncomment to NOT start MBeans +# *.source.start_mbeans=false + +# Sample from all the sources every 10 seconds +*.period=10 + +# Write Traces to Phoenix +########################## +# ensure that we receive traces on the server +phoenix.sink.tracing.class=org.apache.phoenix.trace.PhoenixMetricsSink +# Tell the sink where to write the metrics +phoenix.sink.tracing.writer-class=org.apache.phoenix.trace.PhoenixTableMetricsWriter +# Only handle traces with a context of "tracing" +phoenix.sink.tracing.context=tracing \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 4bac3e8..ea2bdb1 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -72,7 +72,7 @@ <tarLongFileMode>gnu</tarLongFileMode> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>src/build/${assembly.descriptor}</descriptor> + <descriptor>src/build/package-to-tar-all.xml</descriptor> </descriptors> </configuration> </execution> @@ -142,7 +142,7 @@ </dependency> <dependency> <groupId>org.apache.phoenix</groupId> - <artifactId>${compat.module}</artifactId> + <artifactId>phoenix-hadoop2-compat</artifactId> </dependency> <dependency> <groupId>org.apache.phoenix</groupId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-assembly/src/build/hadoop-one-all.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/hadoop-one-all.xml b/phoenix-assembly/src/build/hadoop-one-all.xml deleted file mode 100644 index 9c067e0..0000000 --- a/phoenix-assembly/src/build/hadoop-one-all.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version='1.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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> - <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers --> - <id>all</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - - <componentDescriptors> - <componentDescriptor>src/build/components/all-common-jars.xml</componentDescriptor> - <componentDescriptor>src/build/components/all-common-files.xml</componentDescriptor> - <componentDescriptor>src/build/components/all-common-dependencies.xml</componentDescriptor> - </componentDescriptors> - - <fileSets> - <!-- This is only necessary until maven fixes the intra-project dependency bug - in maven 3.0. Until then, we have to include the jars for sub-projects explicitly. - Otherwise, test jars are pulled in wrongly. - --> - <fileSet> - <directory>${project.basedir}/../phoenix-hadoop1-compat/target/</directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>phoenix-*.jar</include> - </includes> - <fileMode>0644</fileMode> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-assembly/src/build/hadoop-two-all.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/hadoop-two-all.xml b/phoenix-assembly/src/build/hadoop-two-all.xml deleted file mode 100644 index 02bd854..0000000 --- a/phoenix-assembly/src/build/hadoop-two-all.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version='1.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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> - <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers --> - <id>all</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - - <componentDescriptors> - <componentDescriptor>src/build/components/all-common-jars.xml</componentDescriptor> - <componentDescriptor>src/build/components/all-common-files.xml</componentDescriptor> - <componentDescriptor>src/build/components/all-common-dependencies.xml</componentDescriptor> - </componentDescriptors> - - <fileSets> - <!-- Include the bin files the hadoop2 compat bin directory --> - <fileSet> - <!--Get hadoop2 config files --> - <directory>${project.basedir}/../phoenix-hadoop2-compat/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>0655</fileMode> - <directoryMode>0755</directoryMode> - <includes> - <include>*.properties</include> - </includes> - </fileSet> - <!-- This is only necessary until maven fixes the intra-project dependency bug - in maven 3.0. Until then, we have to include the jars for sub-projects explicitly. - Otherwise, test jars are pulled in wrongly. - --> - <fileSet> - <directory>${project.basedir}/../phoenix-hadoop2-compat/target/</directory> - <outputDirectory>lib</outputDirectory> - <includes> - <include>phoenix-*.jar</include> - </includes> - <fileMode>0644</fileMode> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-assembly/src/build/package-to-tar-all.xml ---------------------------------------------------------------------- diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml b/phoenix-assembly/src/build/package-to-tar-all.xml new file mode 100644 index 0000000..93c7b71 --- /dev/null +++ b/phoenix-assembly/src/build/package-to-tar-all.xml @@ -0,0 +1,38 @@ +<?xml version='1.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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> + <!--This 'all' id is not appended to the produced bundle because we do this: http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers --> + <id>all</id> + <formats> + <format>tar.gz</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + + <componentDescriptors> + <componentDescriptor>src/build/components/all-common-jars.xml</componentDescriptor> + <componentDescriptor>src/build/components/all-common-files.xml</componentDescriptor> + <componentDescriptor>src/build/components/all-common-dependencies.xml</componentDescriptor> + </componentDescriptors> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index eb1004b..d9ac9eb 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -197,6 +197,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + </plugin> </plugins> </build> @@ -329,197 +333,89 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-testing-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-it</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-hadoop2-compat</artifactId> + </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-hadoop2-compat</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> </dependencies> - - <profiles> - - <!-- Profile for building against Hadoop 1. Active by default. Not used if another - Hadoop profile is specified with mvn -Dhadoop.profile=foo --> - <profile> - <id>hadoop-1</id> - <activation> - <property> - <name>!hadoop.profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-it</artifactId> - <version>${hbase-hadoop1.version}</version> - <type>test-jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <exclusions> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.kosmosfs</groupId> - <artifactId>kfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <optional>true</optional> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-hadoop1-compat</artifactId> - </dependency> - </dependencies> - </profile> - - <!-- Profile for building against Hadoop 2. Activate using: mvn -Dhadoop.profile=2--> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-it</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-server</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </dependency> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-hadoop2-compat</artifactId> - </dependency> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-hadoop2-compat</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index d1bf843..d023cc4 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -82,6 +82,87 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-testing-util</artifactId> + <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-it</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + </dependency> </dependencies> <build> @@ -94,197 +175,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + </plugin> </plugins> </build> - - <profiles> - - <!-- Profile for building against Hadoop 1. Active by default. Not used if another - Hadoop profile is specified with mvn -Dhadoop.profile=foo --> - <profile> - <id>hadoop-1</id> - <activation> - <property> - <name>!hadoop.profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase-hadoop1.version}</version> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-it</artifactId> - <version>${hbase-hadoop1.version}</version> - <type>test-jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop-one.version}</version> - <exclusions> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.kosmosfs</groupId> - <artifactId>kfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop-one.version}</version> - <optional>true</optional> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - - <!-- Profile for building against Hadoop 2. Activate using: mvn -Dhadoop.profile=2 --> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase-hadoop2.version}</version> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-it</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-hadoop1-compat/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-hadoop1-compat/pom.xml b/phoenix-hadoop1-compat/pom.xml deleted file mode 100644 index 7cc6788..0000000 --- a/phoenix-hadoop1-compat/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version='1.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. - ---> - -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix</artifactId> - <version>5.0.0-SNAPSHOT</version> - </parent> - <artifactId>phoenix-hadoop1-compat</artifactId> - <name>Phoenix Hadoop1 Compatibility</name> - - <dependencies> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-hadoop-compat</artifactId> - <classifier>tests</classifier> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-hadoop2-compat/bin/hadoop-metrics2-hbase.properties ---------------------------------------------------------------------- diff --git a/phoenix-hadoop2-compat/bin/hadoop-metrics2-hbase.properties b/phoenix-hadoop2-compat/bin/hadoop-metrics2-hbase.properties deleted file mode 100644 index 499ab6b..0000000 --- a/phoenix-hadoop2-compat/bin/hadoop-metrics2-hbase.properties +++ /dev/null @@ -1,20 +0,0 @@ -# HBase Server Sink Configuration -################################# -# -# Configuration for the metrics2 system for the HBase RegionServers -# to enable phoenix trace collection on the HBase servers. -# -# See hadoop-metrics2-phoenix.properties for how these configurations -# are utilized. -# -# Either this file can be used in place of the standard -# hadoop-metrics2-hbase.properties file or the below -# properties should be added to the file of the same name on -# the HBase classpath (likely in the HBase conf/ folder) - -# ensure that we receive traces on the server -hbase.sink.tracing.class=org.apache.phoenix.trace.PhoenixMetricsSink -# Tell the sink where to write the metrics -hbase.sink.tracing.writer-class=org.apache.phoenix.trace.PhoenixTableMetricsWriter -# Only handle traces with a context of "tracing" -hbase.sink.tracing.context=tracing http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-hadoop2-compat/bin/hadoop-metrics2-phoenix.properties ---------------------------------------------------------------------- diff --git a/phoenix-hadoop2-compat/bin/hadoop-metrics2-phoenix.properties b/phoenix-hadoop2-compat/bin/hadoop-metrics2-phoenix.properties deleted file mode 100644 index 4a5794d..0000000 --- a/phoenix-hadoop2-compat/bin/hadoop-metrics2-phoenix.properties +++ /dev/null @@ -1,53 +0,0 @@ -# Metrics properties for phoenix -#################################### -# -#There are two options with file names: -# 1. hadoop-metrics2-[prefix].properties -# 2. hadoop-metrics2.properties -# Either will be loaded by the metrics system (but not both). -# -# NOTE: The metrics system is only initialized once per JVM (but does ref-counting, so we can't -#shutdown and restart), so we only load the first prefix that we find. Generally, this will be -#phoenix (unless someone else registers first, but for many clients, there should only be one). -# -# Usually, you would use hadoop-metrics2-phoenix.properties, but we use the generic -# hadoop-metrics2.properties to ensure it these are loaded regardless of where we are running, -# assuming there isn't another config on the classpath. - -# When specifying sinks, the syntax to use is: -# [prefix].[source|sink].[instance].[options] -# The interesting thing to note is that [instance] can literally be anything (as long as its -# not zero-length). It is only there to differentiate the properties that are stored for -# objects of the same type (e.g. differentiating between two phoenix.sink objects). -# -#You could the following lines in your config -# -# phoenix.sink.thingA.class=com.your-company.SpecialSink -# phoenix.sink.thingA.option1=value1 -# -# and also -# -# phoenix.sink.thingB.class=org.apache.phoenix.trace.PhoenixMetricsSink -# phoenix.sink.thingB.doGoodStuff=true -# -# which will create both SpecialSink and PhoenixMetricsSink and register them -# as a MetricsSink, but Special sink will only see option1=value1 in its -# configuration, which similarly, the instantiated PhoenixMetricsSink will -# only see doGoodStuff=true in its configuration -# -# See javadoc of package-info.java for org.apache.hadoop.metrics2 for detail - -# Uncomment to NOT start MBeans -# *.source.start_mbeans=false - -# Sample from all the sources every 10 seconds -*.period=10 - -# Write Traces to Phoenix -########################## -# ensure that we receive traces on the server -phoenix.sink.tracing.class=org.apache.phoenix.trace.PhoenixMetricsSink -# Tell the sink where to write the metrics -phoenix.sink.tracing.writer-class=org.apache.phoenix.trace.PhoenixTableMetricsWriter -# Only handle traces with a context of "tracing" -phoenix.sink.tracing.context=tracing \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index f1bb637..6c912f9 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -47,10 +47,96 @@ <artifactId>joda-time</artifactId> </dependency> <dependency> + <groupId>org.apache.pig</groupId> + <artifactId>pig</artifactId> + <classifier>h2</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-testing-util</artifactId> + <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-it</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + </dependency> + <!-- Test Dependencies --> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> </dependency> - <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -67,206 +153,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + </plugin> </plugins> </build> - - <profiles> - - <!-- Profile for building against Hadoop 1. Active by default. Not used if another - Hadoop profile is specified with mvn -Dhadoop.profile=foo --> - <profile> - <id>hadoop-1</id> - <activation> - <property> - <name>!hadoop.profile</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.pig</groupId> - <artifactId>pig</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase-hadoop1.version}</version> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-it</artifactId> - <version>${hbase-hadoop1.version}</version> - <type>test-jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop-one.version}</version> - <exclusions> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.kosmosfs</groupId> - <artifactId>kfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop-one.version}</version> - <optional>true</optional> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - - <!-- Profile for building against Hadoop 2. Activate using: mvn -Dhadoop.profile=2 --> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.pig</groupId> - <artifactId>pig</artifactId> - <classifier>h2</classifier> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase-hadoop2.version}</version> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-it</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a83816a..4c83363 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,8 @@ <module>phoenix-flume</module> <module>phoenix-pig</module> <module>phoenix-assembly</module> + <!--Temporary inclusion - to be removed in next patch, for ease of review --> + <module>phoenix-hadoop2-compat</module> </modules> <repositories> @@ -67,9 +69,7 @@ <test.output.tofile>true</test.output.tofile> <!-- Hadoop Versions --> - <hbase-hadoop1.version>0.98.4-hadoop1</hbase-hadoop1.version> - <hbase-hadoop2.version>0.98.4-hadoop2</hbase-hadoop2.version> - <hadoop-one.version>1.0.4</hadoop-one.version> + <hbase.version>0.98.4-hadoop2</hbase.version> <hadoop-two.version>2.2.0</hadoop-two.version> <!-- Dependency versions --> @@ -178,7 +178,7 @@ <exclude>CHANGES</exclude> <exclude>README.md</exclude> <exclude>README</exclude> - <exclude>dev/phoenix.importorder</exclude> + <exclude>dev/phoenix.importorder</exclude> <exclude>dev/release_files/**</exclude> <exclude>**/target/**</exclude> <exclude>**/*.versionsBackup</exclude> @@ -294,6 +294,23 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin.version}</version> + <executions> + <execution> + <id>create-mrapp-generated-classpath</id> + <phase>generate-test-resources</phase> + <goals> + <goal>build-classpath</goal> + </goals> + <configuration> + <outputFile>${project.build.directory}/classes/mrapp-generated-classpath + </outputFile> + </configuration> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> @@ -405,7 +422,7 @@ </dependency> <dependency> <groupId>org.apache.phoenix</groupId> - <artifactId>${compat.module}</artifactId> + <artifactId>phoenix-hadoop2-compat</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> @@ -420,8 +437,84 @@ <artifactId>phoenix-pig</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-hadoop2-compat</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- HBase dependencies --> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-testing-util</artifactId> + <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>org.jruby</groupId> + <artifactId>jruby-complete</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <!-- Hadoop Dependencies --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-two.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop-two.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-two.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop-two.version}</version> + <optional>true</optional> + <scope>test</scope> + </dependency> <!-- General Dependencies --> + <dependency> + <groupId>org.apache.pig</groupId> + <artifactId>pig</artifactId> + <version>${pig.version}</version> + <classifier>h2</classifier> + </dependency> + <!-- Make sure we have all the antlr dependencies --> <dependency> <groupId>org.antlr</groupId> @@ -557,232 +650,6 @@ </dependencyManagement> <profiles> - - - <!-- Profile for building against Hadoop 1. Active by default. Not used - if another Hadoop profile is specified with mvn -Dhadoop.profile=foo --> - <profile> - <id>hadoop-1</id> - <activation> - <property> - <name>!hadoop.profile</name> - </property> - </activation> - <modules> - <module>phoenix-hadoop1-compat</module> - </modules> - <properties> - <hadoop.version>${hadoop-one.version}</hadoop.version> - <compat.module>phoenix-hadoop1-compat</compat.module> - <!-- name of the descriptor file for all the components (including hadoop1) --> - <assembly.descriptor>hadoop-one-all.xml</assembly.descriptor> - </properties> - <dependencyManagement> - <dependencies> - <!-- Intra-project dependency --> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>${compat.module}</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- Hadoop dependencies --> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase-hadoop1.version}</version> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop-one.version}</version> - <exclusions> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.kosmosfs</groupId> - <artifactId>kfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>net.java.dev.jets3t</groupId> - <artifactId>jets3t</artifactId> - </exclusion> - <exclusion> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop1.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop-one.version}</version> - <optional>true</optional> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.pig</groupId> - <artifactId>pig</artifactId> - <version>${pig.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - - <!-- Profile for building against Hadoop 2. Activate using: mvn -Dhadoop.profile=2 --> - <profile> - <id>hadoop-2</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>2</value> - </property> - </activation> - <modules> - <module>phoenix-hadoop2-compat</module> - </modules> - <properties> - <hadoop.version>${hadoop-two.version}</hadoop.version> - <compat.module>phoenix-hadoop2-compat</compat.module> - <!-- name of the descriptor file for all the components (including hadoop2) --> - <assembly.descriptor>hadoop-two-all.xml</assembly.descriptor> - </properties> - <dependencyManagement> - <dependencies> - <!-- Intra-project dependency --> - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>${compat.module}</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- HBase dependencies --> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-testing-util</artifactId> - <version>${hbase-hadoop2.version}</version> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-protocol</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-common</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-client</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase-hadoop2.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - <!-- Hadoop Dependencies --> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop-two.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - <version>${hadoop-two.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop-two.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop-two.version}</version> - <optional>true</optional> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.pig</groupId> - <artifactId>pig</artifactId> - <version>${pig.version}</version> - <classifier>h2</classifier> - </dependency> - </dependencies> - </dependencyManagement> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>${maven-dependency-plugin.version}</version> - <executions> - <execution> - <id>create-mrapp-generated-classpath</id> - <phase>generate-test-resources</phase> - <goals> - <goal>build-classpath</goal> - </goals> - <configuration> - <outputFile>${project.build.directory}/classes/mrapp-generated-classpath</outputFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - <!-- this profile should be activated for release builds --> <profile> <id>release</id>
