[maven-jxr] branch master updated: [JXR-146] upgrade Doxia Sitetools to 1.9.2: remove dependency on Struts

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e10e03  [JXR-146] upgrade Doxia Sitetools to 1.9.2: remove dependency on Struts
7e10e03 is described below

commit 7e10e03ceda95c5c07a0a0d6841d28dbff2c3c7a
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat May 30 17:28:57 2020 +0200

    [JXR-146] upgrade Doxia Sitetools to 1.9.2: remove dependency on Struts
---
 maven-jxr-plugin/pom.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/maven-jxr-plugin/pom.xml b/maven-jxr-plugin/pom.xml
index e265ce0..6db9669 100644
--- a/maven-jxr-plugin/pom.xml
+++ b/maven-jxr-plugin/pom.xml
@@ -37,8 +37,7 @@ under the License.
 
   <properties>
     <mavenVersion>3.1.0</mavenVersion> <!-- support javax.inject -->
-    <doxia-sitetoolsVersion>1.8</doxia-sitetoolsVersion>
-    <doxiaVersion>1.9.3</doxiaVersion>
+    <doxia-sitetoolsVersion>1.9.2</doxia-sitetoolsVersion>
   </properties>
 
   <prerequisites>
@@ -123,6 +122,11 @@ under the License.
 
     <!-- shared -->
     <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>${doxia-sitetoolsVersion}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
       <version>3.0.0</version>
@@ -133,11 +137,6 @@ under the License.
       <version>1.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxia-sitetoolsVersion}</version>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-java</artifactId>
     </dependency>