tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prak...@apache.org
Subject tez git commit: TEZ-2560. fix tex-ui build for maven 3.3+ (pramachandran)
Date Fri, 24 Jul 2015 22:04:53 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 cacae67a9 -> 9355ceaa6


TEZ-2560. fix tex-ui build for maven 3.3+ (pramachandran)

(cherry picked from commit b9d5c2056c1026903a30c35a67e5b16aa1b5bb2b)

Conflicts:
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9355ceaa
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9355ceaa
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9355ceaa

Branch: refs/heads/branch-0.6
Commit: 9355ceaa6cc45d42653c4d4bd38a868bc4c84d9c
Parents: cacae67
Author: Prakash Ramachandran <pramachandran@hortonworks.com>
Authored: Fri Jul 24 13:21:20 2015 -0700
Committer: Prakash Ramachandran <pramachandran@hortonworks.com>
Committed: Fri Jul 24 15:03:08 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 pom.xml     | 30 +++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/9355ceaa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 016de9c..e096da6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,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/9355ceaa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3df0eec..73f8829 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,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.23</frontend-maven-plugin.version>
   </properties>
   <scm>
     <connection>${scm.url}</connection>
@@ -725,7 +726,7 @@
         <plugin>
           <groupId>com.github.eirslett</groupId>
           <artifactId>frontend-maven-plugin</artifactId>
-          <version>0.0.16</version>
+          <version>${frontend-maven-plugin.version}</version>
         </plugin>
         <plugin>
           <artifactId>exec-maven-plugin</artifactId>
@@ -1041,6 +1042,33 @@
         </plugins>
       </build>
     </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>


Mime
View raw message