[FOray-commit] SF.net SVN: foray:[12744] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2022-11-27 20:02:18
|
Revision: 12744
http://sourceforge.net/p/foray/code/12744
Author: victormote
Date: 2022-11-27 20:02:15 +0000 (Sun, 27 Nov 2022)
Log Message:
-----------
Upgrade Mockito. Fix compile problem related to Mockito version by using 1.8 compiler. Fixed a handful of javadoc problems related to the compiler change.
Modified Paths:
--------------
trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java
Modified: trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle
===================================================================
--- trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle 2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/buildSrc/src/main/groovy/foray.common-conventions.gradle 2022-11-27 20:02:15 UTC (rev 12744)
@@ -42,7 +42,7 @@
icu4j: '72.1', // Latest is 72.1 as of 2022-11-26.
junit: '5.9.1', // Latest is 5.9.1 as of 2022-11-26.
- mockito: '4.5.1', // Latest is 4.9.0 as of 2022-11-26. See Note 5.
+ mockito: '4.9.0', // Latest is 4.9.0 as of 2022-11-26. See Note 5.
/* Runtime-only dependencies that should never be permanently used in build.gradle files. They are included here
@@ -68,8 +68,9 @@
* "jeuclid-core" and the same general release numbering sequence.
* The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.
*
- * 5. Mockito versions from 4.6.0 to 4.9.0 cause breakage in FOray code for unknown reasons that need to be
- * researched.
+ * 5. Mockito versions from 4.6.0 to 4.9.0 cause breakage at build time for reasons that seem to be related to the
+ * Java version used to start Gradle. For now, using a JDK that matches the javaTargetCompatibility value above
+ * seems to solve the problem.
*/
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java 2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/i18n/Script4a.java 2022-11-27 20:02:15 UTC (rev 12744)
@@ -350,8 +350,8 @@
/**
* Constructor.
* Client code should not ordinarily use this constructor, but should use {@link #findFromAlpha(String)},
- * {@link #findFromNumeric(int)}, {@link #findFromIcu4jCode(int)}, or {@link #findFromUnicodeScript(UnicodeScript)}
- * to obtain an instance of this class.
+ * {@link #findFromNumeric(int)}, {@link #findFromIcu4jCode(int)}, or
+ * {@link #findFromUnicodeScript(java.lang.Character.UnicodeScript)} to obtain an instance of this class.
* If a new instance does need to be created, it must then be registered using {@link #register(Script4a)} for the
* methods mentioned above to be able to find it.
* @param alpha The ISO-15924 alpha code for this script.
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java 2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteArrayBuilder.java 2022-11-27 20:02:15 UTC (rev 12744)
@@ -60,8 +60,8 @@
* The maximum size of array to allocate (unless necessary).
* Some VMs reserve some header words in an array.
* Attempts to allocate larger arrays may result in OutOfMemoryError: Requested array size exceeds VM limit.
- * This value is based on {@link java.lang.AbstractStringBuilder}.MAX_ARRAY_SIZE.
- * @see java.lang.AbstractStringBuilder
+ * This value is based on the private constant java.lang.AbstractStringBuilder.MAX_ARRAY_SIZE.
+ * @see "The package-visible class java.lang.AbstractStringBuilder."
*/
public static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java 2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/CharArrayBuilder.java 2022-11-27 20:02:15 UTC (rev 12744)
@@ -48,8 +48,8 @@
* The maximum size of array to allocate (unless necessary).
* Some VMs reserve some header words in an array.
* Attempts to allocate larger arrays may result in OutOfMemoryError: Requested array size exceeds VM limit.
- * This value is based on {@link java.lang.AbstractStringBuilder}.MAX_ARRAY_SIZE.
- * @see java.lang.AbstractStringBuilder
+ * This value is based on the private constant java.lang.AbstractStringBuilder.MAX_ARRAY_SIZE.
+ * @see "The package-visible class java.lang.AbstractStringBuilder."
*/
public static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java 2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/LongArrayBuilder.java 2022-11-27 20:02:15 UTC (rev 12744)
@@ -150,7 +150,7 @@
* </ul>
* If the {@code minimumCapacity} argument is nonpositive, this method takes no action and simply returns.
* @param minimumCapacity The minimum desired capacity.
- * @see java.lang.AbstractStringBuilder#ensureCapacity(int)
+ * @see "java.lang.AbstractStringBuilder#ensureCapacity(int)"
*/
public void ensureCapacity(final int minimumCapacity) {
if (minimumCapacity > this.backingArray.length) {
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java 2022-11-27 16:07:39 UTC (rev 12743)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ShortArrayBuilder.java 2022-11-27 20:02:15 UTC (rev 12744)
@@ -131,7 +131,7 @@
* </ul>
* If the {@code minimumCapacity} argument is nonpositive, this method takes no action and simply returns.
* @param minimumCapacity The minimum desired capacity.
- * @see java.lang.AbstractStringBuilder#ensureCapacity(int)
+ * @see "java.lang.AbstractStringBuilder#ensureCapacity(int)"
*/
public void ensureCapacity(final int minimumCapacity) {
if (minimumCapacity > this.backingArray.length) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|