Hi Damjan,

Am 06.11.23 um 18:50 schrieb Damjan Jovanovic:
I've now pushed commit 61a74f2854935294cdc5bceabf0de6a4347799ae which
changes that file to use <code> instead of <kbd>, which should work far
better, as it's already used in other javadoc comments.

Thanks, that sounds like a solution!

Buildbot is running now, let's see if it finishes.

Regards,

   Matthias


Regards
Damjan



On Sat, Nov 4, 2023 at 10:06 AM Matthias Seidel <matthias.sei...@hamburg.de>
wrote:

Hi All,

Of course, I could disable building of the SDK to get builds of trunk
again, but this does not solve the problem.

What do we want to do?!

Regards,

     Matthias

Am 31.10.23 um 22:25 schrieb Matthias Seidel:
Hi Damjan,

Am 29.10.23 um 16:44 schrieb dam...@apache.org:
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/trunk by this push:
       new 872b251390 The <tt> HTML tag ended with HTML 4, and newer
versions of javadoc (Java 17's at least) support HTML 5 tags only.
Use <kbd> instead.
This seems to break our buildbot (with Java 8) in module ODK:

https://ci2.apache.org/#/builders/58/builds/689

Regards,

    Matthias

872b251390 is described below

commit 872b2513907e4389be70e2d9b563f47e0d2c5a9f
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Sun Oct 29 17:42:38 2023 +0200

      The <tt> HTML tag ended with HTML 4, and newer versions of javadoc
      (Java 17's at least) support HTML 5 tags only. Use <kbd> instead.
           Patch by: me
---
   .../star/lib/uno/helper/InterfaceContainer.java    | 46
+++++++++++-----------
   1 file changed, 23 insertions(+), 23 deletions(-)

diff --git

a/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
b/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 1fe5cbdddd..9f362fb013 100644
---
a/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++
b/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -127,9 +127,9 @@ public class InterfaceContainer implements Cloneable
       }
             /**
-     * Trims the capacity of this <tt>ArrayList</tt> instance to be the
+     * Trims the capacity of this <kbd>ArrayList</kbd> instance to
be the
        * list's current size.  An application can use this operation
to minimize
-     * the storage of an <tt>ArrayList</tt> instance.
+     * the storage of an <kbd>ArrayList</kbd> instance.
        */
       synchronized public void trimToSize()
       {
@@ -143,7 +143,7 @@ public class InterfaceContainer implements Cloneable
       }
             /**
-     * Increases the capacity of this <tt>ArrayList</tt> instance, if
+     * Increases the capacity of this <kbd>ArrayList</kbd> instance, if
        * necessary, to ensure  that it can hold at least the number
of elements
        * specified by the minimum capacity argument.
        *
@@ -167,7 +167,7 @@ public class InterfaceContainer implements Cloneable
        * Appends the specified element to the end of this list.
        *
        * @param o element to be appended to this list.
-     * @return <tt>true</tt> (as per the general contract of
Collection.add).
+     * @return <kbd>true</kbd> (as per the general contract of
Collection.add).
        */
       synchronized public boolean add(Object o)
       {
@@ -189,7 +189,7 @@ public class InterfaceContainer implements Cloneable
        * @param index index at which the specified element is to be
inserted.
        * @param element element to be inserted.
        * @throws    IndexOutOfBoundsException if index is out of range
-     *          <tt>(index &lt; 0 || index &gt; size())</tt>.
+     *          <kbd>(index &lt; 0 || index &gt; size())</kbd>.
        */
       synchronized public void add(int index, Object element)
       {
@@ -218,8 +218,8 @@ public class InterfaceContainer implements Cloneable
        * list is nonempty.)
        *
        * @param c the elements to be inserted into this list.
-     * @throws    IndexOutOfBoundsException if index out of range
<tt>(index
-     *          &lt; 0 || index &gt; size())</tt>.
+     * @throws    IndexOutOfBoundsException if index out of range
<kbd>(index
+     *          &lt; 0 || index &gt; size())</kbd>.
        */
       synchronized public boolean addAll(Collection c)
       {
@@ -246,8 +246,8 @@ public class InterfaceContainer implements Cloneable
        * @param index index at which to insert first element
        *            from the specified collection.
        * @param c elements to be inserted into this list.
-     * @throws    IndexOutOfBoundsException if index out of range
<tt>(index
-     *          &lt; 0 || index &gt; size())</tt>.
+     * @throws    IndexOutOfBoundsException if index out of range
<kbd>(index
+     *          &lt; 0 || index &gt; size())</kbd>.
        */
       synchronized public boolean addAll(int index, Collection c)
       {
@@ -302,7 +302,7 @@ public class InterfaceContainer implements Cloneable
           }
       }
       /**
-     * Returns <tt>true</tt> if this list contains the specified
element.
+     * Returns <kbd>true</kbd> if this list contains the specified
element.
        *
        * @param elem element whose presence in this List is to be
tested.
        */
@@ -334,8 +334,8 @@ public class InterfaceContainer implements Cloneable
        *
        * @param  index index of element to return.
        * @return the element at the specified position in this list.
-     * @throws    IndexOutOfBoundsException if index is out of range
<tt>(index
-     *           &lt; 0 || index &gt;= size())</tt>.
+     * @throws    IndexOutOfBoundsException if index is out of range
<kbd>(index
+     *           &lt; 0 || index &gt;= size())</kbd>.
        */
       synchronized public Object get(int index)
       {
@@ -349,11 +349,11 @@ public class InterfaceContainer implements
Cloneable
             /**
        * Searches for the first occurrence of the given argument,
testing
-     * for equality using the <tt>equals</tt> method.
+     * for equality using the <kbd>equals</kbd> method.
        *
        * @param   elem   an object.
        * @return  the index of the first occurrence of the argument
in this
-     *          list; returns <tt>-1</tt> if the object is not found.
+     *          list; returns <kbd>-1</kbd> if the object is not found.
        * @see     Object#equals(Object)
        */
       synchronized public int indexOf(Object elem)
@@ -387,8 +387,8 @@ public class InterfaceContainer implements Cloneable
       /**
        * Tests if this list has no elements.
        *
-     * @return  <tt>true</tt> if this list has no elements;
-     *          <tt>false</tt> otherwise.
+     * @return  <kbd>true</kbd> if this list has no elements;
+     *          <kbd>false</kbd> otherwise.
        */
       synchronized public boolean isEmpty()
       {
@@ -441,10 +441,10 @@ public class InterfaceContainer implements
Cloneable
       }
             /**
-     * Returns a shallow copy of this <tt>ArrayList</tt> instance.
The contained
+     * Returns a shallow copy of this <kbd>ArrayList</kbd> instance.
The contained
        * references are copied but the objects not.
        *
-     * @return  a clone of this <tt>List</tt> instance.
+     * @return  a clone of this <kbd>List</kbd> instance.
        */
       synchronized public Object clone()
       {
@@ -486,8 +486,8 @@ public class InterfaceContainer implements Cloneable
        *
        * @param index the index of the element to removed.
        * @return the element that was removed from the list.
-     * @throws    IndexOutOfBoundsException if index out of range
<tt>(index
-     *           &lt; 0 || index &gt;= size())</tt>.
+     * @throws    IndexOutOfBoundsException if index out of range
<kbd>(index
+     *           &lt; 0 || index &gt;= size())</kbd>.
        */
       synchronized public Object remove(int index)
       {
@@ -598,7 +598,7 @@ public class InterfaceContainer implements Cloneable
        * @param element element to be stored at the specified position.
        * @return the element previously at the specified position.
        * @throws    IndexOutOfBoundsException if index out of range
-     *          <tt>(index &lt; 0 || index &gt;= size())</tt>.
+     *          <kbd>(index &lt; 0 || index &gt;= size())</kbd>.
        */
       synchronized public Object set(int index, Object element)
       {
@@ -653,9 +653,9 @@ public class InterfaceContainer implements Cloneable
        * If the list fits in the specified array with room to spare
(i.e., the
        * array has more elements than the list), the element in the
array
        * immediately following the end of the collection is set to
-     * <tt>null</tt>.  This is useful in determining the length of
the list
+     * <kbd>null</kbd>.  This is useful in determining the length of
the list
        * <i>only</i> if the caller knows that the list does not
contain any
-     * <tt>null</tt> elements.
+     * <kbd>null</kbd> elements.
        *
        * @param a the array into which the elements of the list are to
        *        be stored, if it is big enough; otherwise, a new
array of the

Attachment: smime.p7s
Description: Kryptografische S/MIME-Signatur

Reply via email to