[FOray-commit] SF.net SVN: foray:[11080] trunk/foray

[<vic...@us...>]

Revision: 11080
          http://foray.svn.sourceforge.net/foray/?rev=11080&view=rev
Author:   victormote
Date:     2011-10-29 17:09:41 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Move the assembly descriptors to the "all" project.

Modified Paths:
--------------
    trunk/foray/foray-app/pom.xml

Added Paths:
-----------
    trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml
    trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml

Removed Paths:
-------------
    trunk/foray/foray-app/scripts/maven-assembly-shaded.xml
    trunk/foray/foray-app/scripts/maven-assembly-source.xml

Copied: trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml (from rev 11078, trunk/foray/foray-app/scripts/maven-assembly-shaded.xml)
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml	                        (rev 0)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-shaded.xml	2011-10-29 17:09:41 UTC (rev 11080)
@@ -0,0 +1,19 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+        http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>shaded</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Copied: trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml (from rev 11079, trunk/foray/foray-app/scripts/maven-assembly-source.xml)
===================================================================
--- trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml	                        (rev 0)
+++ trunk/foray/foray-all/scripts/maven/maven-assembly-source.xml	2011-10-29 17:09:41 UTC (rev 11080)
@@ -0,0 +1,24 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+        http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/..</directory>
+      <includes>
+        <include>**/src/**</include>
+      </includes>
+      <excludes>
+        <exclude>lib/**</exclude>
+        <exclude>lib-build/**</exclude>
+      </excludes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+  </fileSets>
+</assembly>

Modified: trunk/foray/foray-app/pom.xml
===================================================================
--- trunk/foray/foray-app/pom.xml	2011-10-27 00:05:13 UTC (rev 11079)
+++ trunk/foray/foray-app/pom.xml	2011-10-29 17:09:41 UTC (rev 11080)
@@ -189,8 +189,8 @@
         </executions>
         <configuration>
           <descriptors>
-            <descriptor>scripts/maven-assembly-shaded.xml</descriptor>
-            <descriptor>scripts/maven-assembly-source.xml</descriptor>
+            <descriptor>../foray-all/scripts/maven/maven-assembly-shaded.xml</descriptor>
+            <descriptor>../foray-all/scripts/maven/maven-assembly-source.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

Deleted: trunk/foray/foray-app/scripts/maven-assembly-shaded.xml
===================================================================
--- trunk/foray/foray-app/scripts/maven-assembly-shaded.xml	2011-10-27 00:05:13 UTC (rev 11079)
+++ trunk/foray/foray-app/scripts/maven-assembly-shaded.xml	2011-10-29 17:09:41 UTC (rev 11080)
@@ -1,19 +0,0 @@
-<assembly
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-        http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>shaded</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>

Deleted: trunk/foray/foray-app/scripts/maven-assembly-source.xml
===================================================================
--- trunk/foray/foray-app/scripts/maven-assembly-source.xml	2011-10-27 00:05:13 UTC (rev 11079)
+++ trunk/foray/foray-app/scripts/maven-assembly-source.xml	2011-10-29 17:09:41 UTC (rev 11080)
@@ -1,24 +0,0 @@
-<assembly
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-        http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/..</directory>
-      <includes>
-        <include>**/src/**</include>
-      </includes>
-      <excludes>
-        <exclude>lib/**</exclude>
-        <exclude>lib-build/**</exclude>
-      </excludes>
-      <useDefaultExcludes>true</useDefaultExcludes>
-    </fileSet>
-  </fileSets>
-</assembly>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.