[jboss-cvs] JBossAS SVN: r88089 - in projects/fresh/trunk: fresh-jar and 8 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: pgier
Date: 2009-04-30 23:45:17 -0400 (Thu, 30 Apr 2009)
New Revision: 88089

Added:
   projects/fresh/trunk/fresh-jar/src/main/assembly/
   projects/fresh/trunk/fresh-jar/src/main/assembly/fresh-jar.xml
Modified:
   projects/fresh/trunk/fresh-jar/pom.xml
   projects/fresh/trunk/fresh-scripting/
   projects/fresh/trunk/fresh-shell/
   projects/fresh/trunk/fresh-ssh/
   projects/fresh/trunk/fresh-threadpool/
   projects/fresh/trunk/fresh-util/
   projects/fresh/trunk/fresh-vfs/
   projects/fresh/trunk/pom.xml
Log:
Use assembly plugin to generate fresh-jar.

Modified: projects/fresh/trunk/fresh-jar/pom.xml
===================================================================
--- projects/fresh/trunk/fresh-jar/pom.xml	2009-05-01 03:21:48 UTC (rev 88088)
+++ projects/fresh/trunk/fresh-jar/pom.xml	2009-05-01 03:45:17 UTC (rev 88089)
@@ -11,14 +11,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.fresh</groupId>
   <artifactId>fresh-jar</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>JBoss Fresh - JAR</name>
   <url>http://www.jboss.org/fresh</url>
   <description>JBoss Fresh - JAR</description>
   
   <build>
     <plugins>
-      <plugin>
+      <!--<plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <version>1.2.1</version>
@@ -45,6 +45,25 @@
             </configuration>
           </execution>
         </executions>
+      </plugin>-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-3</version>
+        <executions>
+          <execution>
+            <id>fresh-jar</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/fresh-jar.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

Added: projects/fresh/trunk/fresh-jar/src/main/assembly/fresh-jar.xml
===================================================================
--- projects/fresh/trunk/fresh-jar/src/main/assembly/fresh-jar.xml	                        (rev 0)
+++ projects/fresh/trunk/fresh-jar/src/main/assembly/fresh-jar.xml	2009-05-01 03:45:17 UTC (rev 88089)
@@ -0,0 +1,29 @@
+<assembly>
+  <id></id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <baseDirectory>/</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <includes>
+        <include>org.jboss.fresh:fresh-scripting</include>
+        <include>org.jboss.fresh:fresh-shell</include>
+        <include>org.jboss.fresh:fresh-ssh</include>
+        <include>org.jboss.fresh:fresh-threadpool</include>
+        <include>org.jboss.fresh:fresh-util</include>
+        <include>org.jboss.fresh:fresh-vfs</include>
+        <include>sshtools:j2ssh-common</include>
+        <include>sshtools:j2ssh-core</include>
+        <include>sshtools:j2ssh-daemon</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: projects/fresh/trunk/fresh-jar/src/main/assembly/fresh-jar.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


Property changes on: projects/fresh/trunk/fresh-scripting
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: projects/fresh/trunk/fresh-shell
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: projects/fresh/trunk/fresh-ssh
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: projects/fresh/trunk/fresh-threadpool
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: projects/fresh/trunk/fresh-util
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: projects/fresh/trunk/fresh-vfs
___________________________________________________________________
Name: svn:ignore
   + target


Modified: projects/fresh/trunk/pom.xml
===================================================================
--- projects/fresh/trunk/pom.xml	2009-05-01 03:21:48 UTC (rev 88088)
+++ projects/fresh/trunk/pom.xml	2009-05-01 03:45:17 UTC (rev 88089)
@@ -80,19 +80,6 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>make-assembly</id>
-              <phase>package</phase>
-              <goals>
-                <goal>attached</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
           <artifactId>maven-idea-plugin</artifactId>
           <configuration>
             <downloadSources>true</downloadSources>