You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by ap...@apache.org on 2010/07/15 16:48:41 UTC
svn commit: r964450 - in /velocity/sandbox/maven-reorg/engine/trunk:
velocity-engine-assembly/ velocity-engine-assembly/src/main/assembly/
velocity-engine-servlet/ velocity-engine-uberjar/
Author: apetrelli
Date: Thu Jul 15 14:48:40 2010
New Revision: 964450
URL: http://svn.apache.org/viewvc?rev=964450&view=rev
Log:
VELOCITYSB-4
Removed the examples jar from the root of the assembly (left in "examples").
Renamed the suffix of the assembly into "all" (instead of "bin").
Modified WHY_TWO_JARS.txt into WHY_FIVE_JAR.txt
Added:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml
- copied, changed from r961430, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
Removed:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-uberjar/pom.xml
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml?rev=964450&r1=964449&r2=964450&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml Thu Jul 15 14:48:40 2010
@@ -20,7 +20,7 @@
<version>2.2-beta-5</version>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/all.xml</descriptor>
</descriptors>
<finalName>velocity-${version}</finalName>
<tarLongFileMode>gnu</tarLongFileMode>
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-servlet</artifactId>
+ <artifactId>velocity-engine-servlet-logger</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -94,7 +94,7 @@
</executions>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/all.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -125,9 +125,9 @@
<fileset
dir="${settings.localRepository}/org/apache/velocity/${project.artifactId}/${project.version}">
<include
- name="${project.artifactId}-${project.version}-bin.zip*" />
+ name="${project.artifactId}-${project.version}-all.zip*" />
<include
- name="${project.artifactId}-${project.version}-bin.tar.gz*" />
+ name="${project.artifactId}-${project.version}-all.tar.gz*" />
</fileset>
<mapper type="glob"
from="${project.artifactId}-*"
Copied: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml (from r961430, velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml?p2=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml&p1=velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml&r1=961430&r2=964450&rev=964450&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml Thu Jul 15 14:48:40 2010
@@ -16,7 +16,7 @@
and limitations under the License.
-->
<assembly>
- <id>bin</id>
+ <id>all</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -36,6 +36,7 @@
</includes>
<excludes>
<exclude>org.apache.velocity:velocity-engine-uberjar</exclude>
+ <include>org.apache.velocity:velocity-engine-examples</include>
</excludes>
</dependencySet>
<dependencySet>
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml?rev=964450&r1=964449&r2=964450&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/pom.xml Thu Jul 15 14:48:40 2010
@@ -6,7 +6,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-servlet</artifactId>
+ <artifactId>velocity-engine-servlet-logger</artifactId>
<version>2.0.0-SNAPSHOT</version>
<name>Apache Velocity Engine - Servlet support</name>
<description>Support for servlets in Velocity</description>
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-uberjar/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-uberjar/pom.xml?rev=964450&r1=964449&r2=964450&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-uberjar/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-uberjar/pom.xml Thu Jul 15 14:48:40 2010
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-servlet</artifactId>
+ <artifactId>velocity-engine-servlet-logger</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>