(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk

[smiklosovic]

This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit c4a7cf9e025cba99e39ff364fa2fdb3c72ab145a
Merge: 4a548b0f28 be96162f6c
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Thu Aug 28 11:48:13 2025 +0200

    Merge branch 'cassandra-5.0' into trunk

 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc build.xml
index e56d8badd7,fa4276d550..fb30ef5d4e
--- a/build.xml
+++ b/build.xml
@@@ -385,38 -359,26 +385,38 @@@
          </fileset>
      </path>
  
 -  <macrodef name="create-javadoc">
 -    <attribute name="destdir"/>
 -    <element name="filesets"/>
 -    <sequential>
 -      <javadoc destdir="@{destdir}" author="true" version="true" use="true"
 -        windowtitle="${ant.project.name} API" 
classpathref="cassandra.classpath"
 -        bottom="Copyright &amp;copy; 2009- The Apache Software Foundation"
 -        useexternalfile="yes" encoding="UTF-8" failonerror="false"
 -        maxmemory="1024m" additionalparam="${jdk11plus-javac-exports}">
 -        <filesets/>
 -      </javadoc>
 -      <fail message="javadoc failed">
 -        <condition>
 -            <not>
 -                <available file="@{destdir}/index-all.html" />
 -            </not>
 -        </condition>
 -      </fail>
 -    </sequential>
 -  </macrodef>
 +    <macrodef name="create-javadoc">
 +      <attribute name="destdir"/>
 +      <element name="filesets"/>
 +      <sequential>
 +        <javadoc destdir="@{destdir}" author="true" version="true" use="true"
 +          windowtitle="${ant.project.name} API" 
classpathref="cassandra.classpath"
 +          bottom="Copyright &amp;copy; 2009- The Apache Software Foundation"
 +          useexternalfile="yes" encoding="UTF-8" failonerror="false"
-           maxmemory="256m" additionalparam="${jdk11plus-javac-exports}">
++          maxmemory="1024m" additionalparam="${jdk11plus-javac-exports}">
 +          <filesets/>
 +        </javadoc>
 +        <fail message="javadoc failed">
 +          <condition>
 +              <not>
 +                  <available file="@{destdir}/index-all.html" />
 +              </not>
 +          </condition>
 +        </fail>
 +      </sequential>
 +    </macrodef>
 +
 +    <!-- filterset to apply to pom templates -->
 +    <filterset id="pom-template">
 +        <filter token="version" value="${version}"/>
 +        <filter token="final.name" value="${final.name}"/>
 +        <filter token="jamm.version" value="${jamm.version}"/>
 +        <filter token="allocation-instrumenter.version" 
value="${allocation-instrumenter.version}"/>
 +        <filter token="ecj.version" value="${ecj.version}"/>
 +        <filter token="asm.version" value="${asm.version}"/>
 +        <filter token="jacoco.version" value="${jacoco.version}"/>
 +        <filter token="jflex.version" value="${jflex.version}"/>
 +    </filterset>
  
      <!--
          Setup the output directories.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org