Skip to content

Commit 7f1ef17

Browse files
committed
#1230 Merge branch 'dev_tempeng_freemarker' into master
2 parents c6cb445 + b353d0b commit 7f1ef17

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

cobigen/cobigen-templateengines/cobigen-tempeng-freemarker/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<artifactId>tempeng-freemarker</artifactId>
44
<name>CobiGen - FreeMarker Template Engine</name>
5-
<version>2.1.0</version>
5+
<version>7.0.0</version>
66
<packaging>jar</packaging>
77
<description>CobiGen - FreeMarker Template Engine</description>
88

@@ -21,12 +21,12 @@
2121
<dependency>
2222
<groupId>com.devonfw.cobigen</groupId>
2323
<artifactId>core-api</artifactId>
24-
<version>5.0.0</version>
24+
<version>7.0.0</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>com.devonfw.cobigen</groupId>
2828
<artifactId>core-test</artifactId>
29-
<version>5.0.0</version>
29+
<version>7.0.0</version>
3030
<scope>test</scope>
3131
</dependency>
3232

cobigen/cobigen-templateengines/cobigen-tempeng-freemarker/src/main/java/com/devonfw/cobigen/tempeng/freemarker/FreeMarkerTemplateEngine.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.nio.file.Path;
55
import java.util.Map;
66

7+
import com.devonfw.cobigen.api.annotation.Name;
78
import com.devonfw.cobigen.api.exception.CobiGenRuntimeException;
89
import com.devonfw.cobigen.api.extension.TextTemplate;
910
import com.devonfw.cobigen.api.extension.TextTemplateEngine;
@@ -20,11 +21,9 @@
2021
/**
2122
* {@link TextTemplateEngine} implementation for Apache FreeMarker.
2223
*/
24+
@Name("FreeMarker")
2325
public class FreeMarkerTemplateEngine implements TextTemplateEngine {
2426

25-
/** Template Engine name */
26-
private static final String ENGINE_NAME = "FreeMarker";
27-
2827
/** The file extension of the template files. */
2928
private static final String TEMPLATE_EXTENSION = ".ftl";
3029

@@ -44,11 +43,6 @@ public FreeMarkerTemplateEngine() {
4443
freeMarkerConfig.setCacheStorage(new NullCacheStorage());
4544
}
4645

47-
@Override
48-
public String getName() {
49-
return ENGINE_NAME;
50-
}
51-
5246
@Override
5347
public String getTemplateFileEnding() {
5448
return TEMPLATE_EXTENSION;

documentation/master-cobigen.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf
2626
* CobiGen - JSON Plug-in v2.1.0
2727
* CobiGen - HTML Plug-in v2.1.0
2828
* CobiGen - Open API Plug-in v2.4.0
29-
* CobiGen - FreeMaker Template Engine v2.1.0
29+
* CobiGen - FreeMaker Template Engine v7.0.0
3030
* CobiGen - Velocity Template Engine v2.0.1
3131

3232
**Authors:**

pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,17 @@
356356
</goals>
357357
</execution>
358358
</executions>
359+
</plugin>
360+
<plugin>
361+
<groupId>org.sonatype.plugins</groupId>
362+
<artifactId>nexus-staging-maven-plugin</artifactId>
363+
<version>1.6.3</version>
364+
<extensions>true</extensions>
365+
<configuration>
366+
<serverId>sonartype.releases</serverId>
367+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
368+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
369+
</configuration>
359370
</plugin>
360371
</plugins>
361372
</build>

0 commit comments

Comments
 (0)