projects / commons-configuration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4f9a451)
simplifying version name from 2.8.0 to 2.8 master
authorMatt Juntunen <mattjuntunen@apache.org>
Wed, 22 Jun 2022 02:37:56 +0000 (22:37 -0400)
committerMatt Juntunen <mattjuntunen@apache.org>
Wed, 22 Jun 2022 02:37:56 +0000 (22:37 -0400)
pom.xml patch | blob | history
src/changes/changes.xml patch | blob | history
src/main/java/org/apache/commons/configuration2/ImmutableConfiguration.java patch | blob | history
src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java patch | blob | history
src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderProperties.java patch | blob | history
src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java patch | blob | history
src/main/java/org/apache/commons/configuration2/io/FileHandler.java patch | blob | history
src/main/java/org/apache/commons/configuration2/io/FileSystem.java patch | blob | history
src/main/java/org/apache/commons/configuration2/io/URLConnectionOptions.java patch | blob | history
src/main/java/org/apache/commons/configuration2/tree/ImmutableNode.java patch | blob | history

diff --git a/pom.xml b/pom.xml
index c516632470f549b88214bcba65ab38f0d0e97cb8..43a33132464144247d2670a2948fd99ddd45f0bf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>commons-configuration2</artifactId>\r
-  <version>2.8.0-SNAPSHOT</version>\r
+  <version>2.8-SNAPSHOT</version>\r
   <name>Apache Commons Configuration</name>\r
 \r
   <inceptionYear>2001</inceptionYear>\r
@@ -560,7 +560,7 @@
   <properties>\r
     <commons.componentid>configuration</commons.componentid>\r
     <commons.module.name>org.apache.commons.configuration2</commons.module.name>\r
-    <commons.release.version>2.8.0</commons.release.version>\r
+    <commons.release.version>2.8</commons.release.version>\r
     <commons.release.desc>(reworked 2.x version)</commons.release.desc>\r
     <commons.release.2.name>commons-configuration-${commons.release.2.version}</commons.release.2.name>\r
     <commons.release.2.version>1.10</commons.release.2.version>\r
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2c416023b6b690975ab4394454ea4f0759d59fac..822c4b3a23c92543106e881fd75d122e2371571e 100644 (file)
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,7 +21,7 @@
     <author email="dev@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 a3171197771baaab02cc2d52558e74c4f970799c..2f38816359e5c1b8e82287d36e2eb347ac1a2e59 100644 (file)
--- 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 b0f3fe6229d0918df26301f80bfa4ad85689d64a..6cf2f03318b386b9cc7b8806caa757faa82f2128 100644 (file)
--- 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 9035660198ed951d95f3176a01753cce1df99204..218479b8f3446052bae2ea81fe4267d43d7ef736 100644 (file)
--- 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 255bedab726cb3d07519489ccd0bc4446379a8ed..261c248b22efe81dfd889fd093c6489d8f557d9e 100644 (file)
--- 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 387b3c500c47f203ae551786722913c6f8b65c43..98f09416643526736c4a58532f5fa854685a5276 100644 (file)
--- 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 20fa4bf04104bb0b86afd448a3d5f0324f2aa51d..080df55a2dfbf412415177c1bc513da055c48f5b 100644 (file)
--- 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 6a45943f4fc08e44955f3ff182b1c7c20beea9fd..aab377ebf2a7b837b6ba93718183d10a3b318371 100644 (file)
--- 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 a23c70f2e1929f3cb04600d11ba0a9741be6a879..8b309ccd94fa0013cb296b2281799774abada019 100644 (file)
--- 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() {
Apache Commons configuration