Author: jm
Date: 2012-01-12 12:21:55 -0800 (Thu, 12 Jan 2012)
New Revision: 27998
Modified:
core3/app-developer/trunk/pom.xml
Log:
Fixes #571: Updated app-developer to work with Karaf
Modified: core3/app-developer/trunk/pom.xml
===================================================================
--- core3/app-developer/trunk/pom.xml 2012-01-12 20:09:39 UTC (rev 27997)
+++ core3/app-developer/trunk/pom.xml 2012-01-12 20:21:55 UTC (rev 27998)
@@ -55,7 +55,7 @@
<executions>
<execution>
<id>unpack-cytoscape</id>
- <phase>compile</phase>
+ <phase>process-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -64,10 +64,10 @@
<outputDirectory>${project.build.directory}/tmp</outputDirectory>
<artifactItems>
<artifactItem>
- <groupId>org.cytoscape.gui-distribution</groupId>
+ <groupId>org.cytoscape.distribution</groupId>
<artifactId>cytoscape</artifactId>
<version>${project.version}</version>
- <type>zip</type>
+ <type>${distribution.type}</type>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
@@ -75,7 +75,7 @@
</execution>
<execution>
<id>unpack-javadoc</id>
- <phase>compile</phase>
+ <phase>process-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -95,7 +95,7 @@
</execution>
<execution>
<id>copy</id>
- <phase>compile</phase>
+ <phase>process-sources</phase>
<goals>
<goal>copy</goal>
</goals>
@@ -122,7 +122,7 @@
<executions>
<execution>
<id>copy-unzipped-dir</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -137,14 +137,38 @@
</execution>
</executions>
</plugin>
-
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>fix-permissions</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <chmod perm="ugo+rx">
+ <fileset dir="${project.build.directory}">
+ <include name="**/*.sh" />
+ <include name="**/*.bat" />
+ <include name="**/karaf" />
+ </fileset>
+ </chmod>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.4.1</version>
<executions>
<execution>
- <id>asdf-clean</id>
+ <id>clean-temporary-directory</id>
<phase>package</phase>
<goals>
<goal>clean</goal>
@@ -158,6 +182,9 @@
<fileset>
<directory>${project.build.directory}/dependency-maven-plugin-markers</directory>
</fileset>
+ <fileset>
+ <directory>${project.build.directory}/antrun</directory>
+ </fileset>
</filesets>
</configuration>
</execution>
@@ -168,14 +195,14 @@
<dependencies>
<dependency>
- <groupId>org.cytoscape.gui-distribution</groupId>
+ <groupId>org.cytoscape.distribution</groupId>
<artifactId>cytoscape</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>plugin-api</artifactId>
+ <artifactId>app-api</artifactId>
<version>${cytoscape.api.version}</version>
<classifier>javadoc</classifier>
</dependency>
@@ -187,4 +214,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>unix</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <distribution.type>tar.gz</distribution.type>
+ </properties>
+ </profile>
+ <profile>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <properties>
+ <distribution.type>zip</distribution.type>
+ </properties>
+ </profile>
+ </profiles>
</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.
