maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject [maven-doxia-sitetools] 01/10: [DOXIASITETOOLS-199] Upgrade Velocity/Plexus Velocity to 1.7/1.2
Date Thu, 06 Jun 2019 21:38:51 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit f2e5bce02cadc7b4238754800345bfef97446e81
Author: Michael Osipov <michaelo@apache.org>
AuthorDate: Thu Jun 6 23:26:22 2019 +0200

    [DOXIASITETOOLS-199] Upgrade Velocity/Plexus Velocity to 1.7/1.2
---
 doxia-doc-renderer/pom.xml  | 17 +----------------
 doxia-site-renderer/pom.xml |  2 --
 pom.xml                     | 11 +++++++++++
 3 files changed, 12 insertions(+), 18 deletions(-)

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 @@ under the License.
     <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 @@ under the License.
     <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 -->
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 @@ under the License.
     <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 @@ under the License.
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
diff --git a/pom.xml b/pom.xml
index 413ff3a..832aa0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,9 +167,20 @@ under the License.
       </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>


Mime
View raw message