Author: kono
Date: 2012-09-18 14:29:37 -0700 (Tue, 18 Sep 2012)
New Revision: 30381
Modified:
core3/gui-distribution/trunk/pom.xml
core3/headless-distribution/trunk/pom.xml
core3/parent/trunk/pom.xml
core3/support/trunk/archetypes/pom.xml
core3/support/trunk/pom.xml
Log:
Some duplicate props had been removed from pom.
Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml 2012-09-18 21:08:01 UTC (rev
30380)
+++ core3/gui-distribution/trunk/pom.xml 2012-09-18 21:29:37 UTC (rev
30381)
@@ -14,37 +14,8 @@
<version>3.0.0-M6-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Cytoscape Distribution</name>
+ <name>Cytoscape Desktop Application Distribution</name>
- <properties>
- <karaf.version>2.2.9</karaf.version>
- </properties>
-
- <repositories>
- <repository>
- <id>cytoscape_snapshots</id>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <name>Cytoscape Snapshots</name>
-
<url>http://code.cytoscape.org/nexus/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>cytoscape_releases</id>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <name>Cytoscape Releases</name>
-
<url>http://code.cytoscape.org/nexus/content/repositories/releases/</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
Modified: core3/headless-distribution/trunk/pom.xml
===================================================================
--- core3/headless-distribution/trunk/pom.xml 2012-09-18 21:08:01 UTC (rev
30380)
+++ core3/headless-distribution/trunk/pom.xml 2012-09-18 21:29:37 UTC (rev
30381)
@@ -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";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -8,46 +9,14 @@
<version>3.0.0-beta3-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
-
+
<groupId>org.cytoscape.headless-distribution</groupId>
<artifactId>parent</artifactId>
- <version>3.0.0-M4-SNAPSHOT</version>
+ <version>3.0.0-M6-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<name>Cytoscape Headless Distribution</name>
- <properties>
-
<cytoscape.api.version>3.0.0-beta3-SNAPSHOT</cytoscape.api.version>
-
<cytoscape.impl.version>3.0.0-alpha9-SNAPSHOT</cytoscape.impl.version>
-
<cytoscape.support.version>3.0.0-alpha8-SNAPSHOT</cytoscape.support.version>
- <karaf.version>2.2.7</karaf.version>
- </properties>
-
- <repositories>
- <repository>
- <id>cytoscape_snapshots</id>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <name>Cytoscape Snapshots</name>
-
<url>http://code.cytoscape.org/nexus/content/repositories/snapshots/</url>
- </repository>
- <repository>
- <id>cytoscape_releases</id>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <name>Cytoscape Releases</name>
-
<url>http://code.cytoscape.org/nexus/content/repositories/releases/</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -74,14 +43,14 @@
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
-
<goal>copy-dependencies</goal>
+
<goal>copy-dependencies</goal>
</goals>
<configuration>
-
<outputDirectory>${project.build.directory}/bundles</outputDirectory>
-
<overWriteReleases>false</overWriteReleases>
-
<overWriteSnapshots>true</overWriteSnapshots>
-
<overWriteIfNewer>true</overWriteIfNewer>
-
<excludeTransitive>true</excludeTransitive>
+
<outputDirectory>${project.build.directory}/bundles</outputDirectory>
+
<overWriteReleases>false</overWriteReleases>
+
<overWriteSnapshots>true</overWriteSnapshots>
+
<overWriteIfNewer>true</overWriteIfNewer>
+
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -89,7 +58,7 @@
</plugins>
</pluginManagement>
</build>
-
+
<profiles>
<profile>
<id>all</id>
Modified: core3/parent/trunk/pom.xml
===================================================================
--- core3/parent/trunk/pom.xml 2012-09-18 21:08:01 UTC (rev 30380)
+++ core3/parent/trunk/pom.xml 2012-09-18 21:29:37 UTC (rev 30381)
@@ -21,6 +21,9 @@
<!-- OSGi framework version -->
<osgi.api.version>4.2.0</osgi.api.version>
+
+ <!-- Karaf framework version. Used by both GUI/Headless -->
+ <karaf.version>2.2.9</karaf.version>
<!-- PAX Exam version. This is for integration testing -->
<pax.exam.version>1.2.2</pax.exam.version>
@@ -47,7 +50,7 @@
<scm.url.root>http://chianti.ucsd.edu/svn/core3</scm.url.root>
- <!-- Child Cytoscape module versions -->
+ <!-- Sub module versions -->
<cytoscape.api.version>3.0.0-beta3-SNAPSHOT</cytoscape.api.version>
<cytoscape.impl.version>3.0.0-alpha10-SNAPSHOT</cytoscape.impl.version>
<cytoscape.support.version>3.0.0-alpha9-SNAPSHOT</cytoscape.support.version>
@@ -80,7 +83,6 @@
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArguments>
- <!--
<compilerArgument>-Xlint:all -Xlint:-path</compilerArgument> -->
<Xmaxwarns>10000</Xmaxwarns>
<Xmaxerrs>10000</Xmaxerrs>
</compilerArguments>
Modified: core3/support/trunk/archetypes/pom.xml
===================================================================
--- core3/support/trunk/archetypes/pom.xml 2012-09-18 21:08:01 UTC (rev
30380)
+++ core3/support/trunk/archetypes/pom.xml 2012-09-18 21:29:37 UTC (rev
30381)
@@ -18,32 +18,6 @@
<module>cyaction-app</module>
</modules>
- <repositories>
- <!-- bootstrap for cytoscape dependencies, namely the parent
POM snapshots -->
- <repository>
- <id>cytoscape_snapshots</id>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- <name>Cytoscape Snapshots</name>
-
<url>http://code.cytoscape.org/nexus/content/repositories/snapshots/</url>
- </repository>
- <!-- bootstrap for cytoscape dependencies, namely the parent
POM releases -->
- <repository>
- <id>cytoscape_releases</id>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <name>Cytoscape Releases</name>
-
<url>http://code.cytoscape.org/nexus/content/repositories/releases/</url>
- </repository>
- </repositories>
<build>
<extensions>
<extension>
@@ -52,6 +26,7 @@
<version>2.2</version>
</extension>
</extensions>
+
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
Modified: core3/support/trunk/pom.xml
===================================================================
--- core3/support/trunk/pom.xml 2012-09-18 21:08:01 UTC (rev 30380)
+++ core3/support/trunk/pom.xml 2012-09-18 21:29:37 UTC (rev 30381)
@@ -11,7 +11,7 @@
</parent>
<artifactId>support-parent</artifactId>
- <version>${cytoscape.support.version}</version>
+ <version>3.0.0-alpha9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cytoscape Support Parent Project POM</name>
--
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.
