Author: mes
Date: 2011-03-10 14:29:33 -0800 (Thu, 10 Mar 2011)
New Revision: 24401
Modified:
core3/launch-framework/trunk/cmdline/pom.xml
core3/launch-framework/trunk/launcher/pom.xml
core3/launch-framework/trunk/startlevel-assembly/src/main/resources/assemblies/startlevel-assembly.xml
Log:
updated for maven 3
Modified: core3/launch-framework/trunk/cmdline/pom.xml
===================================================================
--- core3/launch-framework/trunk/cmdline/pom.xml 2011-03-10 22:14:50 UTC
(rev 24400)
+++ core3/launch-framework/trunk/cmdline/pom.xml 2011-03-10 22:29:33 UTC
(rev 24401)
@@ -24,18 +24,18 @@
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
- <version>1.4</version>
+ <version>${maven-pax-plugin.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+
<version>${maven-bundle-plugin.version}</version>
<configuration>
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-
<Bundle-Version>${pom.version}</Bundle-Version>
-
<Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"</Export-Package>
+
<Bundle-Version>${project.version}</Bundle-Version>
+
<Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${project.version}"</Export-Package>
<Private-Package>${bundle.namespace}.internal.*</Private-Package>
<_include>-osgi.bnd</_include>
</instructions>
Modified: core3/launch-framework/trunk/launcher/pom.xml
===================================================================
--- core3/launch-framework/trunk/launcher/pom.xml 2011-03-10 22:14:50 UTC
(rev 24400)
+++ core3/launch-framework/trunk/launcher/pom.xml 2011-03-10 22:29:33 UTC
(rev 24401)
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>cmdline</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- This is to get the the felix framework into the bundle. -->
<dependency>
Modified:
core3/launch-framework/trunk/startlevel-assembly/src/main/resources/assemblies/startlevel-assembly.xml
===================================================================
---
core3/launch-framework/trunk/startlevel-assembly/src/main/resources/assemblies/startlevel-assembly.xml
2011-03-10 22:14:50 UTC (rev 24400)
+++
core3/launch-framework/trunk/startlevel-assembly/src/main/resources/assemblies/startlevel-assembly.xml
2011-03-10 22:29:33 UTC (rev 24401)
@@ -1,6 +1,7 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>startlevel-assembly</id>
<formats>
<format>zip</format>
</formats>
--
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.
