You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2014/04/26 20:14:18 UTC
svn commit: r1590269 - in /chukwa/trunk: CHANGES.txt pom.xml
src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java
Author: eyang
Date: Sat Apr 26 18:14:17 2014
New Revision: 1590269
URL: http://svn.apache.org/r1590269
Log:
CHUKWA-705. Updated Chukwa to support JDK7 and updated to Hadoop 1.2.1 and HBase 0.96.1.1. (Eric Yang)
Modified:
chukwa/trunk/CHANGES.txt
chukwa/trunk/pom.xml
chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java
Modified: chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/chukwa/trunk/CHANGES.txt?rev=1590269&r1=1590268&r2=1590269&view=diff
==============================================================================
--- chukwa/trunk/CHANGES.txt (original)
+++ chukwa/trunk/CHANGES.txt Sat Apr 26 18:14:17 2014
@@ -12,6 +12,8 @@ Release 0.6 - Unreleased
NEW FEATURES
+ CHUKWA-705. Updated Chukwa to support JDK7 and updated to Hadoop 1.2.1 and HBase 0.96.1.1. (Eric Yang)
+
CHUKWA-699. Updated timeline widget stylesheet. (Eric Yang)
CHUKWA-697. Added generic heatmap REST API and visualization. (Eric Yang)
Modified: chukwa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chukwa/trunk/pom.xml?rev=1590269&r1=1590268&r2=1590269&view=diff
==============================================================================
--- chukwa/trunk/pom.xml (original)
+++ chukwa/trunk/pom.xml Sat Apr 26 18:14:17 2014
@@ -293,6 +293,7 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>1.2.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -388,6 +389,29 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>chmod-jmx-file</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks name="setup">
+ <chmod file="target/conf/jmxremote.password" perm="600" />
+ <chmod file="target/conf/jmxremote.access" perm="600" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<executions>
@@ -424,12 +448,42 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <compilerVersion>1.5</compilerVersion>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <compilerVersion>1.7</compilerVersion>
+ <source>1.7</source>
+ <target>1.7</target>
+ <excludes>
+ <exclude>**/JobLog.java</exclude>
+ <exclude>**/TestJobLogEntry.java</exclude>
+ <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <compilerVersion>1.7</compilerVersion>
+ <source>1.7</source>
+ <target>1.7</target>
+ <testExcludes>
+ <exclude>**/JobLog.java</exclude>
+ <exclude>**/TestJobLogEntry.java</exclude>
+ <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
+ </testExcludes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -472,6 +526,7 @@
<exclude>**/TestFSMBuilder.java</exclude>
<exclude>**/TestDatabase*.java</exclude>
<exclude>**/TestArchive.java</exclude>
+ <exclude>**/TestJobLogEntry.java</exclude>
<exclude>**/*$*</exclude>
</excludes>
<systemPropertyVariables>
@@ -824,7 +879,7 @@
</property>
</activation>
<properties>
- <hbase.version>0.95-SNAPSHOT</hbase.version>
+ <hbase.version>0.96.1.1</hbase.version>
</properties>
<dependencies>
<dependency>
@@ -1035,6 +1090,10 @@
<id>clojars</id>
<url>http://clojars.org/repo/</url>
</repository>
+ <repository>
+ <id>Apache</id>
+ <url>http://repo.maven.apache.org/maven2/</url>
+ </repository>
</repositories>
<dependencyManagement>
Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java?rev=1590269&r1=1590268&r2=1590269&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/hbase/Reporter.java Sat Apr 26 18:14:17 2014
@@ -70,6 +70,12 @@ public class Reporter implements org.apa
return 0;
}
+ @Override
+ public float getProgress() {
+ // TODO Auto-generated method stub
+ return 0.0f;
+ }
+
public void clear() {
// TODO Auto-generated method stub