Repository: tez Updated Branches: refs/heads/master 19fb44004 -> b9d5c2056
TEZ-2560. fix tex-ui build for maven 3.3+ (pramachandran) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b9d5c205 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b9d5c205 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b9d5c205 Branch: refs/heads/master Commit: b9d5c2056c1026903a30c35a67e5b16aa1b5bb2b Parents: 19fb440 Author: Prakash Ramachandran <[email protected]> Authored: Fri Jul 24 13:21:20 2015 -0700 Committer: Prakash Ramachandran <[email protected]> Committed: Fri Jul 24 13:23:25 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + pom.xml | 31 +++++++++++++++++++++++++++++-- tez-ui/pom.xml | 1 - 3 files changed, 30 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/b9d5c205/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1affa1c..bd6aa25 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -270,6 +270,7 @@ Release 0.6.2: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2560. fix tex-ui build for maven 3.3+ TEZ-2600. When used with HDFS federation(viewfs) ,tez will throw a error TEZ-2579. Incorrect comparison of TaskAttemptId TEZ-2549. Reduce Counter Load on the Timeline Server http://git-wip-us.apache.org/repos/asf/tez/blob/b9d5c205/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6661cb2..95ceab4 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <scm.url>scm:git:https://git-wip-us.apache.org/repos/asf/tez.git</scm.url> <build.time>${maven.build.timestamp}</build.time> - <frontend-maven-plugin.version>0.0.22</frontend-maven-plugin.version> + <frontend-maven-plugin.version>0.0.23</frontend-maven-plugin.version> <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version> <javadoc-maven-plugin.version>2.9.1</javadoc-maven-plugin.version> </properties> @@ -745,7 +745,7 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.23</version> + <version>${frontend-maven-plugin.version}</version> </plugin> <plugin> <artifactId>exec-maven-plugin</artifactId> @@ -1145,6 +1145,33 @@ </dependency> </dependencies> </profile> + + <!-- fix for the frontend-maven-plugin - see TEZ-2560 --> + <profile> + <id>maven304</id> + <activation> + <property> + <name>maven.version</name> + <value>3.0.4</value> + </property> + </activation> + <properties> + <frontend-maven-plugin.version>0.0.22</frontend-maven-plugin.version> + </properties> + </profile> + <profile> + <id>maven305</id> + <activation> + <property> + <name>maven.version</name> + <value>3.0.5</value> + </property> + </activation> + <properties> + <frontend-maven-plugin.version>0.0.22</frontend-maven-plugin.version> + </properties> + </profile> + </profiles> <reporting> http://git-wip-us.apache.org/repos/asf/tez/blob/b9d5c205/tez-ui/pom.xml ---------------------------------------------------------------------- diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml index ddb6a2d..bfc6f01 100644 --- a/tez-ui/pom.xml +++ b/tez-ui/pom.xml @@ -61,7 +61,6 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>${frontend-maven-plugin.version}</version> <configuration> <workingDirectory>${webappDir}</workingDirectory> </configuration>
