Author: jm
Date: 2012-06-18 14:07:09 -0700 (Mon, 18 Jun 2012)
New Revision: 29603
Modified:
core3/gui-distribution/trunk/features/src/main/resources/features.xml
core3/parent/trunk/pom.xml
Log:
Backed out r29602. This breaks the JAXB bits in psi-imi-impl
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-06-18 19:42:03 UTC (rev 29602)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-06-18 21:07:09 UTC (rev 29603)
@@ -45,6 +45,7 @@
<!--
<bundle
start-level="103">mvn:org.apache.commons/com.springsource.org.apache.commons.io/1.4.0</bundle>
-->
+ <bundle start-level="103">mvn:psidev.psi.tools/xxindex/0.11</bundle>
<bundle
start-level="103">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/1.2.0</bundle>
<bundle
start-level="103">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.1.6_1</bundle>
<bundle
start-level="103">mvn:javax.activation/com.springsource.javax.activation/1.1.1</bundle>
@@ -54,6 +55,7 @@
<bundle start-level="103">wrap:mvn:org.json/org.json/chargebee-1.0</bundle>
<bundle
start-level="103">mvn:org.apache.httpcomponents/httpcore-osgi/4.2</bundle>
+ <bundle start-level="104">mvn:psidev.psi.mi/psi25-xml/1.7.10</bundle>
<bundle
start-level="104">mvn:cytoscape-temp/uk.ac.ebi.enfin.mi.cluster.micluster/1.6</bundle>
<bundle
start-level="110">mvn:org.cytoscape/cmdline/${cytoscape.support.version}</bundle>
Modified: core3/parent/trunk/pom.xml
===================================================================
--- core3/parent/trunk/pom.xml 2012-06-18 19:42:03 UTC (rev 29602)
+++ core3/parent/trunk/pom.xml 2012-06-18 21:07:09 UTC (rev 29603)
@@ -257,10 +257,48 @@
<name>Sonatype OSS Release Mirror</name>
<url>http://code.cytoscape.org/nexus/content/repositories/sonatype-oss/</url>
</repository>
+
+ <!-- For PSI-MI Library -->
+ <repository>
+ <id>ebi-repo</id>
+ <name>The EBI internal repository</name>
+ <url>http://www.ebi.ac.uk/~maven/m2repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>ebi-repo-snapshots</id>
+ <name>The EBI internal repository</name>
+ <url>http://www.ebi.ac.uk/~maven/m2repo_snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Maven 2 Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>ops4j-snapshots</id>
+ <name>OPS4J Snapshots</name>
+
<url>https://oss.sonatype.org/content/repositories/ops4j-snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
<id>cytoscape_snapshots</id>
<snapshots>
<enabled>true</enabled>
--
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.
