This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-201 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 03250b0c0670d7311f6e1a6cd6c126baf749e5eb Author: Siegfried Goeschl <[email protected]> AuthorDate: Mon Oct 25 21:22:54 2021 +0200 FREEMARKER-201 Tweak poms, update dependencies and add missing licence headers --- freemarker-generator-cli/pom.xml | 1 + freemarker-generator-tools/pom.xml | 21 ++++++-- .../utahparser/juniper_bgp_summary_template.xml | 18 ++++++- .../tools/utahparser/UtahParserToolTest.java | 16 ++++++ pom.xml | 63 +++++++++++++++++++++- 5 files changed, 112 insertions(+), 7 deletions(-) diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml index 05497dc..f366306 100644 --- a/freemarker-generator-cli/pom.xml +++ b/freemarker-generator-cli/pom.xml @@ -178,6 +178,7 @@ <exclude>src/test/data/encoding/utf8.txt</exclude> <exclude>src/test/data/json/*/**</exclude> <exclude>src/test/data/yaml/environments.yaml</exclude> + <exclude>src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl</exclude> </excludes> </configuration> </plugin> diff --git a/freemarker-generator-tools/pom.xml b/freemarker-generator-tools/pom.xml index 04ca3f1..1559e53 100644 --- a/freemarker-generator-tools/pom.xml +++ b/freemarker-generator-tools/pom.xml @@ -97,7 +97,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.7</version> + <version>2.8.8</version> </dependency> <!-- Java Faker --> <dependency> @@ -121,19 +121,33 @@ <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>1.14.2</version> + <version>1.14.3</version> </dependency> <!-- SnakeYamlTool --> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.28</version> + <version>1.29</version> </dependency> <!-- UtahPrserTool --> <dependency> <groupId>com.sonalake</groupId> <artifactId>utah-parser</artifactId> <version>1.0.2</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </exclusion> + <exclusion> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Testing --> <dependency> @@ -160,6 +174,7 @@ <exclude>src/site/markdown/**/*.md</exclude> <exclude>**/*.csv</exclude> <exclude>src/main/resources/patterns/*</exclude> + <exclude>src/test/data/utahparser/juniper_bgp_summary_example.txt</exclude> </excludes> </configuration> </plugin> diff --git a/freemarker-generator-tools/src/test/data/utahparser/juniper_bgp_summary_template.xml b/freemarker-generator-tools/src/test/data/utahparser/juniper_bgp_summary_template.xml index bb1093a..af1259c 100644 --- a/freemarker-generator-tools/src/test/data/utahparser/juniper_bgp_summary_template.xml +++ b/freemarker-generator-tools/src/test/data/utahparser/juniper_bgp_summary_template.xml @@ -1,3 +1,19 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <config> <searches> @@ -5,7 +21,6 @@ and again for each value --> <search id="QUERY-LINE"><![CDATA[\s*{ipAddress}\s+{numbers}\s+{numbers}\s+{numbers}\s+{numbers}\s+{numbers}\s+{numbersThenText}]]></search> - <search id="inetInline"><![CDATA[{inet} {inet}]]></search> <search id="inet4"><![CDATA[inet.0:\s*{inet}]]></search> <search id="inet6"><![CDATA[inet6.0:\s*{inet}]]></search> @@ -64,6 +79,5 @@ <value id="activeV6" group="12"><![CDATA[{QUERY-LINE}\s*{inetInline}]]></value> <value id="receivedV6" group="13"><![CDATA[{QUERY-LINE}\s*{inetInline}]]></value> <value id="accepted_V6" group="14"><![CDATA[{QUERY-LINE}\s*{inetInline}]]></value> - </values> </config> \ No newline at end of file diff --git a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/utahparser/UtahParserToolTest.java b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/utahparser/UtahParserToolTest.java index fac9e75..75d4dea 100644 --- a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/utahparser/UtahParserToolTest.java +++ b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/utahparser/UtahParserToolTest.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.freemarker.generator.tools.utahparser; import com.sonalake.utah.config.Config; diff --git a/pom.xml b/pom.xml index 5a0c552..87d553a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ <artifactId>freemarker-generator</artifactId> <packaging>pom</packaging> <version>0.2.0-SNAPSHOT</version> + <name>Apache FreeMarker Generator</name> <url>https://freemarker-generator.apache.org/</url> @@ -155,7 +156,7 @@ <plugins> <plugin> <artifactId>maven-jxr-plugin</artifactId> - <version>3.0.0</version> + <version>3.1.1</version> </plugin> <plugin> <artifactId>maven-pmd-plugin</artifactId> @@ -168,7 +169,7 @@ <plugin> <!-- Required by custom Maven skin --> <artifactId>maven-site-plugin</artifactId> - <version>3.8.2</version> + <version>3.9.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -218,6 +219,64 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>dist</id> + <!-- Profile for generating all maven artifacts and documentation. --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <!-- build javadoc jars per jar for publishing to maven --> + <id>freemarker-generator-module-javadocs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <!-- builds source jars and attaches them to the project for publishing --> + <id>freemarker-generator-java-sources</id> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>sign</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <reporting> <plugins> <plugin>
