#1233 Merge branch 'dev_jsonplugin' into master

devonfw · Sep 14, 2020 · 58f040f · 58f040f
2 parents c8c7a92 + 705e293
commit 58f040f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/cobigen/cobigen-jsonplugin/pom.xml b/cobigen/cobigen-jsonplugin/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jsonplugin</artifactId>
   <name>CobiGen - JSON Plug-in</name>
-  <version>2.1.0</version>
+  <version>7.0.0</version>
   <packaging>jar</packaging>
   <description>CobiGen - JSON Plug-in</description>
 
@@ -20,12 +20,12 @@
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-api</artifactId>
-      <version>5.0.0</version>
+      <version>[7.0.0,)</version>
     </dependency>
     <dependency>
       <groupId>com.devonfw.cobigen</groupId>
       <artifactId>core-test</artifactId>
-      <version>5.0.0</version>
+      <version>[7.0.0,)</version>
       <scope>test</scope>
     </dependency>
     <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->

diff --git a/.../cobigen-jsonplugin/src/main/java/com/devonfw/cobigen/jsonplugin/JSONPluginActivator.java b/.../cobigen-jsonplugin/src/main/java/com/devonfw/cobigen/jsonplugin/JSONPluginActivator.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;
@@ -11,13 +12,20 @@
 /**
  * JSON Plug-in Activator to be registered in the PluginRegistry of CobiGen.
  */
+@Activation(byMergeStrategy = { JSONPluginActivator.JSONMERGE, JSONPluginActivator.JSONMERGE_OVERRIDE })
 public class JSONPluginActivator implements GeneratorPluginActivator {
 
+    /** JSON merge (prefer patch) */
+    static final String JSONMERGE_OVERRIDE = "jsonmerge_override";
+
+    /** JSON merge (prefer base) */
+    static final String JSONMERGE = "jsonmerge";
+
     @Override
     public List<Merger> bindMerger() {
         List<Merger> merger = Lists.newLinkedList();
-        merger.add(new JSONMerger("jsonmerge", false));
-        merger.add(new JSONMerger("jsonmerge_override", true));
+        merger.add(new JSONMerger(JSONMERGE, false));
+        merger.add(new JSONMerger(JSONMERGE_OVERRIDE, true));
         return merger;
     }
 

diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc
@@ -23,7 +23,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf
 * CobiGen - TypeScript Plug-in v2.4.4
 * CobiGen - Property Plug-in v2.1.0
 * CobiGen - Text Merger v2.1.0
-* CobiGen - JSON Plug-in v2.1.0
+* CobiGen - JSON Plug-in v7.0.0
 * CobiGen - HTML Plug-in v2.1.0
 * CobiGen - Open API Plug-in v2.4.0
 * CobiGen - FreeMaker Template Engine v7.0.0