Changing pom files to support proper SNAPSHOT versions as well as including Hadoop version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/fbc70b8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/fbc70b8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/fbc70b8c Branch: refs/heads/master Commit: fbc70b8ccc325d9c75533ea887d576bb70f04262 Parents: 22bef0e Author: Aaron McCurry <[email protected]> Authored: Fri Jan 2 13:25:04 2015 -0500 Committer: Aaron McCurry <[email protected]> Committed: Fri Jan 2 13:25:04 2015 -0500 ---------------------------------------------------------------------- blur-mapred-hadoop1/pom.xml | 6 ------ distribution/pom.xml | 3 --- pom.xml | 6 +++--- 3 files changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fbc70b8c/blur-mapred-hadoop1/pom.xml ---------------------------------------------------------------------- diff --git a/blur-mapred-hadoop1/pom.xml b/blur-mapred-hadoop1/pom.xml index 9cea73a..335fa82 100644 --- a/blur-mapred-hadoop1/pom.xml +++ b/blur-mapred-hadoop1/pom.xml @@ -148,9 +148,6 @@ under the License. <name>hadoop1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -174,9 +171,6 @@ under the License. <name>hadoop2-mr1</name> </property> </activation> - <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> - </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fbc70b8c/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 48beffb..7cbc371 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -103,7 +103,6 @@ under the License. </dependency> </dependencies> <properties> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> <bin.assembly.file>src/assemble/bin-hadoop1.xml</bin.assembly.file> </properties> </profile> @@ -122,7 +121,6 @@ under the License. </dependency> </dependencies> <properties> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> <bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file> </properties> </profile> @@ -141,7 +139,6 @@ under the License. </dependency> </dependencies> <properties> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> <bin.assembly.file>src/assemble/bin-hadoop2.xml</bin.assembly.file> </properties> </profile> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fbc70b8c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b7e4529..e923c93 100644 --- a/pom.xml +++ b/pom.xml @@ -476,7 +476,7 @@ under the License. </activation> <properties> <hadoop.version>1.2.1</hadoop.version> - <projectVersion>${project.parent.version}-hadoop1</projectVersion> + <projectVersion>hadoop1-${hadoop.version}-${project.parent.version}</projectVersion> </properties> <modules> <module>blur-command</module> @@ -501,7 +501,7 @@ under the License. </activation> <properties> <hadoop.version>2.0.0-mr1-cdh4.6.0</hadoop.version> - <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion> + <projectVersion>hadoop2-mr1-${hadoop.version}-${project.parent.version}</projectVersion> </properties> <modules> <module>blur-command</module> @@ -526,7 +526,7 @@ under the License. </activation> <properties> <hadoop.version>2.2.0</hadoop.version> - <projectVersion>${project.parent.version}-hadoop2</projectVersion> + <projectVersion>hadoop2-${hadoop.version}-${project.parent.version}</projectVersion> </properties> <modules> <module>blur-command</module>
