From 369ce1efd46d9b821c22e338cb744f7785b0ffda Mon Sep 17 00:00:00 2001 From: Leon Rosenberg Date: Tue, 14 Nov 2023 15:08:38 +0100 Subject: [PATCH 1/6] preparation for java 11 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e07ce17..5b0d568 100644 --- a/pom.xml +++ b/pom.xml @@ -2,21 +2,21 @@ net.anotheria parent - 2.13 + 4.0-SNAPSHOT 4.0.0 configureme ConfigureMe - 2.6.1-SNAPSHOT + 4.0.0-SNAPSHOT org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + 11 + 11 From fdcd573de3eebe0ec6244259a3b89049add31aa5 Mon Sep 17 00:00:00 2001 From: Leon Rosenberg Date: Fri, 22 Dec 2023 13:39:27 +0100 Subject: [PATCH 2/6] changed to non-snapshot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b0d568..899d2f6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ net.anotheria parent - 4.0-SNAPSHOT + 4.0 4.0.0 From 785c3d943966863560310c7c36355971221eea61 Mon Sep 17 00:00:00 2001 From: Leon Rosenberg Date: Fri, 22 Dec 2023 13:47:43 +0100 Subject: [PATCH 3/6] removed @since tag --- src/main/java/org/configureme/annotations/ConfigureAlso.java | 1 - src/main/java/org/configureme/parser/IncludeParsedAttribute.java | 1 - src/main/java/org/configureme/repository/IncludeValue.java | 1 - .../configureme/sources/configurationrepository/ReplyObject.java | 1 - 4 files changed, 4 deletions(-) diff --git a/src/main/java/org/configureme/annotations/ConfigureAlso.java b/src/main/java/org/configureme/annotations/ConfigureAlso.java index 987a180..d5429ec 100644 --- a/src/main/java/org/configureme/annotations/ConfigureAlso.java +++ b/src/main/java/org/configureme/annotations/ConfigureAlso.java @@ -9,7 +9,6 @@ * Mark config as External config * * @author ivanbatura - * @since: 26.09.12 * @version $Id: $Id */ @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/configureme/parser/IncludeParsedAttribute.java b/src/main/java/org/configureme/parser/IncludeParsedAttribute.java index 6bce191..ad240e4 100644 --- a/src/main/java/org/configureme/parser/IncludeParsedAttribute.java +++ b/src/main/java/org/configureme/parser/IncludeParsedAttribute.java @@ -9,7 +9,6 @@ * Include attribute contains link attribute in the another config. * * @author ivanbatura - * @since: 26.09.12 * @version $Id: $Id */ public class IncludeParsedAttribute extends ParsedAttribute { diff --git a/src/main/java/org/configureme/repository/IncludeValue.java b/src/main/java/org/configureme/repository/IncludeValue.java index b190177..50068d1 100644 --- a/src/main/java/org/configureme/repository/IncludeValue.java +++ b/src/main/java/org/configureme/repository/IncludeValue.java @@ -7,7 +7,6 @@ /** * Value of a include attribute. Link to the another config with a configurable attribute name. * - * @since: 26.09.12 * @version $Id: $Id */ public class IncludeValue implements Value { diff --git a/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java b/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java index 2d67df4..dc6cf6a 100644 --- a/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java +++ b/src/main/java/org/configureme/sources/configurationrepository/ReplyObject.java @@ -12,7 +12,6 @@ * with requested information. * * @author lrosenberg - * @since 13.02.13 15:26 * @version $Id: $Id */ @XmlRootElement(name = "reply") From f1406bea5235d451d935bfd92d9dea0ee99e7cbe Mon Sep 17 00:00:00 2001 From: Leon Rosenberg Date: Fri, 22 Dec 2023 13:48:37 +0100 Subject: [PATCH 4/6] [maven-release-plugin] prepare release configureme-4.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 899d2f6..6ccc6fc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 4.0.0 configureme ConfigureMe - 4.0.0-SNAPSHOT + 4.0.0 From e5da391b4598c553ae49503225b325677a7c4749 Mon Sep 17 00:00:00 2001 From: Leon Rosenberg Date: Fri, 22 Dec 2023 13:48:41 +0100 Subject: [PATCH 5/6] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ccc6fc..084b90f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 4.0.0 configureme ConfigureMe - 4.0.0 + 4.0.1-SNAPSHOT From a835e8a3d83f07f6c762d7c3fc7a1c41f300b66d Mon Sep 17 00:00:00 2001 From: Leon Rosenberg Date: Wed, 3 Apr 2024 15:59:45 +0200 Subject: [PATCH 6/6] typo --- .../java/org/configureme/environments/DynamicEnvironment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/configureme/environments/DynamicEnvironment.java b/src/main/java/org/configureme/environments/DynamicEnvironment.java index e5d28bf..ccbdd0f 100644 --- a/src/main/java/org/configureme/environments/DynamicEnvironment.java +++ b/src/main/java/org/configureme/environments/DynamicEnvironment.java @@ -8,7 +8,7 @@ import java.util.Collection; /** - * A dynamic environment class. This class can be used for any type of environments, for any environment deepth. However, we recommend the usage of more strict Application/LocaleBased Environment if + * A dynamic environment class. This class can be used for any type of environments, for any environment depth. However, we recommend the usage of more strict Application/LocaleBased Environment if * applicable, since they allow less and can prevent you from absolute environmental chaos. The DynamicEnvironment is the ultima ratio, a class that is capable of everything, but * requires not testable discipline of the developers. *