Author: jm
Date: 2011-06-20 20:14:05 -0700 (Mon, 20 Jun 2011)
New Revision: 25829
Modified:
csplugins/trunk/toronto/jm/paperwing-build/build.sh
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
Log:
Fixed scripts so parent POM is resolved properly before compilation
Modified: csplugins/trunk/toronto/jm/paperwing-build/build.sh
===================================================================
--- csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-06-21 02:40:22 UTC
(rev 25828)
+++ csplugins/trunk/toronto/jm/paperwing-build/build.sh 2011-06-21 03:14:05 UTC
(rev 25829)
@@ -18,6 +18,11 @@
rm -rf ${DIST_DIR}
mkdir -p ${DIST_DIR}
+# Resolve dependencies
+pushd swing-application-impl
+mvn dependency:resolve
+popd
+
# Build main bundle
pushd paperwing-impl
apply_patches "${PATCH_DIR}/paperwing-impl"
Modified:
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
===================================================================
---
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
2011-06-21 02:40:22 UTC (rev 25828)
+++
csplugins/trunk/toronto/jm/paperwing-build/patches/paperwing-impl/pom.xml.patch
2011-06-21 03:14:05 UTC (rev 25829)
@@ -1,14 +1,24 @@
Index: pom.xml
===================================================================
---- pom.xml (revision 25765)
+--- pom.xml (revision 25757)
+++ pom.xml (working copy)
+@@ -5,7 +5,7 @@
+ <parent>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>parent</artifactId>
+- <version>3.0.0-alpha6-SNAPSHOT</version>
++ <version>3.0.0-alpha8-SNAPSHOT</version>
+ </parent>
+ <properties>
+
<bundle.symbolicName>org.cytoscape.paperwing-impl</bundle.symbolicName>
@@ -20,355 +20,24 @@
<dependencies>
<dependency>
<groupId>cytoscape-temp</groupId>
- <artifactId>gluegen-gl</artifactId>
+- <version>2.0-b23-20110303</version>
+ <artifactId>jogl</artifactId>
- <version>2.0-b23-20110303</version>
++ <version>2.0-b398</version>
</dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
--
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.
