This is an automated email from the ASF dual-hosted git repository. mattjuntunen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push: new 8493023a simplifying version name from 2.8.0 to 2.8 8493023a is described below commit 8493023af135f65252f91748c46f967e743a2f0c Author: Matt Juntunen <mattjuntu...@apache.org> AuthorDate: Tue Jun 21 22:37:56 2022 -0400 simplifying version name from 2.8.0 to 2.8 --- pom.xml | 4 ++-- src/changes/changes.xml | 2 +- .../org/apache/commons/configuration2/ImmutableConfiguration.java | 8 ++++---- .../commons/configuration2/PropertiesConfigurationLayout.java | 6 +++--- .../configuration2/builder/FileBasedBuilderProperties.java | 2 +- .../apache/commons/configuration2/convert/PropertyConverter.java | 4 ++-- .../java/org/apache/commons/configuration2/io/FileHandler.java | 2 +- .../java/org/apache/commons/configuration2/io/FileSystem.java | 2 +- .../apache/commons/configuration2/io/URLConnectionOptions.java | 2 +- .../org/apache/commons/configuration2/tree/ImmutableNode.java | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index c5166324..43a33132 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>commons-configuration2</artifactId> - <version>2.8.0-SNAPSHOT</version> + <version>2.8-SNAPSHOT</version> <name>Apache Commons Configuration</name> <inceptionYear>2001</inceptionYear> @@ -560,7 +560,7 @@ <properties> <commons.componentid>configuration</commons.componentid> <commons.module.name>org.apache.commons.configuration2</commons.module.name> - <commons.release.version>2.8.0</commons.release.version> + <commons.release.version>2.8</commons.release.version> <commons.release.desc>(reworked 2.x version)</commons.release.desc> <commons.release.2.name>commons-configuration-${commons.release.2.version}</commons.release.2.name> <commons.release.2.version>1.10</commons.release.2.version> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2c416023..822c4b3a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -21,7 +21,7 @@ <author email="d...@commons.apache.org">Apache Commons Community</author> </properties> <body> - <release version="2.8.0" date="2020-MM-DD" + <release version="2.8" date="2020-MM-DD" description="Minor release with new features and updated dependencies."> <!-- FIX --> <action issue="CONFIGURATION-753" type="fix" dev="mattjuntunen"> diff --git a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java index a3171197..2f388163 100644 --- a/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java +++ b/src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java @@ -318,7 +318,7 @@ public interface ImmutableConfiguration { * @return The associated Duration if key is found and has valid format, default value otherwise. * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Duration. - * @since 2.8.0 + * @since 2.8 */ default Duration getDuration(final String key) { final String string = getString(key); @@ -336,7 +336,7 @@ public interface ImmutableConfiguration { * @return The associated Duration if key is found and has valid format, default value otherwise. * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Duration. - * @since 2.8.0 + * @since 2.8 */ default Duration getDuration(final String key, final Duration defaultValue) { final Object value = getProperty(key); @@ -378,7 +378,7 @@ public interface ImmutableConfiguration { * * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * String. - * @since 2.8.0 + * @since 2.8 */ default <T extends Enum<T>> T getEnum(final String key, final Class<T> enumType) { try { @@ -400,7 +400,7 @@ public interface ImmutableConfiguration { * * @throws org.apache.commons.configuration2.ex.ConversionException is thrown if the key maps to an object that is not a * Enum. - * @since 2.8.0 + * @since 2.8 */ default <T extends Enum<T>> T getEnum(final String key, final Class<T> enumType, final T defaultValue) { final String strValue = getString(key, null); diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java index b0f3fe62..6cf2f033 100644 --- a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java +++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java @@ -228,7 +228,7 @@ public class PropertiesConfigurationLayout implements EventListener<Configuratio * * @param key the property key * @param number the number of blank lines to add before this property definition - * @since 2.8.0 + * @since 2.8 */ public void setBlankLinesBefore(final String key, final int number) { fetchLayoutData(key).setBlankLines(number); @@ -772,7 +772,7 @@ public class PropertiesConfigurationLayout implements EventListener<Configuratio * Returns the number of blank lines before this property. * * @return the number of blank lines before this property - * @since 2.8.0 + * @since 2.8 */ public int getBlankLines() { return blankLines; @@ -793,7 +793,7 @@ public class PropertiesConfigurationLayout implements EventListener<Configuratio * Sets the number of properties before this property. * * @param blankLines the number of properties before this property - * @since 2.8.0 + * @since 2.8 */ public void setBlankLines(final int blankLines) { this.blankLines = blankLines; diff --git a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java index 90356601..218479b8 100644 --- a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java +++ b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java @@ -121,7 +121,7 @@ public interface FileBasedBuilderProperties<T> { * @param url the {@code URL} location * @param urlConnectionOptions options * @return a reference to this object for method chaining - * @since 2.8.0 + * @since 2.8 */ default T setURL(final URL url, final URLConnectionOptions urlConnectionOptions) { return setURL(url); diff --git a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java index 255bedab..261c248b 100644 --- a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java +++ b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java @@ -48,7 +48,7 @@ import org.apache.commons.lang3.StringUtils; /** * A utility class to convert the configuration properties into any type. * - * @since 2.8.0 + * @since 2.8 */ public final class PropertyConverter { @@ -302,7 +302,7 @@ public final class PropertyConverter { * @param value the value to convert * @return the converted value * @throws ConversionException thrown if the value cannot be converted to a Duration - * @since 2.8.0 + * @since 2.8 */ public static Duration toDuration(final Object value) throws ConversionException { if (value instanceof Duration) { diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java index 387b3c50..98f09416 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java @@ -1223,7 +1223,7 @@ public class FileHandler { * * @param url the location of the file as URL * @param urlConnectionOptions URL connection options - * @since 2.8.0 + * @since 2.8 */ public void setURL(final URL url, final URLConnectionOptions urlConnectionOptions) { new Updater() { diff --git a/src/main/java/org/apache/commons/configuration2/io/FileSystem.java b/src/main/java/org/apache/commons/configuration2/io/FileSystem.java index 20fa4bf0..080df55a 100644 --- a/src/main/java/org/apache/commons/configuration2/io/FileSystem.java +++ b/src/main/java/org/apache/commons/configuration2/io/FileSystem.java @@ -57,7 +57,7 @@ public abstract class FileSystem { * @return TODO * @throws ConfigurationException TODO * - * @since 2.8.0 + * @since 2.8 */ public InputStream getInputStream(final URL url, final URLConnectionOptions urlConnectionOptions) throws ConfigurationException { return getInputStream(url); diff --git a/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java b/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java index 6a45943f..aab377eb 100644 --- a/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java +++ b/src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java @@ -25,7 +25,7 @@ import java.util.Objects; /** * Carries options and operates on {@link URLConnection}. * - * @since 2.8.0 + * @since 2.8 */ public final class URLConnectionOptions { diff --git a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java index a23c70f2..8b309ccd 100644 --- a/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java +++ b/src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java @@ -303,7 +303,7 @@ public final class ImmutableNode implements Iterable<ImmutableNode> { /** * @return An iterator of {@link #children child nodes.} - * @since 2.8.0 + * @since 2.8 */ @Override public Iterator<ImmutableNode> iterator() {