#1230 Merge branch 'dev_tempeng_freemarker' into master

devonfw · Sep 13, 2020 · 7f1ef17 · 7f1ef17
2 parents c6cb445 + b353d0b
commit 7f1ef17
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/cobigen/cobigen-templateengines/cobigen-tempeng-freemarker/pom.xml b/cobigen/cobigen-templateengines/cobigen-tempeng-freemarker/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tempeng-freemarker</artifactId>
   <name>CobiGen - FreeMarker Template Engine</name>
-  <version>2.1.0</version>
+  <version>7.0.0</version>
   <packaging>jar</packaging>
   <description>CobiGen - FreeMarker Template Engine</description>
 
@@ -21,12 +21,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>
 

diff --git a/...marker/src/main/java/com/devonfw/cobigen/tempeng/freemarker/FreeMarkerTemplateEngine.java b/...marker/src/main/java/com/devonfw/cobigen/tempeng/freemarker/FreeMarkerTemplateEngine.java
@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.Map;
 
+import com.devonfw.cobigen.api.annotation.Name;
 import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
 import com.devonfw.cobigen.api.extension.TextTemplate;
 import com.devonfw.cobigen.api.extension.TextTemplateEngine;
@@ -20,11 +21,9 @@
 /**
  * {@link TextTemplateEngine} implementation for Apache FreeMarker.
  */
+@Name("FreeMarker")
 public class FreeMarkerTemplateEngine implements TextTemplateEngine {
 
-    /** Template Engine name */
-    private static final String ENGINE_NAME = "FreeMarker";
-
     /** The file extension of the template files. */
     private static final String TEMPLATE_EXTENSION = ".ftl";
 
@@ -44,11 +43,6 @@ public FreeMarkerTemplateEngine() {
         freeMarkerConfig.setCacheStorage(new NullCacheStorage());
     }
 
-    @Override
-    public String getName() {
-        return ENGINE_NAME;
-    }
-
     @Override
     public String getTemplateFileEnding() {
         return TEMPLATE_EXTENSION;

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

diff --git a/pom.xml b/pom.xml
@@ -356,6 +356,17 @@
                 </goals>
               </execution>
             </executions>
+          </plugin>
+		  <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.3</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>sonartype.releases</serverId>
+              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+            </configuration>
           </plugin>
         </plugins>
       </build>