Author: mes
Date: 2011-05-16 16:37:33 -0700 (Mon, 16 May 2011)
New Revision: 25454

Modified:
   core3/gui-distribution/trunk/pom.xml
   core3/gui-distribution/trunk/splash-launcher/pom.xml
   core3/gui-distribution/trunk/startlevel-1/pom.xml
   core3/gui-distribution/trunk/startlevel-3/pom.xml
Log:
merged M2 version changes from branch

Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml        2011-05-16 23:32:52 UTC (rev 
25453)
+++ core3/gui-distribution/trunk/pom.xml        2011-05-16 23:37:33 UTC (rev 
25454)
@@ -72,7 +72,7 @@
             <dependency>
               <groupId>org.cytoscape</groupId>
               <artifactId>startlevel-assembly</artifactId>
-              <version>3.0.0-alpha2-SNAPSHOT</version>
+              <version>3.0.0-alpha2</version>
             </dependency>
           </dependencies>
           <executions>

Modified: core3/gui-distribution/trunk/splash-launcher/pom.xml
===================================================================
--- core3/gui-distribution/trunk/splash-launcher/pom.xml        2011-05-16 
23:32:52 UTC (rev 25453)
+++ core3/gui-distribution/trunk/splash-launcher/pom.xml        2011-05-16 
23:37:33 UTC (rev 25454)
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.cytoscape</groupId>
       <artifactId>launcher</artifactId>
-      <version>3.0.0-alpha2-SNAPSHOT</version>
+      <version>3.0.0-alpha2</version>
     </dependency>
   </dependencies>
 

Modified: core3/gui-distribution/trunk/startlevel-1/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-1/pom.xml   2011-05-16 23:32:52 UTC 
(rev 25453)
+++ core3/gui-distribution/trunk/startlevel-1/pom.xml   2011-05-16 23:37:33 UTC 
(rev 25454)
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.cytoscape</groupId>
       <artifactId>splash-updater-impl</artifactId>
-      <version>3.0.0-alpha1-SNAPSHOT</version>
+      <version>3.0.0-alpha1</version>
     </dependency>
 
 

Modified: core3/gui-distribution/trunk/startlevel-3/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-3/pom.xml   2011-05-16 23:32:52 UTC 
(rev 25453)
+++ core3/gui-distribution/trunk/startlevel-3/pom.xml   2011-05-16 23:37:33 UTC 
(rev 25454)
@@ -118,234 +118,234 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>model-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha4</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>viewmodel-api</artifactId>
-                       <version>3.0.0-alpha4-SNAPSHOT</version>
+                       <version>3.0.0-alpha4</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>vizmap-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>vizmap-gui-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>work-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>work-swing-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>swing-application-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>event-api</artifactId>
-                       <version>3.0.0-alpha4-SNAPSHOT</version>
+                       <version>3.0.0-alpha5</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>plugin-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>dnd-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>io-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>session-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>core-task-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>layout-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>layout-impl</artifactId>
-                       <version>3.0.0-alpha1-SNAPSHOT</version>
+                       <version>3.0.0-alpha1</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>presentation-api</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>property-api</artifactId>
-                       <version>3.0.0-alpha4-SNAPSHOT</version>
+                       <version>3.0.0-alpha4</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>webservice-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- Cytoscape Implementation Bundles -->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>search-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>table-browser-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>swing-application-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>ding-presentation-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>event-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>model-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>work-swing-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>core-task-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>session-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>io-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>work-spring-hack</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>viewmodel-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>vizmap-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>graph-render</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>util-intr</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>spacial</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>equations-api</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>equations-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>vizmap-gui-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>default-mappings</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>log-swing-impl</artifactId>
-                       <version>3.0.0-alpha1</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>property-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>swing-util</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>math-xform</artifactId>
-                       <version>3.0.0-alpha1</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>manual-layout-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>layout-cytoscape-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>webservice-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>presentation-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
 
                <!-- Other dependencies -->
@@ -369,28 +369,28 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>plugin-impl</artifactId>
-                       <version>3.0.0-alpha3-SNAPSHOT</version>
+                       <version>3.0.0-alpha3</version>
                </dependency>
 
                <!-- A utility that allows you to register services dynamically 
-->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>service-util</artifactId>
-                       <version>3.0.0-alpha1</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- Editor Plugin -->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>editor-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- prefuse layouts -->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>layout-prefuse-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>cytoscape-temp</groupId>
@@ -402,21 +402,21 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>linkout-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- PSI-MI -->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>psi-mi-impl</artifactId>
-                       <version>1.0-SNAPSHOT</version>
+                       <version>1.0</version>
                </dependency>
 
                <!-- network analyzer -->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>network-analyzer-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- Required by plugin manager -->
@@ -440,7 +440,7 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        
<artifactId>ding-customgraphics-manager-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- freehep -->
@@ -488,14 +488,14 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>table-import-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
 
                <!-- Web service clients -->
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>webservice-biomart-client-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>org.cytoscape</groupId>
@@ -507,7 +507,7 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>filter-impl</artifactId>
-                       <version>3.0.0-alpha2-SNAPSHOT</version>
+                       <version>3.0.0-alpha2</version>
                </dependency>
                <dependency>
                        <groupId>cytoscape-temp</groupId>
@@ -519,7 +519,7 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>sbml-impl</artifactId>
-                       <version>1.0-SNAPSHOT</version>
+                       <version>3.0.0-alpha1</version>
                </dependency>
                <dependency>
                        <groupId>cytoscape-temp</groupId>
@@ -561,7 +561,7 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>biopax-impl</artifactId>
-                       <version>1.0-SNAPSHOT</version>
+                       <version>3.0.0-alpha1</version>
                </dependency>
                <dependency>
                        <groupId>cytoscape-temp</groupId>
@@ -593,7 +593,7 @@
                <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>cpath2-impl</artifactId>
-                       <version>1.0-SNAPSHOT</version>
+                       <version>3.0.0-alpha1</version>
                </dependency>
                <dependency>
                        <groupId>cytoscape-temp</groupId>

-- 
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