Author: ruschein
Date: 2011-08-16 12:44:25 -0700 (Tue, 16 Aug 2011)
New Revision: 26573
Modified:
core3/impl/trunk/core-task-impl/pom.xml
core3/impl/trunk/psi-mi-impl/pom.xml
core3/impl/trunk/vizmap-impl/pom.xml
Log:
Fixed more fallout from the introduction of di-util-api.
Modified: core3/impl/trunk/core-task-impl/pom.xml
===================================================================
--- core3/impl/trunk/core-task-impl/pom.xml 2011-08-16 19:29:37 UTC (rev
26572)
+++ core3/impl/trunk/core-task-impl/pom.xml 2011-08-16 19:44:25 UTC (rev
26573)
@@ -83,12 +83,13 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>di-util-api</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified: core3/impl/trunk/psi-mi-impl/pom.xml
===================================================================
--- core3/impl/trunk/psi-mi-impl/pom.xml 2011-08-16 19:29:37 UTC (rev
26572)
+++ core3/impl/trunk/psi-mi-impl/pom.xml 2011-08-16 19:44:25 UTC (rev
26573)
@@ -15,33 +15,44 @@
<name>${bundle.symbolicName} [${bundle.namespace}]</name>
<packaging>bundle</packaging>
- <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>
+ <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>
<dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>di-util-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -116,33 +127,33 @@
<execution>
<id>mi1</id>
<goals>
- <goal>generate</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>MIF1.xsd</include>
</schemaIncludes>
-
<generatePackage>${bundle.namespace}.internal.schema.mi1</generatePackage>
- <verbose>true</verbose>
- <removeOldOutput>false</removeOldOutput>
- <forceRegenerate>true</forceRegenerate>
+
<generatePackage>${bundle.namespace}.internal.schema.mi1</generatePackage>
+ <verbose>true</verbose>
+ <removeOldOutput>false</removeOldOutput>
+ <forceRegenerate>true</forceRegenerate>
</configuration>
</execution>
<execution>
<id>mi25</id>
<goals>
- <goal>generate</goal>
+ <goal>generate</goal>
</goals>
<configuration>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>MIF25.xsd</include>
</schemaIncludes>
-
<generatePackage>${bundle.namespace}.internal.schema.mi25</generatePackage>
- <verbose>true</verbose>
- <removeOldOutput>false</removeOldOutput>
- <forceRegenerate>true</forceRegenerate>
+
<generatePackage>${bundle.namespace}.internal.schema.mi25</generatePackage>
+ <verbose>true</verbose>
+ <removeOldOutput>false</removeOldOutput>
+ <forceRegenerate>true</forceRegenerate>
</configuration>
</execution>
</executions>
Modified: core3/impl/trunk/vizmap-impl/pom.xml
===================================================================
--- core3/impl/trunk/vizmap-impl/pom.xml 2011-08-16 19:29:37 UTC (rev
26572)
+++ core3/impl/trunk/vizmap-impl/pom.xml 2011-08-16 19:44:25 UTC (rev
26573)
@@ -91,6 +91,17 @@
<!-- for testing -->
<dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>di-util-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
--
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.