Author: kono
Date: 2010-08-04 11:30:34 -0700 (Wed, 04 Aug 2010)
New Revision: 21192

Modified:
   core3/log-swing/trunk/pom.xml
Log:
Dependencies are optimized.  Also, this module needs to be refactored.  
Currently, there is a cyclic dependency between this and application.

Modified: core3/log-swing/trunk/pom.xml
===================================================================
--- core3/log-swing/trunk/pom.xml       2010-08-04 18:23:02 UTC (rev 21191)
+++ core3/log-swing/trunk/pom.xml       2010-08-04 18:30:34 UTC (rev 21192)
@@ -31,10 +31,8 @@
                        <resource>
                                <directory>src/main/resources</directory>
                        </resource>
-                       <!--
-                               | example additional resource entries, useful 
when building Eclipse
-                               RCP applications
-                       -->
+                       <!-- | example additional resource entries, useful when 
building Eclipse 
+                               RCP applications -->
                        <resource>
                                <directory>.</directory>
                                <includes>
@@ -45,49 +43,41 @@
                        </resource>
                </resources>
                <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                </configuration>
-            </plugin>
                        <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+                               </configuration>
+                       </plugin>
+                       <plugin>
                                <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
-                               -->
+                               <!-- | 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>1.4.3</version>
-                               <!--
-                                       | the following instructions build a 
simple set of public/private
-                                       classes into an OSGi bundle
-                               -->
+                               
<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>
                                                
<Bundle-Version>${pom.version}</Bundle-Version>
-                                               <!--
-                                                       | assume public classes 
are in the top package, and private
-                                                       classes are under 
".internal"
-                                               -->
+                                               <!-- | assume public classes 
are in the top package, and private classes 
+                                                       are under ".internal" 
-->
                                                <Export-Package>
                                                        
!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}",org.apache.commons.collections.*
                                                </Export-Package>
                                                
<Private-Package>${bundle.namespace}.internal.*
                                                </Private-Package>
-                                               <!--
-                                                       | each module can 
override these defaults in their osgi.bnd file
-                                               -->
+                                               <!-- | each module can override 
these defaults in their osgi.bnd file -->
                                                <_include>-osgi.bnd</_include>
                                        </instructions>
                                </configuration>
@@ -96,44 +86,34 @@
        </build>
 
        <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>
-       <!-- 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>
+               <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>
+
                <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.cytoscape</groupId>
-                       <artifactId>work-api</artifactId>
-                       <version>1.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
                        <groupId>cytoscape</groupId>
                        <artifactId>application</artifactId>
                        <version>1.0-SNAPSHOT</version>
@@ -141,17 +121,20 @@
                <dependency>
                        <groupId>org.ops4j.pax.logging</groupId>
                        <artifactId>pax-logging-api</artifactId>
-                       <version>1.3.0</version>
+                       <version>1.5.2</version>
                </dependency>
                <dependency>
                        <groupId>org.ops4j.pax.logging</groupId>
                        <artifactId>pax-logging-service</artifactId>
-                       <version>1.3.0</version>
+                       <version>1.5.2</version>
                </dependency>
-               <dependency>  
-                       <groupId>org.apache.commons</groupId>  
-                       
<artifactId>com.springsource.org.apache.commons.collections</artifactId>  
-                       <version>3.2.1</version> 
+               
+               <!-- Modules for Testing -->
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</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.

Reply via email to