This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-docgen.git
The following commit(s) were added to refs/heads/master by this push:
new f99647e Updated dependencies, fixed what it has broken.
f99647e is described below
commit f99647e6f1e1ba016e3a026dabd1e94e789deceb
Author: ddekany <[email protected]>
AuthorDate: Sun Jun 1 00:39:09 2025 +0200
Updated dependencies, fixed what it has broken.
---
freemarker-docgen-core/pom.xml | 63 --------------------
freemarker-docgen-maven/pom.xml | 2 +
pom.xml | 127 ++++++++++++++++++++++++++++++++++++++--
rat-excludes | 1 +
4 files changed, 126 insertions(+), 67 deletions(-)
diff --git a/freemarker-docgen-core/pom.xml b/freemarker-docgen-core/pom.xml
index 39034e6..dbb714b 100644
--- a/freemarker-docgen-core/pom.xml
+++ b/freemarker-docgen-core/pom.xml
@@ -32,116 +32,53 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.34</version>
</dependency>
<dependency>
<groupId>com.thaiopensource</groupId>
<artifactId>jing</artifactId>
- <version>20091111</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <!-- Apparently, it's not needed for what we do, so we
avoid license complications. -->
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.docbook</groupId>
<artifactId>docbook-schemas</artifactId>
- <version>5.1-1</version>
<!-- We just need the docbook.rng resource from this artifact, so
we exclude all dependencies. -->
<!-- These exclusions can be removed starting from 5.2. -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.saxon</groupId>
- <artifactId>Saxon-HE</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.xmlresolver</groupId>
- <artifactId>xmlresolver</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<!-- xalan:xalan is needed on Java 9+ -->
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.3</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
-
</dependency>
<dependency>
<!-- Needed for xalan:xalan:2.7.3, as its pom.xml is wrong
(XALANJ-2649) -->
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.3</version>
</dependency>
<dependency>
<!-- Needed for xalan:xalan:2.7.3, as its pom.xml is wrong
(XALANJ-2649) -->
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.12.2</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.12.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>33.2.0-jre</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
- <version>2.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/freemarker-docgen-maven/pom.xml b/freemarker-docgen-maven/pom.xml
index 0bde72a..b362dfe 100644
--- a/freemarker-docgen-maven/pom.xml
+++ b/freemarker-docgen-maven/pom.xml
@@ -62,6 +62,8 @@
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<mojoDependencies>org.apache.freemarker.docgen:freemarker-docgen</mojoDependencies>
+ <goalPrefix>docgen</goalPrefix>
+
<requiredMavenVersion>${dependency.maven.version}</requiredMavenVersion>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index c0b710d..0eba10b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>34</version>
</parent>
<groupId>org.apache.freemarker.docgen</groupId>
@@ -41,8 +41,8 @@
</scm>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<!-- This is updated by the release plugin. This is for Reproducible
Builds. -->
<project.build.outputTimestamp>2024-06-04T20:40:40Z</project.build.outputTimestamp>
</properties>
@@ -54,6 +54,125 @@
<module>freemarker-docgen-cli</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.34</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thaiopensource</groupId>
+ <artifactId>jing</artifactId>
+ <version>20091111</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- Apparently, it's not needed for what we do, so we
avoid license complications. -->
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-schemas</artifactId>
+ <version>5.1-1</version>
+ <!-- We just need the docbook.rng resource from this artifact,
so we exclude all dependencies. -->
+ <!-- These exclusions can be removed starting from 5.2. -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>Saxon-HE</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.xmlresolver</groupId>
+ <artifactId>xmlresolver</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- xalan:xalan is needed on Java 9+ -->
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- Needed for xalan:xalan:2.7.3, as its pom.xml is wrong
(XALANJ-2649) -->
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.3</version>
+ </dependency>
+ <dependency>
+ <!-- Needed for xalan:xalan:2.7.3, as its pom.xml is wrong
(XALANJ-2649) -->
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.19.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.13.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>33.4.8-jre</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>5.13.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -61,7 +180,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.5.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/rat-excludes b/rat-excludes
index e5d6fc2..e41b32b 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -66,6 +66,7 @@ node_modules/**
ide-dependencies/**
archive
.git/**
+.gitattributes
.ivy/**
.bin/**
bin/**
