Author: apetrelli
Date: Fri Jul 2 12:58:23 2010
New Revision: 959973
URL: http://svn.apache.org/viewvc?rev=959973&view=rev
Log:
VELOCITYSB-4
Added Shade plugin to the uberjar module.
Added the uberjar module to assembly.
Modified:
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/pom.xml
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-assembly/src/main/assembly/bin.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=959973&r1=959972&r2=959973&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
Fri Jul 2 12:58:23 2010
@@ -55,6 +55,12 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-uberjar</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>
Modified:
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=959973&r1=959972&r2=959973&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/bin.xml
Fri Jul 2 12:58:23 2010
@@ -34,6 +34,16 @@
<includes>
<include>org.apache.velocity:velocity-engine*</include>
</includes>
+ <excludes>
+ <exclude>org.apache.velocity:velocity-engine-uberjar</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+
<outputFileNameMapping>velocity-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.velocity:velocity-engine-uberjar</include>
+ </includes>
</dependencySet>
<dependencySet>
<outputDirectory>/examples</outputDirectory>
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=959973&r1=959972&r2=959973&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
Fri Jul 2 12:58:23 2010
@@ -1,39 +1,67 @@
-<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>
+<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>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-uberjar</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>
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-commons-logging</artifactId>
- <version>2.0.0-SNAPSHOT</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>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-log4j</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-servlet</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <name>Apache Velocity Engine - Uberjar package</name>
+ <description>Creates a JAR package containing all modules.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+
<include>org.apache.velocity:velocity-engine-core</include>
+
<include>org.apache.velocity:velocity-engine-commons-logging</include>
+
<include>org.apache.velocity:velocity-engine-log4j</include>
+
<include>org.apache.velocity:velocity-engine-servlet</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-commons-logging</artifactId>
+ <version>2.0.0-SNAPSHOT</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>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-log4j</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-servlet</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
