You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/01/28 06:58:54 UTC
[cassandra] branch cassandra-3.11 updated (7819eb9 -> d71625a)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 7819eb9 Merge branch 'cassandra-3.0' into cassandra-3.11
new 06a3604 Source and build artifacts are published with sha512 checksums
new 5508fec Merge branch 'cassandra-2.2' into cassandra-3.0
new d71625a Merge branch 'cassandra-3.0' into cassandra-3.11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 88 +++++++++++++++++++++++++++------------------------------------
1 file changed, 37 insertions(+), 51 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d71625a42ec7c29c5e9446bfa4c37719356193f0
Merge: 7819eb9 5508fec
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Jan 28 07:56:03 2020 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
build.xml | 88 +++++++++++++++++++++++++++------------------------------------
1 file changed, 37 insertions(+), 51 deletions(-)
diff --cc build.xml
index 213ebb8,98c22a5..7deef1e
--- a/build.xml
+++ b/build.xml
@@@ -660,22 -627,17 +681,12 @@@
<dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"/>
<dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift"/>
- </artifact:pom>
- <artifact:pom id="clientutil-pom"
- artifactId="cassandra-clientutil"
- url="https://cassandra.apache.org"
- name="Apache Cassandra">
- <parent groupId="org.apache.cassandra"
- artifactId="cassandra-parent"
- version="${version}"/>
- <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
- <dependency groupId="com.google.guava" artifactId="guava"/>
+ <dependency groupId="com.carrotsearch" artifactId="hppc" version="0.5.4" />
+ <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" />
+ <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
+ <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
+
</artifact:pom>
- <artifact:pom id="dist-pom"
- artifactId="apache-cassandra"
- packaging="pom"
- url="https://cassandra.apache.org"
- name="Apache Cassandra">
- <parent groupId="org.apache.cassandra"
- artifactId="cassandra-parent"
- version="${version}"/>
- <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
- </artifact:pom>
</target>
<target name="maven-ant-tasks-retrieve-build" depends="maven-declare-dependencies" unless="without.maven">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org