You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2021/04/27 08:36:27 UTC
[cassandra] branch trunk updated (f5a0c4c -> 9cda055)
This is an automated email from the ASF dual-hosted git repository.
samt pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from f5a0c4c Merge branch 'cassandra-3.11' into trunk
new 5be6d7e Only include versioned files in rat-report
new ad2f41e Merge branch 'cassandra-2.2' into cassandra-3.0
new 87a46c3 Merge branch 'cassandra-3.0' into cassandra-3.11
new 9cda055 Merge branch 'cassandra-3.11' into trunk
The 4 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/build-rat.xml | 102 +++++++++++----------
.build/build-resolver.xml | 30 +++---
build.xml | 32 +++----
doc/source/_templates/indexcontent.html | 16 ++++
doc/source/_theme/cassandra_theme/defindex.html | 16 ++++
doc/source/_theme/cassandra_theme/layout.html | 16 ++++
doc/source/_theme/cassandra_theme/search.html | 16 ++++
.../org/apache/cassandra/stress/graph/graph.html | 17 +++-
8 files changed, 163 insertions(+), 82 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.11' into trunk
Posted by sa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9cda055faaef6ff2f591ad2815139b9c89882514
Merge: f5a0c4c 87a46c3
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Tue Apr 27 09:26:45 2021 +0100
Merge branch 'cassandra-3.11' into trunk
.build/build-rat.xml | 102 +++++++++++----------
.build/build-resolver.xml | 30 +++---
build.xml | 32 +++----
doc/source/_templates/indexcontent.html | 16 ++++
doc/source/_theme/cassandra_theme/defindex.html | 16 ++++
doc/source/_theme/cassandra_theme/layout.html | 16 ++++
doc/source/_theme/cassandra_theme/search.html | 16 ++++
.../org/apache/cassandra/stress/graph/graph.html | 17 +++-
8 files changed, 163 insertions(+), 82 deletions(-)
diff --cc .build/build-rat.xml
index cf8d6fc,4a6ebfc..02f8750
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@@ -1,34 -1,34 +1,28 @@@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ https://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<project basedir="." name="apache-cassandra--rat-tasks"
- xmlns:artifact="antlib:org.apache.maven.artifact.ant"
- xmlns:rat="antlib:org.apache.rat.anttasks">
+ xmlns:rat="antlib:org.apache.rat.anttasks">
<!--
License audit tool
-->
- <condition property="rat.enabled">
- <available file=".gitignore" />
- </condition>
-
- <target name="_rat_init" depends="maven-ant-tasks-init">
- <artifact:dependencies pathId="rat.classpath">
- <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
- <remoteRepository refid="central"/>
- <remoteRepository refid="apache"/>
- </artifact:dependencies>
+ <target name="_rat_init" depends="resolver-init">
<typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
</target>
@@@ -75,4 -87,18 +81,4 @@@
</condition>
</fail>
</target>
- </project>
-
- <target name="_write_java_license_headers" depends="_rat_init">
- <java classname="org.apache.rat.Report" fork="true"
- output="${build.dir}/rat-report.log">
- <classpath refid="rat.classpath" />
- <arg value="-a" />
- <arg value="--force" />
- <arg value="interface/thrift" />
- </java>
- </target>
-
- <target name="write-java-license-headers" unless="without.rat" description="Add missing java license headers">
- <antcall target="_write_java_license_headers" />
- </target>
+ </project>
diff --cc .build/build-resolver.xml
index 793937d,0000000..888f4b9
mode 100644,000000..100644
--- a/.build/build-resolver.xml
+++ b/.build/build-resolver.xml
@@@ -1,264 -1,0 +1,262 @@@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ https://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
++ Licensed to the Apache Software Foundation (ASF) under one or more
++ contributor license agreements. See the NOTICE file distributed with
++ this work for additional information regarding copyright ownership.
++ The ASF licenses this file to You under the Apache License, Version 2.0
++ (the "License"); you may not use this file except in compliance with
++ the License. You may obtain a copy of the License at
++
++ http://www.apache.org/licenses/LICENSE-2.0
++
++ Unless required by applicable law or agreed to in writing, software
++ distributed under the License is distributed on an "AS IS" BASIS,
++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ See the License for the specific language governing permissions and
++ limitations under the License.
+-->
+<project basedir="." name="apache-cassandra--resolver-tasks"
+ xmlns:resolver="antlib:org.apache.maven.resolver.ant"
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless">
+
+ <!-- details of what version of Resolver ANT Tasks to fetch -->
+ <property name="resolver-ant-tasks.version" value="1.3.0" />
+ <property name="resolver-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
+ <property name="resolver-ant-tasks.url" value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks" />
+ <condition property="resolver-ant-tasks.jar.exists">
+ <available file="${resolver-ant-tasks.local}" />
+ </condition>
+
+ <property name="artifact.python.pypi" value="https://files.pythonhosted.org/packages" />
+ <property name="artifact.github.release" value="https://github.com" />
+
+ <!-- some artifacts are fetched from github as blobs; these are all in the cassandra project, but in an older commit -->
+ <property name="lib.download.sha" value="1371883db3d8bf7d7c54e0baaca89c6c2d2a5abe"/>
+ <property name="lib.download.base.url" value="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}" />
+ <property name="lib.download.url.postfix" value="" />
+
+ <path id="resolver-ant-tasks.classpath" path="${resolver-ant-tasks.local}" />
+
+ <!--
+ Fetch Resolver Ant Tasks and Cassandra's dependencies.
+ -->
+
+ <target name="_resolver_download" unless="resolver-ant-tasks.jar.exists" description="Fetch Resolver ANT Tasks from Maven Central Repository">
+ <echo>Downloading Resolver ANT Tasks...</echo>
+ <mkdir dir="${user.home}/.m2/repository/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
+
+ <get src="${resolver-ant-tasks.url}/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}-uber.jar"
+ dest="${resolver-ant-tasks.local}" usetimestamp="true" quiet="true"/>
+ </target>
+
+ <target name="resolver-init" depends="init,_resolver_download" unless="resolver-ant-tasks.initialized" description="Initialize Resolver ANT Tasks">
+
+ <typedef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="resolver-ant-tasks.classpath" />
+ <resolver:remoterepos id="all">
+ <remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
+ <remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
+ </resolver:remoterepos>
+
+ <macrodef name="resolve">
+ <!--
+ maven-resolver-ant-tasks's resolve logic doesn't have retry logic and does not respect settings.xml,
+ this causes issues when overriding maven central is required (such as when behind a corporate firewall);
+ it is critical to always provide the 'all' remoterepos to override resolve's default hard coded logic.
+
+ This macro simplifies this logic by centralizing retries and forcing the remoterepo 'all' to be used.
+ -->
+ <attribute name="failonmissingattachments" default="true"/>
+ <element name="elements" implicit="yes"/>
+ <sequential>
+ <retry retrycount="3">
+ <resolver:resolve failonmissingattachments="@{failonmissingattachments}">
+ <resolver:remoterepos refid="all"/>
+ <elements/>
+ </resolver:resolve>
+ </retry>
+ </sequential>
+ </macrodef>
+ <macrodef name="resolvepom">
+ <attribute name="file"/>
+ <attribute name="id"/>
+ <element name="elements" implicit="yes" optional="yes"/>
+ <sequential>
+ <retry retrycount="3">
+ <resolver:pom file="@{file}" id="@{id}">
+ <remoterepos refid="all"/>
+ <elements/>
+ </resolver:pom>
+ </retry>
+ </sequential>
+ </macrodef>
+
+ <resolve>
+ <dependencies>
+ <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
+ <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
+ </dependencies>
+ <path refid="wikitext.classpath" classpath="runtime"/>
+ </resolve>
+ <resolve>
+ <dependencies>
+ <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
+ </dependencies>
+ <path refid="rat.classpath" classpath="runtime"/>
+ </resolve>
+ <resolve>
+ <dependencies>
+ <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" />
+ </dependencies>
+ <path refid="jacocoant.classpath" classpath="runtime"/>
+ </resolve>
+ <resolve>
+ <dependencies>
+ <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/>
+ <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/>
+ <dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
+ </dependencies>
+ <path refid="cql3-grammar.classpath" classpath="runtime"/>
+ </resolve>
+ <resolve>
+ <dependencies>
+ <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}" />
+ </dependencies>
+ <path refid="jflex.classpath" classpath="runtime"/>
+ </resolve>
+
+ <macrodef name="install">
+ <attribute name="pomFile"/>
+ <attribute name="file"/>
+ <attribute name="classifier" default=""/>
+ <attribute name="packaging" default="jar"/>
+ <sequential>
+ <exec dir="." executable="sh">
+ <arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="deploy">
+ <attribute name="pomFile"/>
+ <attribute name="file"/>
+ <attribute name="classifier" default=""/>
+ <attribute name="packaging" default="jar"/>
+ <sequential>
+ <exec dir="." executable="sh">
+ <arg line="-c 'mvn org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -DretryFailedDeploymentCount=5 -Durl=${maven-repository-url} -DrepositoryId=${maven-repository-id} -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="sign-dist">
+ <attribute name="file"/>
+ <sequential>
+ <echo message="gpg signing @{file}" />
+ <exec dir="." executable="sh">
+ <!-- dummy out the deploy parameters, only the signing is required here -->
+ <arg line="-c 'mvn -q org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -Dfile=@{file} -DgroupId=org.apache.cassandra -DartifactId=cassandra-parent -Dversion=${version} -Durl=file:///tmp/ -DrepositoryId=tmp'" />
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <property name="resolver-ant-tasks.initialized" value="true"/>
+ </target>
+
+ <target name="resolver-retrieve-build" depends="resolver-init,write-poms">
+ <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
+ <resolvepom file="${build.dir}/tmp-${final.name}-deps.pom" id="pom-deps" />
+
+ <resolve>
+ <dependencies pomRef="all-pom"/>
+ <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,provided,!system"/>
+ </resolve>
+ <resolve>
+ <dependencies pomRef="pom-deps"/>
+ <files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="test,!provide,!system"/>
+ </resolve>
+
+
+ <!-- jacoco agent jar comes wrapped in a jar -->
+ <unzip src="${user.home}/.m2/repository/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}.jar" dest="${build.dir.lib}/jars">
+ <patternset>
+ <include name="*.jar"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ </target>
+
+ <target name="resolver-dist-lib" depends="resolver-retrieve-build,write-poms">
+ <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
+
+ <resolve failOnMissingAttachments="true">
+ <dependencies pomRef="all-pom"/>
+ <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
+ </resolve>
+ <mkdir dir="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin"/>
+ <mkdir dir="${build.lib}/sigar-bin"/>
+
+ <!-- files.pythonhosted.org -->
+ <get src="${artifact.python.pypi}/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+ <get src="${artifact.python.pypi}/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+
+ <!-- apache/cassandra/lib -->
+ <get src="${lib.download.base.url}/lib/geomet-0.1.0.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/geomet-0.1.0.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+ <get dest="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-solaris.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-hpux-11.sl"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-pa-hpux-11.sl"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-aix-5.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-aix-5.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64le-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-s390x-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc-solaris.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc64-solaris.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal-macosx.dylib"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal64-macosx.dylib"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-5.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-6.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-linux.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-solaris.so"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/sigar-amd64-winnt.dll"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.dll"/>
+ <url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.lib"/>
+ </get>
+
+ <copy todir="${build.lib}" quiet="true">
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/geomet-0.1.0.zip"/>
+ </copy>
+ <copy todir="${build.lib}/sigar-bin/" quiet="true">
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-solaris.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-hpux-11.sl"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-pa-hpux-11.sl"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-aix-5.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-aix-5.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64le-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-s390x-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-sparc-solaris.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-sparc64-solaris.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-universal-macosx.dylib"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-universal64-macosx.dylib"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-5.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-6.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-amd64-winnt.dll"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.dll"/>
+ <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
+ </copy>
+ </target>
+</project>
diff --cc build.xml
index 932c18a,a1aa1ea..566604d
--- a/build.xml
+++ b/build.xml
@@@ -1,26 -1,22 +1,24 @@@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ https://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<project basedir="." default="jar" name="apache-cassandra"
- xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant"
+ xmlns:if="ant:if"
+ xmlns:unless="ant:unless">
<property environment="env"/>
<property file="build.properties" />
<property file="build.properties.default" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org