Followup commit to fix maven deps on boundary's NBHM 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/4ee37210 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ee37210 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ee37210 Branch: refs/heads/cassandra-2.1 Commit: 4ee372106fadc8033a547597e642ab99ea4c2618 Parents: 0f977c5 Author: Jake Luciani <j...@apache.org> Authored: Wed May 14 09:02:45 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Wed May 14 09:02:45 2014 -0400 ---------------------------------------------------------------------- build.properties.default | 1 - build.xml | 6 +----- lib/high-scale-lib-1.0.5.jar | Bin 104776 -> 0 bytes lib/high-scale-lib-1.0.6.jar | Bin 0 -> 105118 bytes lib/licenses/high-scale-lib-1.0.6.txt | 29 +++++++++++++++++++++++++++++ lib/licenses/high-scale-lib-1.1.2.txt | 29 ----------------------------- 6 files changed, 30 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ee37210/build.properties.default ---------------------------------------------------------------------- diff --git a/build.properties.default b/build.properties.default index be9b23b..ff6aea0 100644 --- a/build.properties.default +++ b/build.properties.default @@ -4,5 +4,4 @@ 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/4ee37210/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index fa3b5ca..044e3a2 100644 --- a/build.xml +++ b/build.xml @@ -283,7 +283,6 @@ <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"/> @@ -362,7 +361,7 @@ <exclusion groupId="junit" artifactId="junit"/> </dependency> <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/> - <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.5"/> + <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/> <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"/> @@ -543,7 +542,6 @@ <remoteRepository refid="central"/> <remoteRepository refid="apache"/> <remoteRepository refid="java.net2"/> - <!-- <remoteRepository refid="boundary"/> --> </artifact:dependencies> <artifact:dependencies pomRefId="coverage-deps-pom" pathId="cobertura.classpath"> @@ -569,7 +567,6 @@ <remoteRepository refid="apache"/> <remoteRepository refid="central"/> <remoteRepository refid="oauth"/> - <!-- <remoteRepository refid="boundary"/> --> </artifact:dependencies> <copy todir="${test.lib}/jars"> <fileset refid="test-dependency-jars"/> @@ -590,7 +587,6 @@ <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/4ee37210/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 deleted file mode 100644 index d184472..0000000 Binary files a/lib/high-scale-lib-1.0.5.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ee37210/lib/high-scale-lib-1.0.6.jar ---------------------------------------------------------------------- diff --git a/lib/high-scale-lib-1.0.6.jar b/lib/high-scale-lib-1.0.6.jar new file mode 100644 index 0000000..5269294 Binary files /dev/null and b/lib/high-scale-lib-1.0.6.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ee37210/lib/licenses/high-scale-lib-1.0.6.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/high-scale-lib-1.0.6.txt b/lib/licenses/high-scale-lib-1.0.6.txt new file mode 100644 index 0000000..6e69cdc --- /dev/null +++ b/lib/licenses/high-scale-lib-1.0.6.txt @@ -0,0 +1,29 @@ + +The person or persons who have associated work with this document (the +"Dedicator" or "Certifier") hereby either (a) certifies that, to the best +of his knowledge, the work of authorship identified is in the public +domain of the country from which the work is published, or (b) hereby +dedicates whatever copyright the dedicators holds in the work of +authorship identified below (the "Work") to the public domain. A +certifier, moreover, dedicates any copyright interest he may have in the +associated work, and for these purposes, is described as a "dedicator" +below. + +A certifier has taken reasonable steps to verify the copyright status of +this work. Certifier recognizes that his good faith efforts may not +shield him from liability if in fact the work certified is not in the +public domain. + +Dedicator makes this dedication for the benefit of the public at large and +to the detriment of the Dedicator's heirs and successors. Dedicator +intends this dedication to be an overt act of relinquishment in perpetuity +of all present and future rights under copyright law, whether vested or +contingent, in the Work. Dedicator understands that such relinquishment of +all rights includes the relinquishment of all rights to enforce (by +lawsuit or otherwise) those copyrights in the Work. + +Dedicator recognizes that, once placed in the public domain, the Work may +be freely reproduced, distributed, transmitted, used, modified, built +upon, or otherwise exploited by anyone for any purpose, commercial or +non-commercial, and in any way, including by methods that have not yet +been invented or conceived. http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ee37210/lib/licenses/high-scale-lib-1.1.2.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/high-scale-lib-1.1.2.txt b/lib/licenses/high-scale-lib-1.1.2.txt deleted file mode 100644 index 6e69cdc..0000000 --- a/lib/licenses/high-scale-lib-1.1.2.txt +++ /dev/null @@ -1,29 +0,0 @@ - -The person or persons who have associated work with this document (the -"Dedicator" or "Certifier") hereby either (a) certifies that, to the best -of his knowledge, the work of authorship identified is in the public -domain of the country from which the work is published, or (b) hereby -dedicates whatever copyright the dedicators holds in the work of -authorship identified below (the "Work") to the public domain. A -certifier, moreover, dedicates any copyright interest he may have in the -associated work, and for these purposes, is described as a "dedicator" -below. - -A certifier has taken reasonable steps to verify the copyright status of -this work. Certifier recognizes that his good faith efforts may not -shield him from liability if in fact the work certified is not in the -public domain. - -Dedicator makes this dedication for the benefit of the public at large and -to the detriment of the Dedicator's heirs and successors. Dedicator -intends this dedication to be an overt act of relinquishment in perpetuity -of all present and future rights under copyright law, whether vested or -contingent, in the Work. Dedicator understands that such relinquishment of -all rights includes the relinquishment of all rights to enforce (by -lawsuit or otherwise) those copyrights in the Work. - -Dedicator recognizes that, once placed in the public domain, the Work may -be freely reproduced, distributed, transmitted, used, modified, built -upon, or otherwise exploited by anyone for any purpose, commercial or -non-commercial, and in any way, including by methods that have not yet -been invented or conceived.