2021.5.355

terefang · Apr 30, 2021 · 76cc4fb · 76cc4fb
1 parent 1e77032
commit 76cc4fb
Show file tree

Hide file tree

Showing 12 changed files with 175 additions and 4,197 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ various template files using various data files.
 
 * java properties
 * yaml/yml -- ie. YAML 1.1 -- https://yaml.org/spec/1.1/current.html
-* toml/tml -- ie. TOML 0.4 -- https://github.com/toml-lang/toml/blob/master/versions/en/toml-v0.4.0.md
 * json -- ie. JSON -- https://www.json.org/json-en.html
 * hson/hjson -- ie. human JSON -- https://hjson.github.io/
 * ini -- simple windows ini file format

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.terefang.template</groupId>
     <artifactId>template</artifactId>
-    <version>2021.5.351</version>
+    <version>2021.5.355</version>
     <modules>
         <module>template-cli</module>
         <module>template-maven-plugin</module>
@@ -29,7 +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.5.125</version.jmelange>
+        <version.jmelange>2021.5.135</version.jmelange>
     </properties>
 
     <scm>

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.5.351</version>
+        <version>2021.5.355</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/template-cli/template-cli.iml b/template-cli/template-cli.iml
@@ -12,9 +12,10 @@
     <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.5.125" level="project" />
-    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:commons-jmelange:2021.5.125" level="project" />
-    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:pdf-jmelange:2021.5.125" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:utils-jmelange:2021.5.135" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:commons-jmelange:2021.5.135" level="project" />
+    <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:pdf-jmelange:2021.5.135" level="project" />
     <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:60.2" level="project" />
     <orderEntry type="library" name="Maven: org.jfree:jfreesvg:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:23.0" level="project" />
@@ -47,7 +48,7 @@
     <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: com.github.terefang.jmelange:scripted-jmelange:2021.5.125" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:scripted-jmelange:2021.5.135" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl3:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.mozilla:rhino:1.7.11" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-jsr223:3.0.7" level="project" />
@@ -71,13 +72,13 @@
     <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.30" level="project" />
     <orderEntry type="library" name="Maven: org.trimou:trimou-core:2.5.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:dao-jmelange:2021.5.125" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:dao-jmelange:2021.5.135" 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" />
     <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:data-jmelange:2021.5.125" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:data-jmelange:2021.5.135" level="project" />
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
     <orderEntry type="library" name="Maven: org.hjson:hjson:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />

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.5.351</version>
+        <version>2021.5.355</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...en-plugin/src/main/java/com/github/terefang/convert_maven_plugin/AbstractConvertMojo.java b/...en-plugin/src/main/java/com/github/terefang/convert_maven_plugin/AbstractConvertMojo.java
@@ -0,0 +1,4 @@
+package com.github.terefang.convert_maven_plugin;
+
+public class AbstractConvertMojo {
+}
diff --git a/template-maven-plugin/src/main/java/com/github/terefang/convert_maven_plugin/ToHsonMojo.java b/template-maven-plugin/src/main/java/com/github/terefang/convert_maven_plugin/ToHsonMojo.java
@@ -42,6 +42,9 @@ public class ToHsonMojo extends AbstractMojo
     @Parameter
     private String excludes;
 
+    @Parameter
+    boolean singleFileOutput;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {

diff --git a/template-maven-plugin/src/main/java/com/github/terefang/convert_maven_plugin/ToJsonMojo.java b/template-maven-plugin/src/main/java/com/github/terefang/convert_maven_plugin/ToJsonMojo.java
@@ -40,6 +40,9 @@ public class ToJsonMojo extends AbstractMojo
     @Parameter
     private String excludes;
 
+    @Parameter
+    boolean singleFileOutput;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
@@ -89,10 +92,18 @@ public void process(String[] includedFiles)
                 {
                     file = new File(resourcesOutput, file.getName());
                 }
-                file.getParentFile().mkdirs();
 
                 File localFile = new File(resourcesDirectory, key);
 
+                if(resourcesDirectory.isFile())
+                {
+                    localFile = resourcesDirectory;
+                }
+
+                if(singleFileOutput) {
+                    file = resourcesOutput;
+                }
+                file.getParentFile().mkdirs();
                 convertToJson(localFile, file);
             }
 

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
@@ -39,6 +39,9 @@ public class ToPdataMojo extends AbstractMojo
     @Parameter
     private String excludes;
 
+    @Parameter
+    boolean singleFileOutput;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
@@ -88,10 +91,18 @@ public void process(String[] includedFiles)
                 {
                     file = new File(resourcesOutput, file.getName());
                 }
-                file.getParentFile().mkdirs();
 
                 File localFile = new File(resourcesDirectory, key);
 
+                if(resourcesDirectory.isFile())
+                {
+                    localFile = resourcesDirectory;
+                }
+
+                if(singleFileOutput) {
+                    file = resourcesOutput;
+                }
+                file.getParentFile().mkdirs();
                 convertToPdata(localFile, file);
             }