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:51 UTC
[cassandra] branch cassandra-2.2 updated: Source and build
artifacts are published with sha512 checksums
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push:
new 06a3604 Source and build artifacts are published with sha512 checksums
06a3604 is described below
commit 06a36045fe3dcf07205e2649b2e5eaf0daff5164
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed Nov 13 14:32:30 2019 +0100
Source and build artifacts are published with sha512 checksums
patch by Mick Semb Wever; reviewed by Michael Shuler for CASSANDRA-14970
---
build.xml | 90 +++++++++++++++++++++++++++------------------------------------
1 file changed, 39 insertions(+), 51 deletions(-)
diff --git a/build.xml b/build.xml
index c307e26..a55709d 100644
--- a/build.xml
+++ b/build.xml
@@ -305,7 +305,7 @@
<sequential>
<artifact:mvn mavenVersion="${maven.version}" fork="true" failonerror="true">
<jvmarg value="-Xmx512m"/>
- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file" />
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file" />
<arg value="-DretryFailedDeploymentCount=5" />
<arg value="-Durl=${maven-repository-url}" />
<arg value="-DrepositoryId=${maven-repository-id}" />
@@ -313,7 +313,25 @@
<arg value="-Dfile=@{file}" />
<arg value="-Dclassifier=@{classifier}" />
<arg value="-Dpackaging=@{packaging}" />
- <arg value="-Papache-release" />
+ </artifact:mvn>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="sign-dist">
+ <attribute name="file"/>
+ <sequential>
+ <echo message="gpg signing @{file}" />
+ <artifact:mvn mavenVersion="${maven.version}" fork="true" failonerror="true">
+ <jvmarg value="-Xmx512m"/>
+ <arg value="-q" />
+ <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file" />
+ <arg value="-Dfile=@{file}" />
+ <arg value="-DgroupId=org.apache.cassandra" />
+ <arg value="-DartifactId=cassandra-parent" />
+ <arg value="-Dversion=${version}" />
+ <!-- intentionally dummy out the deploy step -->
+ <arg value="-Durl=file:///tmp/" />
+ <arg value="-DrepositoryId=tmp" />
</artifact:mvn>
</sequential>
</macrodef>
@@ -336,6 +354,9 @@
name="Apache Cassandra"
inceptionYear="2009"
description="The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model.">
+
+ <!-- Inherit from the ASF template pom file, ref http://maven.apache.org/pom/asf/ -->
+ <parent groupId="org.apache" artifactId="apache" version="22"/>
<license name="The Apache Software License, Version 2.0" url="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
<scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
<dependencyManagement>
@@ -643,16 +664,6 @@
<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">
@@ -1104,8 +1115,7 @@
<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">
@@ -1157,23 +1167,22 @@
<exclude name="bin/*.bat" />
</tarfileset>
</tar>
- </target>
- <target name="release" depends="eclipse-warnings,artifacts,rat-init"
- description="Create and QC release artifacts">
- <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha256"
- algorithm="SHA-256">
+ <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha256" algorithm="SHA-256">
<fileset dir="${build.dir}">
- <include name="*.tar.gz" />
+ <include name="${final.name}-bin.tar.gz" />
+ <include name="${final.name}-src.tar.gz" />
</fileset>
</checksum>
- <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha512"
- algorithm="SHA-512">
+ <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha512" algorithm="SHA-512">
<fileset dir="${build.dir}">
- <include name="*.tar.gz" />
+ <include name="${final.name}-bin.tar.gz" />
+ <include name="${final.name}-src.tar.gz" />
</fileset>
</checksum>
+ </target>
+ <target name="rat" depends="rat-init" description="License checks on artifacts">
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
reportFile="${build.dir}/${final.name}-bin.rat.txt">
<tarfileset>
@@ -1182,7 +1191,6 @@
</gzipresource>
</tarfileset>
</rat:report>
-
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
reportFile="${build.dir}/${final.name}-src.rat.txt">
<tarfileset>
@@ -2036,7 +2044,7 @@
<!-- 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 -->
@@ -2044,19 +2052,6 @@
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 -->
<install pomFile="${build.dir}/${ant.project.name}-thrift-${version}.pom"
file="${build.dir}/${ant.project.name}-thrift-${version}.jar"/>
@@ -2097,19 +2092,6 @@
<deploy pomFile="${build.dir}/${final.name}-parent.pom"
file="${build.dir}/${final.name}-parent.pom"
packaging="pom"/>
-
- <!-- 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"
@@ -2130,6 +2112,7 @@
<deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
file="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar"
classifier="javadoc"/>
+
<!-- the cassandra-all jar -->
<deploy pomFile="${build.dir}/${final.name}.pom"
file="${build.dir}/${final.name}.jar"/>
@@ -2139,5 +2122,10 @@
<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