You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by sd...@apache.org on 2014/01/20 14:30:25 UTC

svn commit: r1559690 - in /velocity/engine/trunk: ./ velocity-engine-assembly/ velocity-engine-commons-logging/ velocity-engine-core/ velocity-engine-examples/ velocity-engine-log4j/ velocity-engine-servlet/ velocity-engine-slf4j/ velocity-engine-uberjar/

Author: sdumitriu
Date: Mon Jan 20 13:30:24 2014
New Revision: 1559690

URL: http://svn.apache.org/r1559690
Log:
pom simplifications

Modified:
    velocity/engine/trunk/pom.xml
    velocity/engine/trunk/velocity-engine-assembly/pom.xml
    velocity/engine/trunk/velocity-engine-commons-logging/pom.xml
    velocity/engine/trunk/velocity-engine-core/pom.xml
    velocity/engine/trunk/velocity-engine-examples/pom.xml
    velocity/engine/trunk/velocity-engine-log4j/pom.xml
    velocity/engine/trunk/velocity-engine-servlet/pom.xml
    velocity/engine/trunk/velocity-engine-slf4j/pom.xml
    velocity/engine/trunk/velocity-engine-uberjar/pom.xml

Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Mon Jan 20 13:30:24 2014
@@ -18,17 +18,16 @@
     -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>velocity-master</artifactId>
         <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-master</artifactId>
         <version>2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-engine-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
@@ -57,6 +56,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
+                <version>3.3</version>
                 <configuration>
                     <inputEncoding>UTF-8</inputEncoding>
                     <outputEncoding>UTF-8</outputEncoding>
@@ -81,107 +81,13 @@
         </site>
     </distributionManagement>
 
-    <profiles>
-        <profile>
-            <id>maven3</id>
-            <activation>
-                <file>
-                    <!-- This employs that the basedir expression is only
-                        recognized by Maven 3.x (see MNG-2363) -->
-                    <exists>${basedir}</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-site-plugin</artifactId>
-                        <version>3.0-beta-3</version>
-                        <configuration>
-                            <inputEncoding>UTF-8</inputEncoding>
-                            <outputEncoding>UTF-8</outputEncoding>
-                            <reportPlugins>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-project-info-reports-plugin
-                                    </artifactId>
-                                    <version>2.2</version>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-changes-plugin</artifactId>
-                                    <version>2.0</version>
-                                    <configuration>
-                                        <issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
-                                        <component>12311337</component>
-                                        <filter>fixfor=12310290&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
-                                        <maxEntries>100</maxEntries>
-                                        <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
-                                    </configuration>
-                                    <reports>
-                                        <report>changes-report</report>
-                                        <!-- <report>jira-report</report> -->
-                                    </reports>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.codehaus.mojo</groupId>
-                                    <artifactId>taglist-maven-plugin</artifactId>
-                                    <version>2.4</version>
-                                    <configuration>
-                                        <tag>TODO</tag>
-                                        <tag>FIXME</tag>
-                                    </configuration>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-jxr-plugin</artifactId>
-                                    <version>2.2</version>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-javadoc-plugin</artifactId>
-                                    <version>2.7</version>
-                                    <configuration>
-                                        <excludePackageNames>org.apache.velocity.example</excludePackageNames>
-                                        <links>
-                                            <link>http://java.sun.com/j2se/1.5.0/docs/api/
-                                            </link>
-                                            <link>http://jakarta.apache.org/oro/api</link>
-                                            <link>http://commons.apache.org/lang/api-release/
-                                            </link>
-                                            <link>http://commons.apache.org/collections/api-release/
-                                            </link>
-                                            <link>http://logging.apache.org/log4j/1.2/apidocs/
-                                            </link>
-                                            <link>http://excalibur.apache.org/apidocs</link>
-                                            <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/
-                                            </link>
-                                        </links>
-                                    </configuration>
-                                    <reports>
-                                        <report>javadoc</report>
-                                        <report>aggregate</report>
-                                    </reports>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.apache.maven.plugins</groupId>
-                                    <artifactId>maven-changelog-plugin</artifactId>
-                                    <version>2.2</version>
-                                </plugin>
-                            </reportPlugins>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
     <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin
                 </artifactId>
-                <version>2.1</version>
+                <version>2.7</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -217,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.4</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -226,18 +132,13 @@
                 <configuration>
                     <excludePackageNames>org.apache.velocity.example</excludePackageNames>
                     <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/
-                        </link>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
                         <link>http://jakarta.apache.org/oro/api</link>
-                        <link>http://commons.apache.org/lang/api-release/
-                        </link>
-                        <link>http://commons.apache.org/collections/api-release/
-                        </link>
-                        <link>http://logging.apache.org/log4j/1.2/apidocs/
-                        </link>
+                        <link>http://commons.apache.org/lang/api-release/</link>
+                        <link>http://commons.apache.org/collections/api-release/</link>
+                        <link>http://logging.apache.org/log4j/1.2/apidocs/</link>
                         <link>http://excalibur.apache.org/apidocs</link>
-                        <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/
-                        </link>
+                        <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/</link>
                     </links>
                 </configuration>
                 <reportSets>
@@ -264,18 +165,15 @@
     </reporting>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk
-        </connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk
-        </developerConnection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
         <tag>HEAD</tag>
         <url>http://svn.apache.org/viewvc/velocity/engine/trunk
         </url>
     </scm>
 
     <properties>
-        <jira.browse.url>https://issues.apache.org/jira/browse
-        </jira.browse.url>
+        <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
     </properties>
 
     <issueManagement>

Modified: velocity/engine/trunk/velocity-engine-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/pom.xml Mon Jan 20 13:30:24 2014
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>velocity-engine-parent</artifactId>
         <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.velocity</groupId>
+
     <artifactId>velocity-engine-assembly</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Velocity Engine - Assemblies</name>
     <description>Creates assemblies for Apache Velocity Engine</description>
+
     <build>
         <plugins>
             <plugin>
@@ -22,7 +22,7 @@
                     <descriptors>
                         <descriptor>src/main/assembly/all.xml</descriptor>
                     </descriptors>
-                    <finalName>velocity-${version}</finalName>
+                    <finalName>velocity-${project.version}</finalName>
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
             </plugin>
@@ -40,44 +40,37 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-log4j</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-commons-logging</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-slf4j</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-servlet</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-uberjar</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-examples</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     <profiles>

Modified: velocity/engine/trunk/velocity-engine-commons-logging/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-commons-logging/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-commons-logging/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-commons-logging/pom.xml Mon Jan 20 13:30:24 2014
@@ -1,27 +1,26 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>velocity-engine-parent</artifactId>
     <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.velocity</groupId>
+
   <artifactId>velocity-engine-commons-logging</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <name>Apache Velocity - Support for logging in Commons Logging</name>
   <description>Allows to log in Commons Logging.</description>
+
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.1.1</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-      <scope>compile</scope>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Mon Jan 20 13:30:24 2014
@@ -1,14 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>velocity-engine-parent</artifactId>
         <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.velocity</groupId>
+
     <artifactId>velocity-engine-core</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <name>Apache Velocity - Engine</name>
 
 	<properties>

Modified: velocity/engine/trunk/velocity-engine-examples/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-examples/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-examples/pom.xml Mon Jan 20 13:30:24 2014
@@ -1,20 +1,20 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>velocity-engine-parent</artifactId>
     <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.velocity</groupId>
+
   <artifactId>velocity-engine-examples</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <name>Apache Velocity Engine - Examples</name>
   <description>Very simple examples to use Velocity</description>
+
   <dependencies>
   	<dependency>
   		<groupId>org.apache.velocity</groupId>
   		<artifactId>velocity-engine-core</artifactId>
-  		<version>2.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
   	</dependency>
   	<dependency>
   		<groupId>log4j</groupId>
@@ -29,7 +29,7 @@
   	<dependency>
   		<groupId>org.apache.velocity</groupId>
   		<artifactId>velocity-engine-log4j</artifactId>
-  		<version>2.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
   	</dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: velocity/engine/trunk/velocity-engine-log4j/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-log4j/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-log4j/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-log4j/pom.xml Mon Jan 20 13:30:24 2014
@@ -1,20 +1,20 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>velocity-engine-parent</artifactId>
     <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.velocity</groupId>
+
   <artifactId>velocity-engine-log4j</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <name>Apache Velocity - Support for logging in Log4j</name>
   <description>LogChute implementation for Log4j.</description>
+
   <dependencies>
   	<dependency>
   		<groupId>org.apache.velocity</groupId>
   		<artifactId>velocity-engine-core</artifactId>
-  		<version>2.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
   	</dependency>
   	<dependency>
   		<groupId>log4j</groupId>

Modified: velocity/engine/trunk/velocity-engine-servlet/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-servlet/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-servlet/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-servlet/pom.xml Mon Jan 20 13:30:24 2014
@@ -1,15 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>velocity-engine-parent</artifactId>
     <groupId>org.apache.velocity</groupId>
+    <artifactId>velocity-engine-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.velocity</groupId>
+
   <artifactId>velocity-engine-servlet</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <name>Apache Velocity Engine - Servlet support</name>
   <description>Support for servlets in Velocity</description>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -20,7 +20,7 @@
     <dependency>
     	<groupId>org.apache.velocity</groupId>
     	<artifactId>velocity-engine-core</artifactId>
-    	<version>2.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: velocity/engine/trunk/velocity-engine-slf4j/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-slf4j/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-slf4j/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-slf4j/pom.xml Mon Jan 20 13:30:24 2014
@@ -2,15 +2,15 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>velocity-engine-parent</artifactId>
         <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.velocity</groupId>
+
     <artifactId>velocity-engine-slf4j</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <name>Apache Velocity Engine - SLF4J support</name>
     <description>Support for SLF4J logging system.</description>
+
     <dependencies>
     	<dependency>
     		<groupId>org.slf4j</groupId>
@@ -26,7 +26,7 @@
     	<dependency>
     		<groupId>org.apache.velocity</groupId>
     		<artifactId>velocity-engine-core</artifactId>
-    		<version>2.0.0-SNAPSHOT</version>
+            <version>${project.version}</version>
     	</dependency>
     	<dependency>
     		<groupId>junit</groupId>

Modified: velocity/engine/trunk/velocity-engine-uberjar/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-uberjar/pom.xml?rev=1559690&r1=1559689&r2=1559690&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-uberjar/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-uberjar/pom.xml Mon Jan 20 13:30:24 2014
@@ -2,15 +2,15 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>velocity-engine-parent</artifactId>
         <groupId>org.apache.velocity</groupId>
+        <artifactId>velocity-engine-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <groupId>org.apache.velocity</groupId>
+
     <artifactId>velocity-engine-uberjar</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <name>Apache Velocity Engine - Uberjar package</name>
     <description>Creates a JAR package containing all modules.</description>
+
     <build>
         <plugins>
             <plugin>
@@ -43,32 +43,27 @@
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-commons-logging</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-log4j</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-slf4j</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-servlet</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file