From 277e4cf00687f1a04648fca28c6f4530ed98fdd9 Mon Sep 17 00:00:00 2001 From: Jaime Diaz Date: Wed, 8 Jan 2020 18:17:09 +0100 Subject: [PATCH 1/6] #1082 Set next development version --- cobigen/cobigen-propertyplugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen/cobigen-propertyplugin/pom.xml b/cobigen/cobigen-propertyplugin/pom.xml index 5c824d57c9..9015681f73 100644 --- a/cobigen/cobigen-propertyplugin/pom.xml +++ b/cobigen/cobigen-propertyplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 propertyplugin jar - 2.1.0-SNAPSHOT + 2.2.0-SNAPSHOT CobiGen - Property File Plug-In CobiGen - Property File Plug-In From 101dfcad21a7a3f4d6a80bd1b978dcb78d0dbf2d Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 00:41:40 +0200 Subject: [PATCH 2/6] #1228 adapt to new lazy activation API --- cobigen/cobigen-propertyplugin/pom.xml | 4 ++-- .../PropertyMergerPluginActivator.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cobigen/cobigen-propertyplugin/pom.xml b/cobigen/cobigen-propertyplugin/pom.xml index 9015681f73..e623d26ebd 100644 --- a/cobigen/cobigen-propertyplugin/pom.xml +++ b/cobigen/cobigen-propertyplugin/pom.xml @@ -20,14 +20,14 @@ com.devonfw.cobigen core-api - 5.0.0 + [6.2.0-SNAPSHOT,) com.devonfw.cobigen core-test - 5.0.0 + [6.2.0-SNAPSHOT,) test diff --git a/cobigen/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMergerPluginActivator.java b/cobigen/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMergerPluginActivator.java index bcf557e4c5..7b0640697b 100644 --- a/cobigen/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMergerPluginActivator.java +++ b/cobigen/cobigen-propertyplugin/src/main/java/com/devonfw/cobigen/propertyplugin/PropertyMergerPluginActivator.java @@ -2,6 +2,7 @@ import java.util.List; +import com.devonfw.cobigen.api.annotation.Activation; import com.devonfw.cobigen.api.extension.GeneratorPluginActivator; import com.devonfw.cobigen.api.extension.Merger; import com.devonfw.cobigen.api.extension.TriggerInterpreter; @@ -10,13 +11,21 @@ /** * Plug-in activator to be registered in CobiGen's PluginRegistry */ +@Activation(byMergeStrategy = { PropertyMergerPluginActivator.PROPERTYMERGE, + PropertyMergerPluginActivator.PROPERTYMERGE_OVERRIDE }) public class PropertyMergerPluginActivator implements GeneratorPluginActivator { + /** Property File Merge Strategy (prefer patch) */ + static final String PROPERTYMERGE_OVERRIDE = "propertymerge_override"; + + /** Property File Merge Strategy (prefer base) */ + static final String PROPERTYMERGE = "propertymerge"; + @Override public List bindMerger() { List merger = Lists.newLinkedList(); - merger.add(new PropertyMerger("propertymerge", false)); - merger.add(new PropertyMerger("propertymerge_override", true)); + merger.add(new PropertyMerger(PROPERTYMERGE, false)); + merger.add(new PropertyMerger(PROPERTYMERGE_OVERRIDE, true)); return merger; } From 7a983e8b94ee1ae8f06254afe8dc34798eaf8eb0 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 01:41:41 +0200 Subject: [PATCH 3/6] set new version to make compatibility recognition easier --- cobigen/cobigen-propertyplugin/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cobigen/cobigen-propertyplugin/pom.xml b/cobigen/cobigen-propertyplugin/pom.xml index e623d26ebd..6bf54b00b3 100644 --- a/cobigen/cobigen-propertyplugin/pom.xml +++ b/cobigen/cobigen-propertyplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 propertyplugin jar - 2.2.0-SNAPSHOT + 7.0.0-SNAPSHOT CobiGen - Property File Plug-In CobiGen - Property File Plug-In @@ -20,14 +20,14 @@ com.devonfw.cobigen core-api - [6.2.0-SNAPSHOT,) + [7.0.0-SNAPSHOT,) com.devonfw.cobigen core-test - [6.2.0-SNAPSHOT,) + [7.0.0-SNAPSHOT,) test From 6bf0bbc9ef668224c5f6a859ee2b0dc9d8c2ba3f Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 17:11:52 +0200 Subject: [PATCH 4/6] upgraded to latest releases --- cobigen/cobigen-propertyplugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen/cobigen-propertyplugin/pom.xml b/cobigen/cobigen-propertyplugin/pom.xml index 6bf54b00b3..3005839042 100644 --- a/cobigen/cobigen-propertyplugin/pom.xml +++ b/cobigen/cobigen-propertyplugin/pom.xml @@ -20,14 +20,14 @@ com.devonfw.cobigen core-api - [7.0.0-SNAPSHOT,) + [7.0.0,) com.devonfw.cobigen core-test - [7.0.0-SNAPSHOT,) + [7.0.0,) test From 7af9ced066efc176ae3398c1b7d76f1223cab3aa Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 18:09:57 +0200 Subject: [PATCH 5/6] #1237 update wiki docs --- documentation/master-cobigen.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc index 8f4ef21ec7..8ef5dc8cad 100644 --- a/documentation/master-cobigen.asciidoc +++ b/documentation/master-cobigen.asciidoc @@ -21,7 +21,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf * CobiGen - Java Plug-in v2.2.3 * CobiGen - XML Plug-in v4.2.0 * CobiGen - TypeScript Plug-in v2.4.4 -* CobiGen - Property Plug-in v2.1.0 +* CobiGen - Property Plug-in v7.0.0 * CobiGen - Text Merger v2.1.0 * CobiGen - JSON Plug-in v2.1.0 * CobiGen - HTML Plug-in v2.1.0 From 8b8b19df03d1d66446aee5f0a4766610da7d3f7b Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 18:10:04 +0200 Subject: [PATCH 6/6] #1237 Set release version --- cobigen/cobigen-propertyplugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen/cobigen-propertyplugin/pom.xml b/cobigen/cobigen-propertyplugin/pom.xml index 3005839042..ef163c65ac 100644 --- a/cobigen/cobigen-propertyplugin/pom.xml +++ b/cobigen/cobigen-propertyplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 propertyplugin jar - 7.0.0-SNAPSHOT + 7.0.0 CobiGen - Property File Plug-In CobiGen - Property File Plug-In