Repository: avro Updated Branches: refs/heads/master 67bec06db -> b2cd78d54
AVRO-1947 - Inconsistent maven profile activation Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/b2cd78d5 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/b2cd78d5 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/b2cd78d5 Branch: refs/heads/master Commit: b2cd78d549ad72cc1a1441562ea1bc5181116040 Parents: 67bec06 Author: Gabor Szadovszky <[email protected]> Authored: Thu Nov 3 17:45:07 2016 +0100 Committer: Tom White <[email protected]> Committed: Fri Nov 4 10:26:29 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ lang/java/mapred/pom.xml | 3 ++- lang/java/trevni/avro/pom.xml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/b2cd78d5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 15c0523..cd02bf5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -91,6 +91,9 @@ Trunk (not yet released) TestNettyServerWithCompression.testConnectionsCount (Gabor Szadovszky via tomwhite) + AVRO-1947: Java: Inconsistent maven profile activation + (Gabor Szadovszky via tomwhite) + Avro 1.8.1 (14 May 2016) INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/avro/blob/b2cd78d5/lang/java/mapred/pom.xml ---------------------------------------------------------------------- diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml index 4e2f417..e7e2a3f 100644 --- a/lang/java/mapred/pom.xml +++ b/lang/java/mapred/pom.xml @@ -211,7 +211,8 @@ <id>hadoop2</id> <activation> <property> - <name>!hadoop.version</name> <!-- if no hadoop.version is set --> + <name>hadoop.version</name> + <value>!1</value> <!-- if the hadoop.version is not 1 (or not set) --> </property> </activation> <properties> http://git-wip-us.apache.org/repos/asf/avro/blob/b2cd78d5/lang/java/trevni/avro/pom.xml ---------------------------------------------------------------------- diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml index f2380fe..57a9d3a 100644 --- a/lang/java/trevni/avro/pom.xml +++ b/lang/java/trevni/avro/pom.xml @@ -104,7 +104,8 @@ <id>hadoop2</id> <activation> <property> - <name>!hadoop.version</name> <!-- if no hadoop.version is set --> + <name>hadoop.version</name> + <value>!1</value> <!-- if hadoop.version is not 1 (or not set) --> </property> </activation> <properties>
