avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject [33/35] avro git commit: AVRO-1947 - Inconsistent maven profile activation
Date Sat, 05 Nov 2016 20:20:50 GMT
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/b28f0d5f
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/b28f0d5f
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/b28f0d5f

Branch: refs/heads/branch-1.8
Commit: b28f0d5f8dd5c99d3fff87527627a44be5fd44c4
Parents: 92ed81f
Author: Gabor Szadovszky <gabor.szadovszky@cloudera.com>
Authored: Thu Nov 3 17:45:07 2016 +0100
Committer: Ryan Blue <blue@apache.org>
Committed: Sat Nov 5 13:19:17 2016 -0700

----------------------------------------------------------------------
 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/b28f0d5f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 91ff9f0..afe0922 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -88,6 +88,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/b28f0d5f/lang/java/mapred/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml
index 8ee8642..9ed5201 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/b28f0d5f/lang/java/trevni/avro/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml
index 9136259..fb8408d 100644
--- a/lang/java/trevni/avro/pom.xml
+++ b/lang/java/trevni/avro/pom.xml
@@ -108,7 +108,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>


Mime
View raw message