cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [1/2] git commit: high-scale-lib upgrade
Date Mon, 05 May 2014 21:13:31 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 284d3f7fe -> 5c66dc819


high-scale-lib upgrade

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128


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

Branch: refs/heads/trunk
Commit: f0575f153b8f0b0caa56f56cc5e93ebd3f784b8e
Parents: 9881ea6
Author: T Jake Luciani <jake@apache.org>
Authored: Mon May 5 16:07:53 2014 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Mon May 5 16:37:22 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                  |   1 +
 build.properties.default     |   1 +
 build.xml                    |   8 ++++++--
 lib/high-scale-lib-1.0.5.jar | Bin 0 -> 104776 bytes
 lib/high-scale-lib-1.1.2.jar | Bin 96046 -> 0 bytes
 5 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a8b6ae4..553f764 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Merged from 1.2:
  * Add Cloudstack snitch (CASSANDRA-7147)
  * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
  * Add Google Compute Engine snitch (CASSANDRA-7132)
+ * Upgrade NBHM lib (CASSANDRA-7128) 
 
 2.1.0-beta2
  * Increase default CL space to 8GB (CASSANDRA-7031)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.properties.default
----------------------------------------------------------------------
diff --git a/build.properties.default b/build.properties.default
index ff6aea0..be9b23b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -4,4 +4,5 @@ artifact.remoteRepository.java.net2:   http://download.java.net/maven/2
 artifact.remoteRepository.apache:      https://repository.apache.org/content/repositories/releases
 artifact.remoteRepository.jclouds:     http://jclouds.googlecode.com/svn/repo
 artifact.remoteRepository.oauth:       http://oauth.googlecode.com/svn/code/maven
+artifact.remoteRepository.boundary:	   http://maven.boundary.com/artifactory/external	
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 898b141..e8d9dd9 100644
--- a/build.xml
+++ b/build.xml
@@ -283,6 +283,7 @@
       <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
       <artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
       <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
+      <artifact:remoteRepository id="boundary"  url="${artifact.remoteRepository.boundary}"/>
 
       <macrodef name="install">
         <attribute name="pomFile"/>
@@ -361,7 +362,7 @@
             <exclusion groupId="junit" artifactId="junit"/>
           </dependency>
           <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
-          <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib"
version="1.1.2"/>
+          <dependency groupId="com.boundary.high-scale-lib" artifactId="high-scale-lib"
version="1.0.5"/>
           <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
           <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3">
 	      	<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
@@ -470,7 +471,7 @@
         <dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
         <dependency groupId="jline" artifactId="jline"/>
         <dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
-        <dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib"/>
+        <dependency groupId="com.boundary.high-scale-lib" artifactId="high-scale-lib"/>
         <dependency groupId="org.yaml" artifactId="snakeyaml"/>
         <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
         <dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
@@ -542,6 +543,7 @@
           <remoteRepository refid="central"/>
           <remoteRepository refid="apache"/>
           <remoteRepository refid="java.net2"/>
+          <remoteRepository refid="boundary"/>
       </artifact:dependencies>
       <artifact:dependencies pomRefId="coverage-deps-pom"
                              pathId="cobertura.classpath">
@@ -567,6 +569,7 @@
         <remoteRepository refid="apache"/>
         <remoteRepository refid="central"/>
         <remoteRepository refid="oauth"/>
+        <remoteRepository refid="boundary"/>
       </artifact:dependencies>
       <copy todir="${test.lib}/jars">
         <fileset refid="test-dependency-jars"/>
@@ -587,6 +590,7 @@
         <remoteRepository refid="apache"/>
         <remoteRepository refid="central"/>
         <remoteRepository refid="java.net2"/>
+        <remoteRepository refid="boundary"/>
       </artifact:dependencies>
       <copy todir="${build.dir.lib}/jars">
         <fileset refid="test-dependency-jars"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.0.5.jar
----------------------------------------------------------------------
diff --git a/lib/high-scale-lib-1.0.5.jar b/lib/high-scale-lib-1.0.5.jar
new file mode 100644
index 0000000..d184472
Binary files /dev/null and b/lib/high-scale-lib-1.0.5.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0575f15/lib/high-scale-lib-1.1.2.jar
----------------------------------------------------------------------
diff --git a/lib/high-scale-lib-1.1.2.jar b/lib/high-scale-lib-1.1.2.jar
deleted file mode 100644
index 6343a70..0000000
Binary files a/lib/high-scale-lib-1.1.2.jar and /dev/null differ


Mime
View raw message