You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/12/06 22:43:32 UTC
[jspwiki] 04/14: Maven plugins changes + dependency updates
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit afa00357f68d337b21d81c32d52ce41bd1d48d84
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Dec 6 18:38:30 2019 +0100
Maven plugins changes + dependency updates
* Change javadocs' doclet to UMLDoclet, which can be used with JDK >= 9
* Set compilerVersion to jdk.version on jspc-maven-plugin
* Flexmark updated to 0.50.44
* Lucene updated to 8.3.1
* Selenide updated to 5.5.1
* SLF4J updated to 1.7.29
* Tomcat updated to 8.5.49
---
pom.xml | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f6e968..d669f28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jdk.version>1.8</jdk.version>
+ <jdk.javadoc.doclet.version>1.1.4</jdk.javadoc.doclet.version>
<maven.version>3.5</maven.version>
<akismet-java.version>1.02</akismet-java.version>
@@ -50,7 +51,7 @@
<commons-lang.version>3.9</commons-lang.version>
<commons-text.version>1.8</commons-text.version>
<ehcache.version>2.10.6</ehcache.version>
- <flexmark.version>0.50.42</flexmark.version>
+ <flexmark.version>0.50.44</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
<gson.version>2.8.5</gson.version>
<hsqldb.version>2.5.0</hsqldb.version>
@@ -64,15 +65,15 @@
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.5.2</junit.version>
<log4j.version>1.2.17</log4j.version>
- <lucene.version>8.2.0</lucene.version>
+ <lucene.version>8.3.1</lucene.version>
<nekohtml.version>1.9.22</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
- <selenide.version>5.5.0</selenide.version>
- <slf4j.version>1.7.28</slf4j.version>
+ <selenide.version>5.5.1</selenide.version>
+ <slf4j.version>1.7.29</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>1.22</tika.version>
- <tomcat.version>8.5.47</tomcat.version>
+ <tomcat.version>8.5.49</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
@@ -481,19 +482,16 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${plugin.javadoc.version}</version>
<configuration>
- <additionalOptions>
- <additionalOption>-sourceclasspath ${project.build.outputDirectory}</additionalOption>
- <additionalOption>-Xdoclint:none</additionalOption>
- </additionalOptions>
<author>${project.organization.name}</author>
<bottom>Copyright © {inceptionYear}-{currentYear} ${project.organization.name}. All rights reserved.</bottom>
<breakiterator>true</breakiterator>
- <doclet>org.jboss.apiviz.APIviz</doclet>
+ <doclet>nl.talsmasoftware.umldoclet.UMLDoclet</doclet>
<docletArtifact>
- <groupId>com.grahamedgecombe.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.3.4</version>
+ <groupId>nl.talsmasoftware</groupId>
+ <artifactId>umldoclet</artifactId>
+ <version>${jdk.javadoc.doclet.version}</version>
</docletArtifact>
+ <doclint>none</doclint>
<linksource>true</linksource>
<sourcetab>4</sourcetab>
<quiet>true</quiet>
@@ -604,6 +602,7 @@
<artifactId>jspc-maven-plugin</artifactId>
<version>${plugin.jspc.version}</version>
<configuration>
+ <compilerVersion>${jdk.version}</compilerVersion>
<generatedClasses>${project.build.directory}/ignore</generatedClasses> <!-- only check JSPs are well-formed -->
<keepSources>true</keepSources>
<stopAtFirstError>false</stopAtFirstError>