[maven-release-plugin] prepare release 2.0
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1768373 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 77554e7..4220a96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,7 @@
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>
@@ -32,7 +31,7 @@
</parent>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.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>
diff --git a/velocity-engine-assembly/pom.xml b/velocity-engine-assembly/pom.xml
index e70d1e4..b97261d 100644
--- a/velocity-engine-assembly/pom.xml
+++ b/velocity-engine-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<artifactId>velocity-engine-assembly</artifactId>
@@ -133,20 +133,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>
diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml
index b796918..8bb6f16 100644
--- a/velocity-engine-core/pom.xml
+++ b/velocity-engine-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.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>
diff --git a/velocity-engine-examples/pom.xml b/velocity-engine-examples/pom.xml
index 8b46a29..c3ca069 100644
--- a/velocity-engine-examples/pom.xml
+++ b/velocity-engine-examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<artifactId>velocity-engine-examples</artifactId>
diff --git a/velocity-engine-scripting/pom.xml b/velocity-engine-scripting/pom.xml
index 1716171..9f23e7a 100644
--- a/velocity-engine-scripting/pom.xml
+++ b/velocity-engine-scripting/pom.xml
@@ -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-SNAPSHOT</version>
+ <version>2.0</version>
</parent>
<artifactId>velocity-engine-scripting</artifactId>
<name>Apache Velocity - JSR 223 Scripting</name>
