Author: mes
Date: 2011-06-30 12:47:49 -0700 (Thu, 30 Jun 2011)
New Revision: 25985
Modified:
core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml
core3/gui-distribution/trunk/pom.xml
core3/gui-distribution/trunk/startlevel-1/pom.xml
core3/gui-distribution/trunk/startlevel-2/pom.xml
core3/gui-distribution/trunk/startlevel-3/pom.xml
Log:
we now copy files about rather than zipping them
Modified: core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml
===================================================================
--- core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml
2011-06-30 19:01:08 UTC (rev 25984)
+++ core3/gui-distribution/trunk/distribution/src/main/assembly/src.xml
2011-06-30 19:47:49 UTC (rev 25985)
@@ -12,6 +12,21 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
+ <directory>${basedir}/../startlevel-1/target/bundles</directory>
+ <outputDirectory>bundles/startlevel-1</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../startlevel-2/target/bundles</directory>
+ <outputDirectory>bundles/startlevel-2</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../startlevel-3/target/bundles</directory>
+ <outputDirectory>bundles/startlevel-3</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
<directory>${basedir}/src/main/bin</directory>
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
@@ -26,13 +41,5 @@
<outputFileNameMapping>cytoscape-launcher.jar</outputFileNameMapping>
<fileMode>0644</fileMode>
</dependencySet>
- <dependencySet>
- <includes>
- <include>org.cytoscape.gui-distribution:startlevel-*:zip</include>
- </includes>
- <outputDirectory>bundles</outputDirectory>
- <unpack>true</unpack>
- <fileMode>0644</fileMode>
- </dependencySet>
</dependencySets>
</assembly>
Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml 2011-06-30 19:01:08 UTC (rev
25984)
+++ core3/gui-distribution/trunk/pom.xml 2011-06-30 19:47:49 UTC (rev
25985)
@@ -61,38 +61,31 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!-- this assembly is only for the startlevel modules, distribution
has its own -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>startlevel-assembly</artifactId>
- <version>3.0.0-alpha2</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptorRefs>
- <descriptorRef>startlevel-assembly</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/bundles</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
@@ -102,6 +95,8 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>startlevel-1</module>
+ <module>startlevel-2</module>
<module>startlevel-3</module>
<module>distribution</module>
</modules>
Modified: core3/gui-distribution/trunk/startlevel-1/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-1/pom.xml 2011-06-30 19:01:08 UTC
(rev 25984)
+++ core3/gui-distribution/trunk/startlevel-1/pom.xml 2011-06-30 19:47:49 UTC
(rev 25985)
@@ -17,7 +17,7 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: core3/gui-distribution/trunk/startlevel-2/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-2/pom.xml 2011-06-30 19:01:08 UTC
(rev 25984)
+++ core3/gui-distribution/trunk/startlevel-2/pom.xml 2011-06-30 19:47:49 UTC
(rev 25985)
@@ -17,7 +17,7 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: core3/gui-distribution/trunk/startlevel-3/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-06-30 19:01:08 UTC
(rev 25984)
+++ core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-06-30 19:47:49 UTC
(rev 25985)
@@ -17,7 +17,7 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
</plugin>
</plugins>
</build>
--
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.
