2021.4.26

terefang · Mar 31, 2021 · 368f7e1 · 368f7e1
1 parent 3744b61
commit 368f7e1
Show file tree

Hide file tree

Showing 58 changed files with 107 additions and 3,034 deletions.
diff --git a/build.sh b/build.sh
@@ -10,24 +10,16 @@ while test ! -z "$1" ; do
   case "$1" in
     -major*)
       (cd $bDIR && mvn build-helper:parse-version versions:set \
-                -DnewVersion="\${parsedVersion.nextMajorVersion}.1.0" ) || exit 1
+                -DnewVersion="\${parsedVersion.nextMajorVersion}.1.\${parsedVersion.nextIncrementalVersion}" ) || exit 1
       ;;
     -minor*)
       (cd $bDIR && mvn build-helper:parse-version versions:set \
-                -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.0" ) || exit 1
+                -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.\${parsedVersion.nextIncrementalVersion}" ) || exit 1
       ;;
     -release*)
       (cd $bDIR && mvn -X build-helper:parse-version versions:set \
                 -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}" ) || exit 1
       ;;
-    -build*)
-      (cd $bDIR && mvn -X buildnumber:create build-helper:parse-version versions:set \
-                -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion}-\${buildNumber}" ) || exit 1
-      ;;
-    -snapshot*)
-      (cd $bDIR && mvn -X buildnumber:create build-helper:parse-version versions:set \
-                -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion}-rc$bDATE" ) || exit 1
-      ;;
     -clean*)
       (cd $bDIR && mvn clean $OPTS -U) || exit 1
       ;;
@@ -38,7 +30,8 @@ while test ! -z "$1" ; do
       (cd $bDIR && mvn -N versions:update-child-modules) || exit 1
       ;;
     -install*)
-      (cd $bDIR && mvn install $OPTS) || exit 1
+      (cd $bDIR && mvn clean install $OPTS) || exit 1
+      (test -e ~/bin/template-cli.sh && cd $bDIR && cp template-cli/target/bin/template-cli.*.sh.bin ~/bin/template-cli.sh)
       ;;
     *) echo "unknow option ..."
       ;;

diff --git a/buildNumber.properties b/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Mar 22 12:18:11 CET 2021
-buildNumber=328
+#Wed Mar 31 19:51:21 CEST 2021
+buildNumber=340
diff --git a/examples/check.fm b/examples/check.fm
@@ -0,0 +1,6 @@
+<#if _.checkBoolean('on')>
+ON
+</#if>
+<#if _.checkBoolean('off')>
+OFF
+</#if>
diff --git a/examples/gfx.groovy b/examples/gfx.groovy
@@ -1,6 +1,6 @@
-import com.github.terefang.imageutil.PixelImage;
-import com.github.terefang.imageutil.SvgImage;
-import com.github.terefang.imageutil.ImageUtil;
+import com.github.terefang.jmelange.image.PixelImage;
+import com.github.terefang.jmelange.image.SvgImage;
+import com.github.terefang.jmelange.util.ImageUtil;
 
 
 SvgImage _im = SvgImage.create(200, 200);

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.terefang.template</groupId>
     <artifactId>template</artifactId>
-    <version>2021.4.25</version>
+    <version>2021.4.26</version>
     <modules>
         <module>template-cli</module>
         <module>template-maven-plugin</module>
@@ -29,6 +29,7 @@
         <maven.version>3.6.3</maven.version>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyyMMdd'.'HHmm</maven.build.timestamp.format>
+        <version.jmelange>2021.1.1</version.jmelange>
     </properties>
 
     <scm>

diff --git a/template-cli/buildNumber.properties b/template-cli/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Mar 22 12:18:22 CET 2021
-buildNumber=323
+#Wed Mar 31 19:51:31 CEST 2021
+buildNumber=331
diff --git a/template-cli/pom.xml b/template-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>template</artifactId>
         <groupId>com.github.terefang.template</groupId>
-        <version>2021.4.25</version>
+        <version>2021.4.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/template-cli/src/test/java/TestFM.java b/template-cli/src/test/java/TestFM.java
@@ -0,0 +1,12 @@
+import com.github.terefang.template_cli.TemplateCliMain;
+
+public class TestFM {
+    static String[] ARGS = {
+            "-T", "FREEMARKER", "-M", "STD",
+            "-D", "examples/check.fm.out",
+            "-S", "examples/check.fm",
+            "--additional-variables", "_out_dir=examples" };
+    public static void main(String[] args) {
+        TemplateCliMain.main(ARGS);
+    }
+}
diff --git a/template-cli/template-cli.iml b/template-cli/template-cli.iml
@@ -12,12 +12,20 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="template-maven-plugin" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:utils-jmelange:2021.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:commons-jmelange:2021.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jfreesvg:3.4" level="project" />
+    <orderEntry type="library" name="Maven: de.rototor.pdfbox:graphics2d:0.31" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.22" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.22" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: org.soulwing.snmp:tnm4j:1.0.11" level="project" />
     <orderEntry type="library" name="Maven: org.snmp4j:snmp4j:2.8.4" level="project" />
     <orderEntry type="library" name="Maven: net.percederberg.mibble:mibble:2.9.3" level="project" />
     <orderEntry type="library" name="Maven: net.percederberg.grammatica:grammatica:1.5" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: net.percederberg.mibble:mibble-mibs:2.9.3" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:log4j-over-slf4j:1.7.7" level="project" />
     <orderEntry type="library" name="Maven: com.github.terefang:jdao:2021.1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-dbutils:commons-dbutils:1.6" level="project" />
     <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
@@ -63,10 +71,6 @@
     <orderEntry type="library" name="Maven: org.trimou:trimou-core:2.5.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.github.jknack:handlebars:4.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:3.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jfree:jfreesvg:3.4" level="project" />
-    <orderEntry type="library" name="Maven: de.rototor.pdfbox:graphics2d:0.31" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.22" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.22" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-model:3.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4" level="project" />

diff --git a/template-maven-plugin/buildNumber.properties b/template-maven-plugin/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Mon Mar 22 12:18:11 CET 2021
-buildNumber=328
+#Wed Mar 31 19:51:22 CEST 2021
+buildNumber=340
diff --git a/template-maven-plugin/pom.xml b/template-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>template</artifactId>
         <groupId>com.github.terefang.template</groupId>
-        <version>2021.4.25</version>
+        <version>2021.4.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,6 +14,11 @@
     <packaging>maven-plugin</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.terefang.jmelange</groupId>
+            <artifactId>utils-jmelange</artifactId>
+            <version>${version.jmelange}</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.soulwing.snmp/tnm4j -->
         <dependency>
             <groupId>org.soulwing.snmp</groupId>
@@ -166,16 +171,6 @@
             <artifactId>plexus-utils</artifactId>
             <version>3.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.jfree</groupId>
-            <artifactId>jfreesvg</artifactId>
-            <version>3.4</version>
-        </dependency>
-        <dependency>
-            <groupId>de.rototor.pdfbox</groupId>
-            <artifactId>graphics2d</artifactId>
-            <version>0.31</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/template-maven-plugin/src/main/java/com/github/terefang/concat_maven_plugin/ConcatMojo.java b/template-maven-plugin/src/main/java/com/github/terefang/concat_maven_plugin/ConcatMojo.java
@@ -13,7 +13,6 @@
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.*;
-import java.util.ArrayDeque;
 import java.util.Arrays;
 
 @Mojo(name = "concat", defaultPhase = LifecyclePhase.GENERATE_RESOURCES)

diff --git a/...late-maven-plugin/src/main/java/com/github/terefang/convert_maven_plugin/ToPdataMojo.java b/...late-maven-plugin/src/main/java/com/github/terefang/convert_maven_plugin/ToPdataMojo.java
@@ -1,7 +1,7 @@
 package com.github.terefang.convert_maven_plugin;
 
+import com.github.terefang.jmelange.pdata.PdataWriter;
 import com.github.terefang.template_maven_plugin.util.ContextUtil;
-import com.github.terefang.template_maven_plugin.util.PdxWriter;
 import lombok.Data;
 import lombok.SneakyThrows;
 import org.apache.maven.plugin.AbstractMojo;
@@ -11,7 +11,6 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.*;
@@ -109,11 +108,11 @@ public static void convertToPdata(File _from, File _to)
         Map<String, Object> _data = ContextUtil.loadContextFrom(_from);
         if(_to == null)
         {
-            PdxWriter.writeTo(_data, new OutputStreamWriter(System.out));
+            PdataWriter.writeTo(_data, new OutputStreamWriter(System.out));
         }
         else
         {
-            PdxWriter.writeTo(_data, _to);
+            PdataWriter.writeTo(_data, _to);
         }
     }
 }