Author: kono
Date: 2012-10-03 13:17:30 -0700 (Wed, 03 Oct 2012)
New Revision: 30601

Modified:
   core3/cy3/pom.xml
   core3/gui-distribution/trunk/cmdline-impl/pom.xml
   core3/gui-distribution/trunk/features/pom.xml
   core3/gui-distribution/trunk/launcher/pom.xml
   core3/gui-distribution/trunk/packaging/pom.xml
   core3/gui-distribution/trunk/pom.xml
   core3/parent/trunk/pom.xml
Log:
Child project version numbers had been moved to the top level pom of subgroups. 
 This is necessary to avoid problems when we create release.

Modified: core3/cy3/pom.xml
===================================================================
--- core3/cy3/pom.xml   2012-10-03 19:38:39 UTC (rev 30600)
+++ core3/cy3/pom.xml   2012-10-03 20:17:30 UTC (rev 30601)
@@ -7,7 +7,7 @@
        <packaging>pom</packaging>
        
        <!-- This version number should be same as parent (for consistency) -->
-       <version>3.0.0-beta3-SNAPSHOT</version>
+       <version>3.0.0-beta4-SNAPSHOT</version>
        
        <name>Cytoscape Project POM</name>
 
@@ -20,4 +20,4 @@
                <module>app-developer</module>
                <module>gui-distribution</module>
        </modules>
-</project> 
\ No newline at end of file
+</project> 

Modified: core3/gui-distribution/trunk/cmdline-impl/pom.xml
===================================================================
--- core3/gui-distribution/trunk/cmdline-impl/pom.xml   2012-10-03 19:38:39 UTC 
(rev 30600)
+++ core3/gui-distribution/trunk/cmdline-impl/pom.xml   2012-10-03 20:17:30 UTC 
(rev 30601)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
        <parent>
                <groupId>org.cytoscape.distribution</groupId>
@@ -43,7 +44,7 @@
                        <version>${cytoscape.support.version}</version>
                </dependency>
        </dependencies>
-       
+
        <build>
                <plugins>
                        <plugin>

Modified: core3/gui-distribution/trunk/features/pom.xml
===================================================================
--- core3/gui-distribution/trunk/features/pom.xml       2012-10-03 19:38:39 UTC 
(rev 30600)
+++ core3/gui-distribution/trunk/features/pom.xml       2012-10-03 20:17:30 UTC 
(rev 30601)
@@ -1,6 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
-        
+
        <parent>
                <groupId>org.cytoscape.distribution</groupId>
                <artifactId>parent</artifactId>
@@ -11,7 +12,7 @@
        <artifactId>features</artifactId>
        <packaging>pom</packaging>
        <name>Cytoscape Feature Repository</name>
-       
+
        <build>
                <plugins>
                        <plugin>

Modified: core3/gui-distribution/trunk/launcher/pom.xml
===================================================================
--- core3/gui-distribution/trunk/launcher/pom.xml       2012-10-03 19:38:39 UTC 
(rev 30600)
+++ core3/gui-distribution/trunk/launcher/pom.xml       2012-10-03 20:17:30 UTC 
(rev 30601)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 
        <parent>
                <groupId>org.cytoscape.distribution</groupId>
@@ -9,10 +10,9 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>org.cytoscape.distribution</groupId>
-       
-       <!-- Artifact id *must* start with "karaf-*" so startup scripts
-            add this JAR to the boot classpath -->
+
+       <!-- Artifact id *must* start with "karaf-*" so startup scripts add 
this 
+               JAR to the boot classpath -->
        <artifactId>karaf-launcher</artifactId>
 
        <name>Cytoscape Launcher</name>
@@ -31,7 +31,7 @@
                        <version>${karaf.version}</version>
                </dependency>
        </dependencies>
-       
+
        <build>
                <plugins>
                        <plugin>

Modified: core3/gui-distribution/trunk/packaging/pom.xml
===================================================================
--- core3/gui-distribution/trunk/packaging/pom.xml      2012-10-03 19:38:39 UTC 
(rev 30600)
+++ core3/gui-distribution/trunk/packaging/pom.xml      2012-10-03 20:17:30 UTC 
(rev 30601)
@@ -7,7 +7,6 @@
     <version>3.0.0-beta2-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.cytoscape.distribution</groupId>
   <artifactId>packaging</artifactId>
   <packaging>jar</packaging>
   <name>Cytoscape Release Packaging</name>

Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml        2012-10-03 19:38:39 UTC (rev 
30600)
+++ core3/gui-distribution/trunk/pom.xml        2012-10-03 20:17:30 UTC (rev 
30601)
@@ -16,6 +16,12 @@
        
        <name>Cytoscape Desktop Application Distribution</name>
 
+       <properties>
+               
<cytoscape.api.version>3.0.0-beta4-SNAPSHOT</cytoscape.api.version>
+               
<cytoscape.support.version>3.0.0-beta2-SNAPSHOT</cytoscape.support.version>
+               
<cytoscape.impl.version>3.0.0-beta2-SNAPSHOT</cytoscape.impl.version>
+       </properties>
+
        <build>
                <plugins>
                        <plugin>

Modified: core3/parent/trunk/pom.xml
===================================================================
--- core3/parent/trunk/pom.xml  2012-10-03 19:38:39 UTC (rev 30600)
+++ core3/parent/trunk/pom.xml  2012-10-03 20:17:30 UTC (rev 30601)
@@ -47,12 +47,7 @@
                
<scm.connection.root>scm:svn:http://chianti.ucsd.edu/svn/core3</scm.connection.root>
                
<scm.dev.connection.root>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3</scm.dev.connection.root>
                <scm.url.root>http://chianti.ucsd.edu/svn/core3</scm.url.root>
-               
-               
-               <!-- Sub module versions -->
-               
<cytoscape.api.version>3.0.0-beta4-SNAPSHOT</cytoscape.api.version>
-               
<cytoscape.impl.version>3.0.0-beta2-SNAPSHOT</cytoscape.impl.version>
-               
<cytoscape.support.version>3.0.0-beta2-SNAPSHOT</cytoscape.support.version>
+
        </properties>
 
        <distributionManagement>

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