You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2023/02/22 16:26:13 UTC
[cassandra] branch cassandra-4.0 updated (3a4fff38b5 -> 1d532bce7b)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 3a4fff38b5 Ninja fix CASSANDRA-18242 - was not generating IDEA workspace for J11 correctly
new eb36a86a72 Removing trailing year from copyright.
new a5b05cea5e Merge branch 'cassandra-3.0' into cassandra-3.11
new 1d532bce7b Merge branch 'cassandra-3.11' into cassandra-4.0
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:
NOTICE.txt | 2 +-
build.xml | 2 +-
2 files changed, 2 insertions(+), 2 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 cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1d532bce7bb4cee8073a15a5b7572fc4d9ad8bcd
Merge: 3a4fff38b5 a5b05cea5e
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed Feb 22 10:25:08 2023 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
NOTICE.txt | 2 +-
build.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --cc build.xml
index e29a00363f,794444b28c..979b116ee7
--- a/build.xml
+++ b/build.xml
@@@ -306,18 -188,11 +306,18 @@@
<sequential>
<javadoc destdir="@{destdir}" author="true" version="true" use="true"
windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
- bottom="Copyright &copy; 2009-2022 The Apache Software Foundation"
+ bottom="Copyright &copy; 2009- The Apache Software Foundation"
- useexternalfile="yes" encoding="UTF-8"
- maxmemory="256m">
+ useexternalfile="yes" encoding="UTF-8" failonerror="false"
+ maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
<filesets/>
</javadoc>
+ <fail message="javadoc failed">
+ <condition>
+ <not>
+ <available file="@{destdir}/index-all.html" />
+ </not>
+ </condition>
+ </fail>
</sequential>
</macrodef>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org