Merge branch 'dev_htmlmerger' into master

Author: maybeec

cobigen/cobigen-htmlplugin/pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>htmlplugin</artifactId>
   <name>CobiGen - HTML Plug-in</name>
-  <version>2.1.0</version>
+  <version>7.0.0</version>
   <packaging>jar</packaging>
   <description>CobiGen - HTML 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>
     <dependency>

cobigen/cobigen-htmlplugin/src/main/java/com/devonfw/cobigen/htmlplugin/HTMLPluginActivator.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 = { HTMLPluginActivator.NG_MERGE, HTMLPluginActivator.NG_MERGE_OVERRIDE })
 public class HTMLPluginActivator implements GeneratorPluginActivator {
 
+    /** Merge Strategy for NG Templates (patch first) */
+    static final String NG_MERGE_OVERRIDE = "html-ng*_override";
+
+    /** Merge Strategy for NG Templates (base first) */
+    static final String NG_MERGE = "html-ng*";
+
     @Override
     public List<Merger> bindMerger() {
         List<Merger> merger = Lists.newLinkedList();
-        merger.add(new AngularMerger("html-ng*", false));
-        merger.add(new AngularMerger("html-ng*_override", true));
+        merger.add(new AngularMerger(NG_MERGE, false));
+        merger.add(new AngularMerger(NG_MERGE_OVERRIDE, true));
         return merger;
     }
 

documentation/master-cobigen.asciidoc

@@ -24,7 +24,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf
 * CobiGen - Property Plug-in v2.1.0
 * CobiGen - Text Merger v2.1.0
 * CobiGen - JSON Plug-in v7.0.0
-* CobiGen - HTML Plug-in v2.1.0
+* CobiGen - HTML Plug-in v7.0.0
 * CobiGen - Open API Plug-in v2.4.0
 * CobiGen - FreeMaker Template Engine v7.0.0
 * CobiGen - Velocity Template Engine v7.0.0