2021.5.360

terefang · Aug 2, 2021 · dd59491 · dd59491
1 parent 8176860
commit dd59491
Show file tree

Hide file tree

Showing 14 changed files with 1,174 additions and 46 deletions.
diff --git a/HELPER_METHODS.md b/HELPER_METHODS.md
diff --git a/build.sh b/build.sh
@@ -31,7 +31,10 @@ while test ! -z "$1" ; do
       ;;
     -install*)
       (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)
+      (test -e ~/bin/template-cli.sh && cd $bDIR && cp template-cli/target/bin/template-cli*.sh.bin ~/bin/template-cli.sh)
+      ;;
+    -deps)
+      (cd $bDIR && mvn org.apache.maven.plugins:maven-dependency-plugin:tree) || exit 1
       ;;
     *) echo "unknow option ..."
       ;;

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.terefang.template</groupId>
     <artifactId>template</artifactId>
-    <version>2021.5.356</version>
+    <version>2021.5.360</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.135</version.jmelange>
+        <version.jmelange>2021.7.147</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.356</version>
+        <version>2021.5.360</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,6 +16,12 @@
             <groupId>com.github.terefang.template</groupId>
             <artifactId>template-maven-plugin</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -100,6 +106,67 @@
             <version>RELEASE</version>
             <scope>provided</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.kohsuke/github-api -->
+        <dependency>
+            <groupId>org.kohsuke</groupId>
+            <artifactId>github-api</artifactId>
+            <version>1.131</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.infradna.tool</groupId>
+            <artifactId>bridge-method-annotation</artifactId>
+            <version>1.21</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp</groupId>
+            <artifactId>okhttp-urlconnection</artifactId>
+            <version>2.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-urlconnection</artifactId>
+            <version>3.12.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.11.2</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -145,7 +212,7 @@
                     <dependency>
                         <groupId>org.apache.commons</groupId>
                         <artifactId>commons-compress</artifactId>
-                        <version>1.19</version>
+                        <version>1.21</version>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.ant</groupId>

diff --git a/template-cli/src/main/java/com/github/terefang/template_cli/TemplateCliMain.java b/template-cli/src/main/java/com/github/terefang/template_cli/TemplateCliMain.java
@@ -57,6 +57,12 @@ public static void main(String[] _args)
             System.exit(0);
         }
         else
+        if(_args.length == 3 && "--to-yaml".equalsIgnoreCase(_args[0]))
+        {
+            ToYamlMojo.convertToYaml(new File(_args[1]), new File(_args[2]));
+            System.exit(0);
+        }
+        else
         if(_args.length == 3 && "--to-pdata".equalsIgnoreCase(_args[0]))
         {
             ToPdataMojo.convertToPdata(new File(_args[1]), new File(_args[2]));

diff --git a/template-cli/template-cli.iml b/template-cli/template-cli.iml
@@ -12,17 +12,13 @@
     <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.135" level="project" />
-    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:commons-jmelange:2021.5.135" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:utils-jmelange:2021.5.145" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:commons-jmelange:2021.5.145" 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.github.terefang.jmelange:pdf-jmelange:2021.5.145" level="project" />
     <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:60.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:gfx-jmelange:2021.5.145" 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" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.2" level="project" />
     <orderEntry type="library" name="Maven: com.helger:ph-css:6.2.3" level="project" />
     <orderEntry type="library" name="Maven: com.helger:ph-commons:9.4.2" level="project" />
@@ -42,13 +38,12 @@
     <orderEntry type="library" name="Maven: com.twelvemonkeys.imageio:imageio-bmp:3.6" level="project" />
     <orderEntry type="library" name="Maven: com.twelvemonkeys.imageio:imageio-iff:3.6" level="project" />
     <orderEntry type="library" name="Maven: com.twelvemonkeys.imageio:imageio-pnm:3.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
     <orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.5-6" level="project" />
     <orderEntry type="library" name="Maven: org.tukaani:xz:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:scripted-jmelange:2021.5.145" 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: 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" />
@@ -62,23 +57,20 @@
     <orderEntry type="library" name="Maven: commons-net:commons-net:3.3" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.java-ipv6:java-ipv6:0.17" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.7.9" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.7.9.5" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.7.9" level="project" />
     <orderEntry type="library" name="Maven: ch.obermuhlner:big-math:2.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: ognl:ognl:3.1.12" level="project" />
     <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
     <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.135" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:dao-jmelange:2021.5.145" 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.135" level="project" />
+    <orderEntry type="library" name="Maven: com.github.terefang.jmelange:data-jmelange:2021.5.145" 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" />
@@ -107,13 +99,17 @@
     <orderEntry type="library" name="Maven: org.apache.maven.resolver:maven-resolver-spi:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.resolver:maven-resolver-util:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.shared:maven-shared-utils:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: org.eclipse.sisu:org.eclipse.sisu.inject:0.3.4" level="project" />
     <orderEntry type="library" name="Maven: com.google.inject:guice:no_aop:4.2.1" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-android" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-component-annotations:2.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:3.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.5.1" level="project" />
     <orderEntry type="library" name="Maven: info.picocli:picocli:4.2.0" level="project" />
@@ -126,6 +122,7 @@
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
     <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.30.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.sourceforge.jtds:jtds:1.3.1" level="project" />
@@ -136,5 +133,24 @@
     <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:2.5.4" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.csvjdbc:csvjdbc:1.0.36" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
+    <orderEntry type="library" name="Maven: org.kohsuke:github-api:1.131" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: com.infradna.tool:bridge-method-annotation:1.21" level="project" />
+    <orderEntry type="library" name="Maven: org.jenkins-ci:annotation-indexer:1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp-urlconnection:2.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.61" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp-urlconnection:3.12.3" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.11.2" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-impl:0.11.2" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-jackson:0.11.2" level="project" />
   </component>
 </module>
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.356</version>
+        <version>2021.5.360</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -119,11 +119,11 @@ public static void convertToPdata(File _from, File _to)
         Map<String, Object> _data = ContextUtil.loadContextFrom(_from);
         if(_to == null)
         {
-            PdataWriter.writeTo(_data, new OutputStreamWriter(System.out));
+            PdataWriter.writeTo(false, _data, new OutputStreamWriter(System.out));
         }
         else
         {
-            PdataWriter.writeTo(_data, _to);
+            PdataWriter.writeTo(false, _data, _to);
         }
     }
 }