This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push: new e73816c Use 3.12.0 as the next version label. e73816c is described below commit e73816cb69ee7379b1db317ed9cec02df1b6128b Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Feb 21 20:36:21 2021 -0500 Use 3.12.0 as the next version label. Simplify site to use more general terms instead of the version number. --- .../java/org/apache/commons/lang3/ArraySorter.java | 2 +- .../org/apache/commons/lang3/BooleanUtils.java | 12 +++++----- .../java/org/apache/commons/lang3/JavaVersion.java | 2 +- .../java/org/apache/commons/lang3/LocaleUtils.java | 2 +- .../java/org/apache/commons/lang3/StringUtils.java | 8 +++---- .../java/org/apache/commons/lang3/SystemUtils.java | 10 ++++----- .../lang3/function/FailableShortSupplier.java | 2 +- .../org/apache/commons/lang3/function/Objects.java | 2 +- .../lang3/function/ToBooleanBiFunction.java | 2 +- .../org/apache/commons/lang3/text/StrBuilder.java | 2 +- .../org/apache/commons/lang3/time/StopWatch.java | 2 +- src/site/site.xml | 24 ++++++++++---------- src/site/xdoc/index.xml | 26 ++++++++-------------- 13 files changed, 44 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/ArraySorter.java b/src/main/java/org/apache/commons/lang3/ArraySorter.java index 55c53a6..2208bd9 100644 --- a/src/main/java/org/apache/commons/lang3/ArraySorter.java +++ b/src/main/java/org/apache/commons/lang3/ArraySorter.java @@ -22,7 +22,7 @@ import java.util.Comparator; /** * Sorts and returns arrays in the fluent style. * - * @since 3.12 + * @since 3.12.0 */ public class ArraySorter { diff --git a/src/main/java/org/apache/commons/lang3/BooleanUtils.java b/src/main/java/org/apache/commons/lang3/BooleanUtils.java index 1dfcdc2..f8b1e39 100644 --- a/src/main/java/org/apache/commons/lang3/BooleanUtils.java +++ b/src/main/java/org/apache/commons/lang3/BooleanUtils.java @@ -33,42 +33,42 @@ public class BooleanUtils { /** * The false String {@code "false"}. * - * @since 3.12 + * @since 3.12.0 */ public static final String FALSE = "false"; /** * The no String {@code "no"}. * - * @since 3.12 + * @since 3.12.0 */ public static final String NO = "no"; /** * The off String {@code "off"}. * - * @since 3.12 + * @since 3.12.0 */ public static final String OFF = "off"; /** * The on String {@code "on"}. * - * @since 3.12 + * @since 3.12.0 */ public static final String ON = "on"; /** * The true String {@code "true"}. * - * @since 3.12 + * @since 3.12.0 */ public static final String TRUE = "true"; /** * The yes String {@code "yes"}. * - * @since 3.12 + * @since 3.12.0 */ public static final String YES = "yes"; diff --git a/src/main/java/org/apache/commons/lang3/JavaVersion.java b/src/main/java/org/apache/commons/lang3/JavaVersion.java index 847be56..7b8f729 100644 --- a/src/main/java/org/apache/commons/lang3/JavaVersion.java +++ b/src/main/java/org/apache/commons/lang3/JavaVersion.java @@ -139,7 +139,7 @@ public enum JavaVersion { /** * Java 17. * - * @since 3.12 + * @since 3.12.0 */ JAVA_17(17.0f, "17"), diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java index f613de3..b57e3c0 100644 --- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java +++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java @@ -273,7 +273,7 @@ public class LocaleUtils { * * @param locale a locale or {@code null}. * @return the given locale if non-{@code null}, otherwise {@link Locale#getDefault()}. - * @since 3.12 + * @since 3.12.0 */ public static Locale toLocale(final Locale locale) { return locale != null ? locale : Locale.getDefault(); diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index 09450c2..cea878f 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -1162,7 +1162,7 @@ public class StringUtils { * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be * null as well. * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise - * @since 3.12 + * @since 3.12.0 */ private static boolean containsAny(final ToBooleanBiFunction<CharSequence, CharSequence> test, final CharSequence cs, final CharSequence... searchCharSequences) { @@ -1204,7 +1204,7 @@ public class StringUtils { * @param searchCharSequences The array of CharSequences to search for, may be null. Individual CharSequences may be * null as well. * @return {@code true} if any of the search CharSequences are found, {@code false} otherwise - * @since 3.12 + * @since 3.12.0 */ public static boolean containsAnyIgnoreCase(final CharSequence cs, final CharSequence... searchCharSequences) { return containsAny(StringUtils::containsIgnoreCase, cs, searchCharSequences); @@ -3881,7 +3881,7 @@ public class StringUtils { * @param delimiter * the separator character to use * @return the joined String, {@code null} if null array input - * @since 3.12 + * @since 3.12.0 */ public static String join(final boolean[] array, final char delimiter) { if (array == null) { @@ -3918,7 +3918,7 @@ public class StringUtils { * the index to stop joining from (exclusive). It is an error to pass in an end index past the end of * the array * @return the joined String, {@code null} if null array input - * @since 3.12 + * @since 3.12.0 */ public static String join(final boolean[] array, final char delimiter, final int startIndex, final int endIndex) { if (array == null) { diff --git a/src/main/java/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java index 6c21321..2a92a8d 100644 --- a/src/main/java/org/apache/commons/lang3/SystemUtils.java +++ b/src/main/java/org/apache/commons/lang3/SystemUtils.java @@ -1294,7 +1294,7 @@ public class SystemUtils { * The field will return {@code false} if {@code OS_NAME} is {@code null}. * </p> * - * @since 3.12 + * @since 3.12.0 */ public static final boolean IS_OS_MAC_OSX_SIERRA = getOsMatches("Mac OS X", "10.12"); @@ -1306,7 +1306,7 @@ public class SystemUtils { * The field will return {@code false} if {@code OS_NAME} is {@code null}. * </p> * - * @since 3.12 + * @since 3.12.0 */ public static final boolean IS_OS_MAC_OSX_HIGH_SIERRA = getOsMatches("Mac OS X", "10.13"); @@ -1318,7 +1318,7 @@ public class SystemUtils { * The field will return {@code false} if {@code OS_NAME} is {@code null}. * </p> * - * @since 3.12 + * @since 3.12.0 */ public static final boolean IS_OS_MAC_OSX_MOJAVE = getOsMatches("Mac OS X", "10.14"); @@ -1330,7 +1330,7 @@ public class SystemUtils { * The field will return {@code false} if {@code OS_NAME} is {@code null}. * </p> * - * @since 3.12 + * @since 3.12.0 */ public static final boolean IS_OS_MAC_OSX_CATALINA = getOsMatches("Mac OS X", "10.15"); @@ -1342,7 +1342,7 @@ public class SystemUtils { * The field will return {@code false} if {@code OS_NAME} is {@code null}. * </p> * - * @since 3.12 + * @since 3.12.0 */ public static final boolean IS_OS_MAC_OSX_BIG_SUR = getOsMatches("Mac OS X", "10.16"); diff --git a/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java b/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java index f27cf34..d6731e3 100644 --- a/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java +++ b/src/main/java/org/apache/commons/lang3/function/FailableShortSupplier.java @@ -23,7 +23,7 @@ import java.util.function.IntSupplier; * A functional interface like {@link IntSupplier} but for {@code short} that declares a {@code Throwable}. * * @param <E> Thrown exception. - * @since 3.12 + * @since 3.12.0 */ @FunctionalInterface public interface FailableShortSupplier<E extends Throwable> { diff --git a/src/main/java/org/apache/commons/lang3/function/Objects.java b/src/main/java/org/apache/commons/lang3/function/Objects.java index 0ba8361..9bec191 100755 --- a/src/main/java/org/apache/commons/lang3/function/Objects.java +++ b/src/main/java/org/apache/commons/lang3/function/Objects.java @@ -59,7 +59,7 @@ import org.apache.commons.lang3.ObjectUtils; * would have been to change the {@code ObjectUtils} class. However, that * would mean loosing upwards compatibility, and we don't do that.) * - * @since 3.12 + * @since 3.12.0 */ public class Objects { /** diff --git a/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java b/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java index d6769a4..09bdb73 100644 --- a/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java +++ b/src/main/java/org/apache/commons/lang3/function/ToBooleanBiFunction.java @@ -27,7 +27,7 @@ import java.util.function.BiFunction; * @param <U> the type of the second argument to the function. * * @see BiFunction - * @since 3.12 + * @since 3.12.0 */ @FunctionalInterface public interface ToBooleanBiFunction<T, U> { diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java index d9ec85f..7c53271 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java +++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java @@ -289,7 +289,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build * API of Collections. * * @return {@code true} if the size is greater than {@code 0}. - * @since 3.12 + * @since 3.12.0 */ public boolean isNotEmpty() { return size > 0; diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java index d3b9398..0912efe 100644 --- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java +++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java @@ -368,7 +368,7 @@ public class StopWatch { * @return the time this stopwatch was started in milliseconds, between the current time and midnight, January 1, * 1970 UTC. * @throws IllegalStateException if this StopWatch has not been started - * @since 3.12 + * @since 3.12.0 */ public long getStopTime() { if (this.runningState == State.UNSTARTED) { diff --git a/src/site/site.xml b/src/site/site.xml index b1f79b9..a08e5f0 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -24,21 +24,21 @@ <body> <menu name="Lang"> - <item name="Overview" href="/index.html"/> - <item name="Download" href="/download_lang.cgi"/> - <item name="Users guide" href="/userguide.html"/> - <item name="Release History" href="/changes-report.html"/> - <item name="Javadoc" href="javadocs/api-release/index.html"/> + <item name="Overview" href="/index.html" /> + <item name="Download" href="/download_lang.cgi" /> + <item name="Users guide" href="/userguide.html" /> + <item name="Release History" href="/changes-report.html" /> + <item name="Javadoc" href="/apidocs/index.html" /> + <item name="Javadoc Archive" href="https://javadoc.io/doc/org.apache.commons/commons-lang3" /> </menu> <menu name="Development"> - <item name="Building" href="/building.html"/> - <item name="Mailing Lists" href="/mail-lists.html"/> - <item name="Issue Tracking" href="/issue-tracking.html"/> - <item name="Proposal" href="/proposal.html"/> - <item name="Developer guide" href="/developerguide.html"/> - <item name="Source Repository" href="/scm.html"/> - <item name="Javadoc (GIT latest)" href="apidocs/index.html"/> + <item name="Building" href="/building.html" /> + <item name="Mailing Lists" href="/mail-lists.html" /> + <item name="Issue Tracking" href="/issue-tracking.html" /> + <item name="Proposal" href="/proposal.html" /> + <item name="Developer guide" href="/developerguide.html" /> + <item name="Source Repository" href="/scm.html" /> </menu> </body> diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 6408e4f..8365ca9 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -31,13 +31,14 @@ these extra methods. </p> <p> -Lang provides a host of helper utilities for the java.lang API, notably +Apache Commons Lang provides a host of helper utilities for the java.lang API, notably String manipulation methods, basic numerical methods, object reflection, concurrency, creation and serialization and System properties. Additionally it contains basic enhancements to java.util.Date and a series of utilities dedicated to help with building methods, such as hashCode, toString and equals. </p> <p> -Note that Lang 3.0 (and subsequent versions) use a different package (<em>org.apache.commons.lang3</em>) than the previous versions (<em>org.apache.commons.lang</em>), allowing it to be used at the same time as an earlier version. +Note that Commons Lang 3.0 (and subsequent versions) use a different package (<em>org.apache.commons.lang3</em>) than the previous versions (<em>org.apache.commons.lang</em>), +allowing Commons Lang 3 to be used at the same time as Commons Lang 2. </p> </section> <!-- ================================================== --> @@ -61,23 +62,14 @@ The <a href="scm.html">git repository</a> can be </section> <!-- ================================================== --> <section name="Release Information"> -<p>The latest stable release of Lang is 3.12. You may: </p> +<p>The latest stable release of Lang is 3.12.0: </p> <ul> -<li>Download <a href="https://commons.apache.org/lang/download_lang.cgi">3.12</a></li> -<li>Read the <a href="release-notes/RELEASE-NOTES-3.12.txt">3.12 release notes</a></li> -<li>Examine the <a href="article3_0.html">2.x to 3.0 upgrade notes</a></li> -<li>Compare major versions via the <a href="lang2-lang3-clirr-report.html">Lang2 to Lang3 Clirr report</a></li> +<li>Pull it using a build tool like Maven using a <a href="dependency-info.html">dependency management reference</a>.</li> +<li>Download the latest release from a <a href="https://commons.apache.org/lang/download_lang.cgi">mirror</a>.</li> +<li>Read the <a href="release-notes/RELEASE-NOTES-3.12.txt">release notes</a>.</li> +<li>Examine the <a href="article3_0.html">2.x to 3.0 upgrade notes</a>.</li> +<li>Compare major versions via the <a href="lang2-lang3-clirr-report.html">Lang2 to Lang3 Clirr report</a>.</li> </ul> -<p> -Alternatively you can pull it from the central Maven repositories: -<pre> -<dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.12</version> -</dependency> -</pre> -</p> <p> For information on previous releases see the <a href="changes-report.html">Release History</a>, and to download previous releases see the <a href="https://archive.apache.org/dist/commons/lang/">Commons Lang Archive</a>.