Author: mes
Date: 2011-03-10 14:33:53 -0800 (Thu, 10 Mar 2011)
New Revision: 24402

Modified:
   core3/gui-distribution/trunk/distribution/pom.xml
   core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml
   core3/gui-distribution/trunk/pom.xml
   core3/gui-distribution/trunk/splash-launcher/pom.xml
Log:
updated for maven 3

Modified: core3/gui-distribution/trunk/distribution/pom.xml
===================================================================
--- core3/gui-distribution/trunk/distribution/pom.xml   2011-03-10 22:29:33 UTC 
(rev 24401)
+++ core3/gui-distribution/trunk/distribution/pom.xml   2011-03-10 22:33:53 UTC 
(rev 24402)
@@ -23,6 +23,7 @@
           <descriptors>
             <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
+                 <appendAssemblyId>false</appendAssemblyId>
         </configuration>
         <executions>
           <execution>
@@ -48,25 +49,25 @@
     <dependency>
       <groupId>org.cytoscape.gui-distribution</groupId>
       <artifactId>splash-launcher</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
          <classifier>jar-with-dependencies</classifier>
     </dependency>
     <dependency>
       <groupId>org.cytoscape.gui-distribution</groupId>
       <artifactId>startlevel-1</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>zip</type>
     </dependency>
     <dependency>
       <groupId>org.cytoscape.gui-distribution</groupId>
       <artifactId>startlevel-2</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>zip</type>
     </dependency>
     <dependency>
       <groupId>org.cytoscape.gui-distribution</groupId>
       <artifactId>startlevel-3</artifactId>
-      <version>${version}</version>
+      <version>${project.version}</version>
       <type>zip</type>
     </dependency>
   </dependencies>

Modified: core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml
===================================================================
--- core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml 
2011-03-10 22:29:33 UTC (rev 24401)
+++ core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml 
2011-03-10 22:33:53 UTC (rev 24402)
@@ -1,6 +1,7 @@
 <assembly 
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+  <id>distribution-assembly</id>
   <formats>
     <format>zip</format>
   </formats>

Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml        2011-03-10 22:29:33 UTC (rev 
24401)
+++ core3/gui-distribution/trunk/pom.xml        2011-03-10 22:33:53 UTC (rev 
24402)
@@ -65,14 +65,14 @@
       <plugins>
         <!-- this assembly is only for the startlevel modules, distribution 
has its own -->
         <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-         <version>2.2</version>
+          <version>${maven-assembly-plugin.version}</version>
           <dependencies>
             <dependency>
               <groupId>org.cytoscape</groupId>
               <artifactId>startlevel-assembly</artifactId>
-              <version>3.0.0-alpha1</version>
+              <version>3.0.0-alpha2-SNAPSHOT</version>
             </dependency>
           </dependencies>
           <executions>

Modified: core3/gui-distribution/trunk/splash-launcher/pom.xml
===================================================================
--- core3/gui-distribution/trunk/splash-launcher/pom.xml        2011-03-10 
22:29:33 UTC (rev 24401)
+++ core3/gui-distribution/trunk/splash-launcher/pom.xml        2011-03-10 
22:33:53 UTC (rev 24402)
@@ -57,7 +57,9 @@
         </dependencies>
       </plugin>
       <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to