You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2014/12/11 17:51:19 UTC
ambari git commit: AMBARI-8655. AMS build fails with maven version
higher then 3.0.5. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 2cfc2f843 -> 24bb34444
AMBARI-8655. AMS build fails with maven version higher then 3.0.5. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24bb3444
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24bb3444
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24bb3444
Branch: refs/heads/trunk
Commit: 24bb34444d41a567587c7dc5a810924c43eab627
Parents: 2cfc2f8
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu Dec 11 15:12:51 2014 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Thu Dec 11 18:50:52 2014 +0200
----------------------------------------------------------------------
.../ambari-metrics-timelineservice/pom.xml | 42 +++++++++----------
.../4.2.0/phoenix-core-tests-4.2.0.jar | Bin 992828 -> 0 bytes
.../4.2.0/phoenix-core-tests-4.2.0.pom | 9 ----
.../phoenix-core-tests/maven-metadata-local.xml | 12 ------
4 files changed, 20 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/24bb3444/ambari-metrics/ambari-metrics-timelineservice/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 49d29a5..01f26fa 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -35,15 +35,9 @@
<!--<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>-->
<protobuf.version>2.5.0</protobuf.version>
<hadoop.version>2.4.0</hadoop.version>
+ <phoenix.version>4.2.0.2.2.0.0-2041</phoenix.version>
</properties>
- <repositories>
- <repository>
- <id>phoenix-core-tests</id>
- <name>Phoenix Unit tests</name>
- <url>file://${project.basedir}/src/test/resources/lib</url>
- </repository>
- </repositories>
<build>
<plugins>
<plugin>
@@ -82,24 +76,28 @@
</executions>
</plugin>
<plugin>
- <groupId>com.github.goldin</groupId>
- <artifactId>copy-maven-plugin</artifactId>
- <version>0.2.5</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
- <id>create-archive</id>
- <phase>package</phase>
+ <phase>generate-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <resources>
- <resource>
- <targetPath>${project.build.directory}/embedded</targetPath>
- <file>${hbase.tar}</file>
- <unpack>true</unpack>
- </resource>
- </resources>
+ <target name="Download HBase">
+ <mkdir dir="${project.build.directory}/embedded" />
+ <get
+ src="${hbase.tar}"
+ dest="${project.build.directory}/embedded/hbase.tar.gz"
+ />
+ <untar
+ src="${project.build.directory}/embedded/hbase.tar.gz"
+ dest="${project.build.directory}/embedded"
+ compression="gzip"
+ />
+ </target>
</configuration>
</execution>
</executions>
@@ -251,7 +249,7 @@
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
- <version>4.2.0.2.2.0.0-2041</version>
+ <version>${phoenix.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -490,7 +488,7 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
<type>test-jar</type>
- <version>4.2.0.2.2.0.0-2041</version>
+ <version>${phoenix.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ambari/blob/24bb3444/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.jar
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.jar b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.jar
deleted file mode 100644
index 468409a..0000000
Binary files a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/24bb3444/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom
deleted file mode 100644
index 83c7106..0000000
--- a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/4.2.0/phoenix-core-tests-4.2.0.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core-tests</artifactId>
- <version>4.2.0</version>
- <description>POM was created from install:install-file</description>
-</project>
http://git-wip-us.apache.org/repos/asf/ambari/blob/24bb3444/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml
deleted file mode 100644
index 53bbfc2..0000000
--- a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/lib/org/apache/phoenix/phoenix-core-tests/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core-tests</artifactId>
- <versioning>
- <release>4.2.0</release>
- <versions>
- <version>4.2.0</version>
- </versions>
- <lastUpdated>20141103224551</lastUpdated>
- </versioning>
-</metadata>