Author: mes
Date: 2010-11-19 14:19:24 -0800 (Fri, 19 Nov 2010)
New Revision: 22946
Modified:
core3/vizmap-impl/trunk/impl/pom.xml
core3/vizmap-impl/trunk/it/pom.xml
core3/vizmap-impl/trunk/pom.xml
Log:
cleaned up poms
Modified: core3/vizmap-impl/trunk/impl/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/impl/pom.xml 2010-11-19 22:08:07 UTC (rev
22945)
+++ core3/vizmap-impl/trunk/impl/pom.xml 2010-11-19 22:19:24 UTC (rev
22946)
@@ -35,17 +35,12 @@
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
<version>1.4</version>
- <!-- | enable improved OSGi compilation support
for the bundle life-cycle.
- | to switch back to the standard bundle
life-cycle, move this setting | down
- to the maven-bundle-plugin section -->
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
- <!-- | the following instructions build a
simple set of public/private
- classes into an OSGi bundle -->
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
@@ -56,73 +51,4 @@
</plugin>
</plugins>
</build>
-
- <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://cytoscape.wodaklab.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://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url>
- </repository>
- </repositories>
- <dependencies>
-
- <!-- Cytoscape modules -->
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>vizmap-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
- </dependency>
-
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>vizmap-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>presentation-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>viewmodel-impl</artifactId>
- <version>3.0.0-alpha1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
Modified: core3/vizmap-impl/trunk/it/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/it/pom.xml 2010-11-19 22:08:07 UTC (rev 22945)
+++ core3/vizmap-impl/trunk/it/pom.xml 2010-11-19 22:19:24 UTC (rev 22946)
@@ -52,121 +52,68 @@
</plugins>
</build>
- <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://cytoscape.wodaklab.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://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url>
- </repository>
- </repositories>
-
+ <!--
+ This is where any additional implementation dependencies necessary for
+ running the integration tests should reside, NOT in the top level
pom.xml.
+ -->
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
+ <artifactId>vizmap-impl</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-impl</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>event-api</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>event-impl</artifactId>
<version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>presentation-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>vizmap-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>integration-test-support</artifactId>
<version>3.0.0-alpha3-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>presentation-api</artifactId>
- <version>3.0.0-alpha2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>viewmodel-impl</artifactId>
<version>3.0.0-alpha1</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
+ <version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
+ <version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>1.2.0</version>
+ <version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: core3/vizmap-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/pom.xml 2010-11-19 22:08:07 UTC (rev 22945)
+++ core3/vizmap-impl/trunk/pom.xml 2010-11-19 22:19:24 UTC (rev 22946)
@@ -1,21 +1,101 @@
<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</groupId>
- <artifactId>parent</artifactId>
- <version>3.0.0-alpha4-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-alpha4-SNAPSHOT</version>
+ </parent>
- <groupId>org.cytoscape</groupId>
- <artifactId>vizmap-impl-parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>vizmap-impl-parent</name>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>vizmap-impl-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>vizmap-impl-parent</name>
- <modules>
- <module>impl</module>
- <module>it</module>
- </modules>
+ <modules>
+ <module>impl</module>
+ <module>it</module>
+ </modules>
+ <scm>
+
<connection>scm:svn:http://chianti.ucsd.edu/svn/core3/vizmap-impl/trunk</connection>
+
<developerConnection>scm:svn:svn+ssh://grenache.ucsd.edu/cellar/common/svn/core3/vizmap-impl/trunk</developerConnection>
+ <url>http://chianti.ucsd.edu/svn/core3/vizmap-impl/trunk</url>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>cytoscape_snapshots</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <name>Cytoscape Snapshots</name>
+
<url>http://cytoscape.wodaklab.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://cytoscape.wodaklab.org/nexus/content/repositories/releases/</url>
+ </repository>
+ </repositories>
+
+ <!--
+ Dependencies included here should *ONLY* be for the impl bundle.
+ All additional dependencies necessary for the integration tests (it)
+ should be kept in the it/pom.xml
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>vizmap-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>vizmap-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>presentation-api</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-impl</artifactId>
+ <version>3.0.0-alpha1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
-
--
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.
