You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by sc...@apache.org on 2011/10/24 01:29:43 UTC
svn commit: r1188005 - in /avro/trunk: ./ lang/java/ lang/java/archetypes/
lang/java/compiler/
lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/
lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/
lang/java/maven-plugin/
Author: scottcarey
Date: Sun Oct 23 23:29:42 2011
New Revision: 1188005
URL: http://svn.apache.org/viewvc?rev=1188005&view=rev
Log:
AVRO-935. Java: Update dependency versions for 1.6.0.
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/java/archetypes/pom.xml
avro/trunk/lang/java/compiler/pom.xml
avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
avro/trunk/lang/java/maven-plugin/pom.xml
avro/trunk/lang/java/pom.xml
avro/trunk/pom.xml
Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sun Oct 23 23:29:42 2011
@@ -162,6 +162,8 @@ Avro 1.6.0 (unreleased)
AVRO-940. C++ design for generic datum could be better. (thiru)
+ AVRO-935. Java: Update dependency versions for 1.6.0. (scottcarey)
+
BUG FIXES
AVRO-824. Java: Fix usage message of BinaryFragmentToJsonTool.
Modified: avro/trunk/lang/java/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/archetypes/pom.xml?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/lang/java/archetypes/pom.xml (original)
+++ avro/trunk/lang/java/archetypes/pom.xml Sun Oct 23 23:29:42 2011
@@ -56,7 +56,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
<executions>
<execution>
<id>copy-pom-with-building-version</id>
@@ -101,7 +100,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>${maven.archetype.version}</version>
<executions>
<execution>
<goals>
Modified: avro/trunk/lang/java/compiler/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/pom.xml?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/pom.xml (original)
+++ avro/trunk/lang/java/compiler/pom.xml Sun Oct 23 23:29:42 2011
@@ -64,7 +64,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
<configuration>
<systemPropertyVariables>
<test.idl.dir>${project.basedir}/src/test/idl</test.idl.dir>
@@ -83,18 +82,17 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.1</version>
+ <version>1.8.2</version>
<!-- can only be used from within ant -->
<scope>provided</scope>
</dependency>
Modified: avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java (original)
+++ avro/trunk/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java Sun Oct 23 23:29:42 2011
@@ -272,11 +272,7 @@ public class SpecificCompiler {
throw new RuntimeException(e);
}
StringWriter writer = new StringWriter();
- try {
- template.merge(context, writer);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ template.merge(context, writer);
return writer.toString();
}
Modified: avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java (original)
+++ avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/tether/TetheredProcess.java Sun Oct 23 23:29:42 2011
@@ -151,8 +151,8 @@ class TetheredProcess {
// wrap the command in a stdout/stderr capture
TaskAttemptID taskid = TaskAttemptID.forName(job.get("mapred.task.id"));
- File stdout = TaskLog.getTaskLogFile(taskid, TaskLog.LogName.STDOUT);
- File stderr = TaskLog.getTaskLogFile(taskid, TaskLog.LogName.STDERR);
+ File stdout = TaskLog.getTaskLogFile(taskid, false, TaskLog.LogName.STDOUT);
+ File stderr = TaskLog.getTaskLogFile(taskid, false, TaskLog.LogName.STDERR);
long logLength = TaskLog.getTaskLogLength(job);
command = TaskLog.captureOutAndError(command, stdout, stderr, logLength);
stdout.getParentFile().mkdirs();
Modified: avro/trunk/lang/java/maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/pom.xml?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/lang/java/maven-plugin/pom.xml (original)
+++ avro/trunk/lang/java/maven-plugin/pom.xml Sun Oct 23 23:29:42 2011
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<executions>
<execution>
<id>generated-helpmojo</id>
Modified: avro/trunk/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Sun Oct 23 23:29:42 2011
@@ -26,9 +26,7 @@
<relativePath>../../</relativePath>
</parent>
- <groupId>org.apache.avro</groupId>
<artifactId>avro-parent</artifactId>
- <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Avro Java</name>
@@ -37,17 +35,32 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <junit-version>4.8.2</junit-version>
+ <!-- version properties for dependencies -->
+ <junit-version>4.10</junit-version>
<paranamer-version>2.3</paranamer-version>
- <slf4j-version>1.6.1</slf4j-version>
- <jackson-version>1.7.3</jackson-version>
- <hadoop-version>0.20.2</hadoop-version>
+ <slf4j-version>1.6.3</slf4j-version>
+ <jackson-version>1.8.6</jackson-version>
+ <hadoop-version>0.20.205.0</hadoop-version>
<velocity-version>1.7</velocity-version>
<jetty-version>6.1.26</jetty-version>
- <netty-version>3.2.4.Final</netty-version>
- <jopt-simple-version>3.2</jopt-simple-version>
- <snappy-version>1.0.3.2</snappy-version>
+ <netty-version>3.2.6.Final</netty-version>
+ <jopt-simple-version>4.1</jopt-simple-version>
+ <snappy-version>1.0.4.1</snappy-version>
<protobuf-version>2.4.1</protobuf-version>
+
+ <!-- version properties for plugins -->
+ <compiler-plugin-version>2.3.2</compiler-plugin-version>
+ <jar-plugin-version>2.3.2</jar-plugin-version>
+ <surefire-plugin-version>2.10</surefire-plugin-version>
+ <!-- checkstyle plugin 2.7 has a bug, fixed in 2.8
+ http://jira.codehaus.org/browse/MCHECKSTYLE-159 -->
+ <checkstyle-plugin-version>2.6</checkstyle-plugin-version>
+ <javadoc-plugin-version>2.8</javadoc-plugin-version>
+ <source-plugin-version>2.1.2</source-plugin-version>
+ <javacc-plugin-version>2.6</javacc-plugin-version>
+ <exec-plugin-version>1.2.1</exec-plugin-version>
+ <plugin-plugin-version>2.9</plugin-plugin-version>
+
</properties>
<build>
@@ -59,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>${compiler-plugin-version}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -68,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>${jar-plugin-version}</version>
<configuration>
<archive>
<manifest>
@@ -81,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
+ <version>${surefire-plugin-version}</version>
<configuration>
<includes>
<!-- Avro naming convention for JUnit tests -->
@@ -106,6 +119,7 @@
<!-- configures unit test standard error and standard out to go to a file per test
rather than the console. -->
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <failIfNoTests>false</failIfNoTests>
<systemPropertyVariables>
<test.dir>${project.basedir}/target/</test.dir>
</systemPropertyVariables>
@@ -114,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.6</version>
+ <version>${checkstyle-plugin-version}</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
@@ -134,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>${javadoc-plugin-version}</version>
<configuration>
<links>
<link>http://jackson.codehaus.org/${jackson-version}/javadoc/</link>
@@ -146,12 +160,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>${source-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
+ <version>${enforcer-plugin-version}</version>
<configuration>
<rules>
<requireProperty>
@@ -170,12 +184,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
+ <version>${javacc-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>${exec-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${plugin-plugin-version}</version>
</plugin>
</plugins>
</pluginManagement>
Modified: avro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/pom.xml?rev=1188005&r1=1188004&r2=1188005&view=diff
==============================================================================
--- avro/trunk/pom.xml (original)
+++ avro/trunk/pom.xml Sun Oct 23 23:29:42 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>8</version>
+ <version>10</version>
</parent>
<groupId>org.apache.avro</groupId>
@@ -41,7 +41,14 @@
-->
<properties>
<avro.distDir>dist</avro.distDir>
- <avro.docDir>build/avro-doc-${project.version}/api</avro.docDir>
+ <avro.docDir>build/avro-doc-${project.version}/api</avro.docDir>
+ <!-- dependency plugin versions -->
+ <apache-rat-tasks-version>0.7</apache-rat-tasks-version>
+
+ <!-- plugin versions -->
+ <antrun-plugin-version>1.6</antrun-plugin-version>
+ <enforcer-plugin-version>1.0.1</enforcer-plugin-version>
+
</properties>
<modules>
@@ -90,7 +97,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
+ <version>${enforcer-plugin-version}</version>
<configuration>
<rules>
<requireProperty>
@@ -117,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>${antrun-plugin-version}</version>
<configuration>
<target name="rat">
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
@@ -137,7 +144,7 @@
<dependency>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-tasks</artifactId>
- <version>0.7</version>
+ <version>${apache-rat-tasks-version}</version>
</dependency>
</dependencies>
</plugin>
@@ -151,7 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>${antrun-plugin-version}</version>
<configuration>
<target name="copy-java-artifacts">
<mkdir dir="${avro.distDir}/java"/>