commit f2e5bce02cadc7b4238754800345bfef97446e81
author Michael Osipov <michaelo@apache.org> Thu Jun 06 23:26:22 2019 +0200
committer Michael Osipov <michaelo@apache.org> Thu Jun 06 23:26:22 2019 +0200
tree 8ce4f18fcbf0ffead3800705cde7a1ff69ca3a16
parent 98e801fe7e85817d657e630f700280759f1345b8

[DOXIASITETOOLS-199] Upgrade Velocity/Plexus Velocity to 1.7/1.2

doxia-doc-renderer/pom.xml

diff --git a/doxia-doc-renderer/pom.xml b/doxia-doc-renderer/pom.xml
index d89056e..c3a773f 100644
--- a/doxia-doc-renderer/pom.xml
+++ b/doxia-doc-renderer/pom.xml
@@ -102,20 +102,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-velocity</artifactId>
-      <version>1.1.7</version>
+      <version>1.2</version>
       <exclusions>
         <exclusion>
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
@@ -123,13 +115,6 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.5</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- misc -->

doxia-site-renderer/pom.xml

diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index c099db0..188553b 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -115,7 +115,6 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-velocity</artifactId>
-      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -126,7 +125,6 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>

pom.xml

diff --git a/pom.xml b/pom.xml
index 413ff3a..832aa0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,9 +167,20 @@
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-velocity</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <version>3.0.22</version>
       </dependency>
+      <!-- misc -->
+      <dependency>
+        <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>1.7</version>
+      </dependency>
       <!-- Test -->
       <dependency>
         <groupId>junit</groupId>