velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1768333 - in /velocity/engine/trunk: pom.xml velocity-engine-assembly/pom.xml velocity-engine-core/pom.xml velocity-engine-examples/pom.xml velocity-engine-scripting/pom.xml
Date Sun, 06 Nov 2016 14:24:30 GMT
Author: cbrisson
Date: Sun Nov  6 14:24:30 2016
New Revision: 1768333

URL: http://svn.apache.org/viewvc?rev=1768333&view=rev
Log:
[maven-release-plugin] prepare release 2.0

Modified:
    velocity/engine/trunk/pom.xml
    velocity/engine/trunk/velocity-engine-assembly/pom.xml
    velocity/engine/trunk/velocity-engine-core/pom.xml
    velocity/engine/trunk/velocity-engine-examples/pom.xml
    velocity/engine/trunk/velocity-engine-scripting/pom.xml

Modified: velocity/engine/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=1768333&r1=1768332&r2=1768333&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Sun Nov  6 14:24:30 2016
@@ -19,20 +19,19 @@
     under the License.
 
 -->
-<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">
+<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>
     <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-master</artifactId>
-    <version>2-SNAPSHOT</version>
+    <version>2</version>
     <relativePath />
   </parent>
 
   <artifactId>velocity-engine-parent</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0</version>
 
   <name>Apache Velocity</name>
   <url>http://velocity.apache.org/engine/devel/</url>
@@ -97,10 +96,10 @@
   </distributionManagement>
 
   <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/tags/2.0</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/tags/2.0</developerConnection>
     <tag>HEAD</tag>
-    <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
+    <url>http://svn.apache.org/viewvc/velocity/engine/tags/2.0</url>
   </scm>
 
   <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=1768333&r1=1768332&r2=1768333&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/pom.xml Sun Nov  6 14:24:30 2016
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity-engine-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0</version>
     </parent>
 
     <artifactId>velocity-engine-assembly</artifactId>
@@ -116,20 +116,13 @@
                                 </goals>
                                 <configuration>
                                     <tasks>
-                                        <mkdir
-                                            dir="${project.build.directory}/assemblies" />
-                                        <copy
-                                            todir="${project.build.directory}/assemblies">
-                                            <fileset
-                                                dir="${settings.localRepository}/org/apache/velocity/${project.artifactId}/${project.version}">
-                                                <include
-                                                    name="${project.artifactId}-${project.version}-dist.zip*"
/>
-                                                <include
-                                                    name="${project.artifactId}-${project.version}-dist.tar.gz*"
/>
+                                        <mkdir dir="${project.build.directory}/assemblies"
/>
+                                        <copy todir="${project.build.directory}/assemblies">
+                                            <fileset dir="${settings.localRepository}/org/apache/velocity/${project.artifactId}/${project.version}">
+                                                <include name="${project.artifactId}-${project.version}-dist.zip*"
/>
+                                                <include name="${project.artifactId}-${project.version}-dist.tar.gz*"
/>
                                             </fileset>
-                                            <mapper type="glob"
-                                                from="${project.artifactId}-*"
-                                                to="velocity-*" />
+                                            <mapper type="glob" from="${project.artifactId}-*"
to="velocity-*" />
                                         </copy>
                                     </tasks>
                                 </configuration>

Modified: velocity/engine/trunk/velocity-engine-core/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/pom.xml?rev=1768333&r1=1768332&r2=1768333&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-core/pom.xml Sun Nov  6 14:24:30 2016
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-engine-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0</version>
   </parent>
 
   <artifactId>velocity-engine-core</artifactId>
@@ -162,8 +162,7 @@
             <configuration>
               <target if="${parser.create}">
                 <delete quiet="true" verbose="false">
-                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser"
-                    includes="AST*.java,Parser*.java,Token*.java"/>
+                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser"
includes="AST*.java,Parser*.java,Token*.java" />
                 </delete>
               </target>
             </configuration>
@@ -178,13 +177,12 @@
               <target>
                 <!-- delete unnecessary files generated by JavaCC -->
                 <delete quiet="true" verbose="false">
-                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser"
-                    includes="Node.java,ParserVisitor.java,SimpleNode.java"/>
+                  <fileset dir="${basedir}/src/main/java/org/apache/velocity/runtime/parser"
includes="Node.java,ParserVisitor.java,SimpleNode.java" />
                 </delete>
                 <!-- fix JJTParserState class to use our custom Node class -->
                 <replace file="${basedir}/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java">
                   <replacetoken>import org.apache.velocity.runtime.parser.node.Node;</replacetoken>
-                  <replacevalue></replacevalue>
+                  <replacevalue />
                 </replace>
                 <replace file="${basedir}/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java">
                   <replacetoken>package org.apache.velocity.runtime.parser;</replacetoken>

Modified: velocity/engine/trunk/velocity-engine-examples/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-examples/pom.xml?rev=1768333&r1=1768332&r2=1768333&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-examples/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-examples/pom.xml Sun Nov  6 14:24:30 2016
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-engine-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0</version>
   </parent>
 
   <artifactId>velocity-engine-examples</artifactId>

Modified: velocity/engine/trunk/velocity-engine-scripting/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/pom.xml?rev=1768333&r1=1768332&r2=1768333&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-scripting/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-scripting/pom.xml Sun Nov  6 14:24:30 2016
@@ -19,13 +19,12 @@
     under the License.
 
 -->
-<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">
+<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>
     <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-engine-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0</version>
   </parent>
   <artifactId>velocity-engine-scripting</artifactId>
   <name>Apache Velocity - JSR 223 Scripting</name>



Mime
View raw message