phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject git commit: PHOENIX-859: Client jar needs to package commons-collections when running on windows
Date Mon, 17 Mar 2014 22:22:10 GMT
Repository: incubator-phoenix
Updated Branches:
  refs/heads/4.0 8515b0fe6 -> ce559b7b3


PHOENIX-859: Client jar needs to package commons-collections when running on windows


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/ce559b7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/ce559b7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/ce559b7b

Branch: refs/heads/4.0
Commit: ce559b7b311ecf6be928e013915078c7b419bc33
Parents: 8515b0f
Author: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Authored: Mon Mar 17 15:25:13 2014 -0700
Committer: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Committed: Mon Mar 17 15:25:13 2014 -0700

----------------------------------------------------------------------
 phoenix-assembly/src/build/components-major-client.xml | 1 +
 phoenix-core/pom.xml                                   | 5 +++++
 pom.xml                                                | 6 ++++++
 3 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/ce559b7b/phoenix-assembly/src/build/components-major-client.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/components-major-client.xml b/phoenix-assembly/src/build/components-major-client.xml
index 3106f02..08083da 100644
--- a/phoenix-assembly/src/build/components-major-client.xml
+++ b/phoenix-assembly/src/build/components-major-client.xml
@@ -48,6 +48,7 @@
         <include>org.codehaus.jackson:jackson-mapper-asl</include>
         <include>org.codehaus.jackson:jackson-core-asl</include>
         <include>org.xerial.snappy:snappy-java</include>
+        <include>commons-collections:commons-collections</include>
       </includes>
     </dependencySet>
   </dependencySets>

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/ce559b7b/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index aff45c9..0207214 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -300,6 +300,11 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${collections.version}</version>
     </dependency>    
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/ce559b7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e9e8c55..8772f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
     <netty.version>3.6.6.Final</netty.version>
     <commons-codec.version>1.7</commons-codec.version>
     <htrace.version>2.04</htrace.version>
+    <collections.version>3.2.1</collections.version>
 
     <!-- Test Dependencies -->
     <mockito-all.version>1.8.5</mockito-all.version>
@@ -482,6 +483,11 @@
         <artifactId>commons-codec</artifactId>
         <version>${commons-codec.version}</version>
       </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${collections.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 


Mime
View raw message