velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cbris...@apache.org
Subject svn commit: r1768313 - in /velocity/engine/trunk: src/site/ velocity-engine-assembly/pom.xml velocity-engine-assembly/src/main/assembly/all.xml velocity-engine-assembly/src/site/ velocity-engine-core/src/site/ velocity-engine-examples/src/site/
Date Sun, 06 Nov 2016 12:44:58 GMT
Author: cbrisson
Date: Sun Nov  6 12:44:58 2016
New Revision: 1768313

URL: http://svn.apache.org/viewvc?rev=1768313&view=rev
Log:
[engine] update and nicify assembly directory structure

Removed:
    velocity/engine/trunk/src/site/
    velocity/engine/trunk/velocity-engine-assembly/src/site/
    velocity/engine/trunk/velocity-engine-core/src/site/
    velocity/engine/trunk/velocity-engine-examples/src/site/
Modified:
    velocity/engine/trunk/velocity-engine-assembly/pom.xml
    velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml

Modified: velocity/engine/trunk/velocity-engine-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/pom.xml?rev=1768313&r1=1768312&r2=1768313&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/pom.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/pom.xml Sun Nov  6 12:44:58 2016
@@ -85,7 +85,7 @@
                             <execution>
                                 <id>make-assembly</id>
                                 <goals>
-                                    <goal>attached</goal>
+                                    <goal>single</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
@@ -107,7 +107,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
+                        <version>1.3</version>
                         <executions>
                             <execution>
                                 <phase>deploy</phase>
@@ -139,7 +139,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>wagon-maven-plugin</artifactId>
-                        <version>1.0</version>
                         <executions>
                             <execution>
                                 <phase>deploy</phase>

Modified: velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml?rev=1768313&r1=1768312&r2=1768313&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml (original)
+++ velocity/engine/trunk/velocity-engine-assembly/src/main/assembly/all.xml Sun Nov  6 12:44:58
2016
@@ -19,103 +19,101 @@
     under the License.
 
 -->
-<assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
http://maven.apache.org/xsd/assembly-1.1.3.xsd">
     <id>all</id>
     <formats>
         <format>tar.gz</format>
         <format>zip</format>
     </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <unpack>false</unpack>
             <excludes>
                 <exclude>org.apache.velocity:*</exclude>
-                <exclude>org.jdom:jdom</exclude>
+                <exclude>org.jdom:*</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory></outputDirectory>
             <includes>
-                <include>org.apache.velocity:velocity-engine*</include>
+                <include>org.apache.velocity:velocity-engine-core</include>
+                <include>org.apache.velocity:velocity-engine-scripting</include>
             </includes>
-            <excludes>
-                <exclude>org.apache.velocity:velocity-engine-examples</exclude>
-            </excludes>
         </dependencySet>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>/examples</outputDirectory>
             <includes>
                 <include>org.apache.velocity:velocity-engine-examples</include>
             </includes>
         </dependencySet>
         <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>/examples/lib</outputDirectory>
-            <includes>
-                <include>org.jdom:jdom</include>
-            </includes>
         </dependencySet>
     </dependencySets>
-
     <fileSets>
         <fileSet>
             <directory>..</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory></outputDirectory>
             <includes>
                 <include>*LICENSE*</include>
                 <include>NOTICE</include>
                 <include>README.txt</include>
-                <include>CONTRIBUTORS</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>../</directory>
-            <outputDirectory>src/</outputDirectory>
+            <outputDirectory>src</outputDirectory>
             <includes>
                 <include>pom.xml</include>
-                <include>src/</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../velocity-engine-core</directory>
-            <outputDirectory>src/velocity-engine-core</outputDirectory>
+            <directory>../src</directory>
+            <outputDirectory>src</outputDirectory>
             <includes>
-                <include>pom.xml</include>
-                <include>src/</include>
+                <include>changes/*</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../velocity-engine-examples</directory>
-            <outputDirectory>src/velocity-engine-examples
-            </outputDirectory>
+            <directory>../velocity-engine-core</directory>
+            <outputDirectory>src/core</outputDirectory>
             <includes>
                 <include>pom.xml</include>
-                <include>src/</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../velocity-engine-assembly</directory>
-            <outputDirectory>src/velocity-engine-assembly
-            </outputDirectory>
+            <directory>../velocity-engine-core/src</directory>
+            <outputDirectory>src/core</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../velocity-engine-scripting</directory>
+            <outputDirectory>src/scripting</outputDirectory>
             <includes>
                 <include>pom.xml</include>
-                <include>src/</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../target/site</directory>
-            <outputDirectory>docs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../velocity-engine-core/target/site</directory>
-            <outputDirectory>docs/velocity-engine-core</outputDirectory>
+            <directory>../velocity-engine-scripting/src</directory>
+            <outputDirectory>src/scripting</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../velocity-engine-examples/target/site</directory>
-            <outputDirectory>docs/velocity-engine-examples</outputDirectory>
+            <directory>../velocity-engine-examples</directory>
+            <outputDirectory>src/examples</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+            </includes>
         </fileSet>
         <fileSet>
-            <directory>../velocity-engine-assembly/target/site</directory>
-            <outputDirectory>docs/velocity-engine-assembly</outputDirectory>
+            <directory>../velocity-engine-examples/src</directory>
+            <outputDirectory>src/examples</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>../velocity-engine-examples/src/etc</directory>



Mime
View raw message