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:52 UTC
[cassandra] branch cassandra-3.0 updated (b80e146 -> 5508fec)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from b80e146 Merge branch 'cassandra-2.2' into cassandra-3.0
new 06a3604 Source and build artifacts are published with sha512 checksums
new 5508fec Merge branch 'cassandra-2.2' into cassandra-3.0
The 2 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 | 90 +++++++++++++++++++++++++++------------------------------------
1 file changed, 38 insertions(+), 52 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-2.2' into cassandra-3.0
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.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5508fecf54a521792fa78345ad04c83de5ae3a82
Merge: b80e146 06a3604
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Jan 28 07:52:50 2020 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
build.xml | 90 +++++++++++++++++++++++++++------------------------------------
1 file changed, 38 insertions(+), 52 deletions(-)
diff --cc build.xml
index e543316,a55709d..98c22a5
--- a/build.xml
+++ b/build.xml
@@@ -617,17 -663,7 +638,6 @@@
<scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
<dependency groupId="com.google.guava" artifactId="guava"/>
</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">
@@@ -1057,8 -1115,7 +1067,6 @@@
<include name="*.jar" />
</fileset>
</copy>
- <artifact:writepom pomRefId="dist-pom"
- file="${build.dir}/${final.name}-dist.pom"/>
-
<tar compression="gzip" longfile="gnu"
destfile="${build.dir}/${final.name}-bin.tar.gz">
@@@ -2039,28 -2044,15 +2045,15 @@@
<!-- Publish artifacts to Maven repositories -->
<target name="mvn-install"
- depends="maven-declare-dependencies,artifacts,jar,sources-jar,javadoc-jar"
+ depends="maven-declare-dependencies,jar,sources-jar,javadoc-jar"
description="Installs the artifacts in the Maven Local Repository">
-
+
<!-- the parent -->
<install pomFile="${build.dir}/${final.name}-parent.pom"
file="${build.dir}/${final.name}-parent.pom"
packaging="pom"/>
- <!-- the distribution -->
- <install pomFile="${build.dir}/${final.name}-dist.pom"
- file="${build.dir}/${final.name}-dist.pom"
- packaging="pom"/>
- <install pomFile="${build.dir}/${final.name}-dist.pom"
- file="${build.dir}/${final.name}-bin.tar.gz"
- packaging="tar.gz"
- classifier="bin"/>
- <install pomFile="${build.dir}/${final.name}-dist.pom"
- file="${build.dir}/${final.name}-src.tar.gz"
- packaging="tar.gz"
- classifier="src"/>
-
- <!-- the cassandra-thrift jar -->
+ <!-- the cassandra-thrift jar -->
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/>
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
@@@ -2100,21 -2092,8 +2093,8 @@@
<deploy pomFile="${build.dir}/${final.name}-parent.pom"
file="${build.dir}/${final.name}-parent.pom"
packaging="pom"/>
-
- <!-- the cassandra-thrift jar -->
+
- <!-- the distribution -->
- <deploy pomFile="${build.dir}/${final.name}-dist.pom"
- file="${build.dir}/${final.name}-dist.pom"
- packaging="pom"/>
- <deploy pomFile="${build.dir}/${final.name}-dist.pom"
- file="${build.dir}/${final.name}-bin.tar.gz"
- packaging="tar.gz"
- classifier="bin"/>
- <deploy pomFile="${build.dir}/${final.name}-dist.pom"
- file="${build.dir}/${final.name}-src.tar.gz"
- packaging="tar.gz"
- classifier="src"/>
-
+ <!-- the cassandra-thrift jar -->
<deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/>
<deploy pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
@@@ -2142,6 -2122,10 +2123,11 @@@
<deploy pomFile="${build.dir}/${final.name}.pom"
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
+
+ <!-- the distribution -->
+ <sign-dist file="${build.dir}/${final.name}-bin.tar.gz" />
+ <sign-dist file="${build.dir}/${final.name}-src.tar.gz" />
+
</target>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org