Author: apetrelli
Date: Tue Jun 29 13:45:16 2010
New Revision: 958966
URL: http://svn.apache.org/viewvc?rev=958966&view=rev
Log:
VELOCITYSB-4
Added assembly descriptor.
Added:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
(with props)
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/
(props changed)
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 29 13:45:16 2010
@@ -1 +1,2 @@
.*
+target
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=958966&r1=958965&r2=958966&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
Tue Jun 29 13:45:16 2010
@@ -1,28 +1,45 @@
-<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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>velocity-engine-parent</artifactId>
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>velocity-engine-parent</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-assembly</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>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-examples</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <packaging>pom</packaging>
+ <name>Apache Velocity Engine - Assemblies</name>
+ <description>Creates assemblies for Apache Velocity Engine</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <finalName>velocity-${version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-examples</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Added:
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/bin.xml?rev=958966&view=auto
==============================================================================
---
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
(added)
+++
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
Tue Jun 29 13:45:16 2010
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or
+ more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding
+ copyright ownership. The ASF licenses this file to You under the
+ Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain
+ a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+ -->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <excludes>
+ <exclude>org.apache.velocity:*</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.velocity:velocity-engine</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*LICENSE*</include>
+ <include>NOTICE</include>
+ <include>README.txt</include>
+ <include>CONTRIBUTORS</include>
+ <include>WHY_TWO_JARS.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine</directory>
+ <outputDirectory>src/velocity-engine</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-examples</directory>
+ <outputDirectory>src/velocity-engine-examples
+ </outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-assembly</directory>
+ <outputDirectory>src/velocity-engine-assembly
+ </outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine/target/site</directory>
+ <outputDirectory>docs/velocity-engine</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-examples/target/site</directory>
+ <outputDirectory>docs/velocity-engine-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-engine-assembly/target/site</directory>
+ <outputDirectory>docs/velocity-engine-assembly</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml?rev=958966&r1=958965&r2=958966&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml Tue Jun
29 13:45:16 2010
@@ -63,22 +63,8 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -87,12 +73,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>2.0</version>
