Author: tchemit Date: 2011-06-07 18:55:09 +0200 (Tue, 07 Jun 2011) New Revision: 218 Url: http://nuiton.org/repositories/revision/jredmine/218 Log: Evolution #1580: Use now org.apache.velocity instead of velocity groupId Added: trunk/maven-jredmine-plugin/src/main/resources/META-INF/ trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/ trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml Modified: trunk/maven-jredmine-plugin/pom.xml trunk/pom.xml Modified: trunk/maven-jredmine-plugin/pom.xml =================================================================== --- trunk/maven-jredmine-plugin/pom.xml 2011-06-07 13:21:37 UTC (rev 217) +++ trunk/maven-jredmine-plugin/pom.xml 2011-06-07 16:55:09 UTC (rev 218) @@ -135,7 +135,7 @@ </dependency> <dependency> - <groupId>velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> </dependency> Added: trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml =================================================================== --- trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml (rev 0) +++ trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml 2011-06-07 16:55:09 UTC (rev 218) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Maven helper plugin + + $Id$ + $HeadURL: http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plugin-1.3/s... $ + %% + Copyright (C) 2009 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<component-set> + <components> + <component> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <role-hint>maven-jredmine-plugin</role-hint> + <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent + </implementation> + <configuration> + <properties> + <property> + <name>resource.loader</name> + <value>file,class,url</value> + </property> + <property> + <name>class.resource.loader.class</name> + <value> + org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader + </value> + </property> + <property> + <name>file.resource.loader.class</name> + <value> + org.apache.velocity.runtime.resource.loader.FileResourceLoader + </value> + </property> + <property> + <name>url.resource.loader.class</name> + <value> + org.apache.velocity.runtime.resource.loader.URLResourceLoader + </value> + </property> + <property> + <name>url.resource.loader.root</name> + <value/> + </property> + </properties> + </configuration> + </component> + </components> +</component-set> \ No newline at end of file Property changes on: trunk/maven-jredmine-plugin/src/main/resources/META-INF/plexus/components.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 13:21:37 UTC (rev 217) +++ trunk/pom.xml 2011-06-07 16:55:09 UTC (rev 218) @@ -164,6 +164,10 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </exclusion> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> </exclusions> </dependency> @@ -180,9 +184,9 @@ </dependency> <dependency> - <groupId>velocity</groupId> + <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> - <version>1.5</version> + <version>1.7</version> </dependency> <dependency> @@ -358,6 +362,10 @@ <version>2.4</version> <exclusions> <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> + <exclusion> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-simple</artifactId> </exclusion>