You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2020/02/16 15:37:34 UTC
[freemarker-generator] branch FREEMARKER-129 updated:
FREEMARKER-129 Cleanup POMs and dependency management
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-129
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-129 by this push:
new 849b531 FREEMARKER-129 Cleanup POMs and dependency management
849b531 is described below
commit 849b531402687a8498b7cf7e64e791b841619085
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Sun Feb 16 16:37:20 2020 +0100
FREEMARKER-129 Cleanup POMs and dependency management
---
freemarker-generator-cli/pom.xml | 67 +++--------------------------
freemarker-generator-maven-plugin/README.md | 6 +--
freemarker-generator-maven-plugin/pom.xml | 3 +-
freemarker-generator-tools/pom.xml | 29 ++++++-------
pom.xml | 23 ++++++++--
5 files changed, 42 insertions(+), 86 deletions(-)
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index 65e143a..70855b7 100644
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -157,83 +157,26 @@
</reporting>
<dependencies>
- <dependency>
- <groupId>org.apache.freemarker.generator</groupId>
- <artifactId>freemarker-generator-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.krakens</groupId>
- <artifactId>java-grok</artifactId>
- <version>0.1.9</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>2.4.0</version>
- </dependency>
+ <!-- CLI processing -->
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.1.4</version>
</dependency>
+ <!-- Apache FreeMarker Generator Tools -->
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>1.12.1</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.25</version>
+ <groupId>org.apache.freemarker.generator</groupId>
+ <artifactId>freemarker-generator-tools</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.28</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.28</version>
- </dependency>
- <!-- Apache libraries -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-exec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
- </dependency>
- <!-- Apache POI -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>4.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
- <version>4.1.1</version>
</dependency>
<!-- Testing -->
<dependency>
diff --git a/freemarker-generator-maven-plugin/README.md b/freemarker-generator-maven-plugin/README.md
index 76eefd8..2bb5fb8 100644
--- a/freemarker-generator-maven-plugin/README.md
+++ b/freemarker-generator-maven-plugin/README.md
@@ -29,11 +29,11 @@ Add the following snippet within the `<plugins>` tag of your pom.xml:
```xml
<plugin>
<groupId>com.oath</groupId>
- <artifactId>freemarker-maven-plugin</artifactId>
- <version>${freemarker-maven-plugin.version}</version>
+ <artifactId>freemarker-generator-maven-plugin</artifactId>
+ <version>${freemarker-generator-maven-plugin.version}</version>
<configuration>
<!-- Required. Specifies the compatibility version for template processing -->
- <freeMarkerVersion>2.3.23</freeMarkerVersion>
+ <freeMarkerVersion>2.3.29</freeMarkerVersion>
</configuration>
<executions>
<!-- If you want to generate files during other phases, just add more execution
diff --git a/freemarker-generator-maven-plugin/pom.xml b/freemarker-generator-maven-plugin/pom.xml
index a2cdf5f..8d1cc88 100644
--- a/freemarker-generator-maven-plugin/pom.xml
+++ b/freemarker-generator-maven-plugin/pom.xml
@@ -87,7 +87,6 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -125,7 +124,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
- <goalPrefix>freemarker</goalPrefix>
+ <goalPrefix>freemarker-generator</goalPrefix>
</configuration>
<executions>
<execution>
diff --git a/freemarker-generator-tools/pom.xml b/freemarker-generator-tools/pom.xml
index 5132dc5..409ab15 100644
--- a/freemarker-generator-tools/pom.xml
+++ b/freemarker-generator-tools/pom.xml
@@ -29,6 +29,13 @@
<name>Apache FreeMarker Generator: Tools</name>
<description>Document processing tools for Apache FreeMarker Generator</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <apache.poi.version>4.1.1</apache.poi.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.freemarker.generator</groupId>
@@ -36,6 +43,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.krakens</groupId>
<artifactId>java-grok</artifactId>
<version>0.1.9</version>
@@ -64,17 +75,6 @@
<artifactId>snakeyaml</artifactId>
<version>1.25</version>
</dependency>
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.28</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.28</version>
- </dependency>
<!-- Apache libraries -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -89,23 +89,22 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
</dependency>
<!-- Apache POI -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>4.1.1</version>
+ <version>${apache.poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>4.1.1</version>
+ <version>${apache.poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
- <version>4.1.1</version>
+ <version>${apache.poi.version}</version>
</dependency>
<!-- Testing -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 76fff08..2f27323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
<developers>
<developer>
<name>Siegfried Goeschl</name>
- <organization>GitHub</organization>
+ <organization>ASF</organization>
<organizationUrl>https://github.com/sgoeschl</organizationUrl>
</developer>
</developers>
@@ -74,9 +74,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -84,6 +84,21 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.28</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.28</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>