Author: jm
Date: 2011-10-25 08:38:32 -0700 (Tue, 25 Oct 2011)
New Revision: 27293
Added:
csplugins/trunk/toronto/jm/cykaraf/pom.xml
Modified:
csplugins/trunk/toronto/jm/cykaraf/assembly/pom.xml
csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/descriptors/config-dev.xml
csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/xsl/template.xslt
csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml
csplugins/trunk/toronto/jm/cykaraf/cmdline-impl/pom.xml
csplugins/trunk/toronto/jm/cykaraf/features/pom.xml
csplugins/trunk/toronto/jm/cykaraf/launcher/pom.xml
Log:
Added parent POM for new distribution/launcher
Cleaned up child module POMs
Reduced amount of copying that takes place when creating a development
distribution
Fixed all Maven warnings
Modified: csplugins/trunk/toronto/jm/cykaraf/assembly/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/assembly/pom.xml 2011-10-25 01:16:31 UTC
(rev 27292)
+++ csplugins/trunk/toronto/jm/cykaraf/assembly/pom.xml 2011-10-25 15:38:32 UTC
(rev 27293)
@@ -3,21 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.cytoscape</groupId>
+ <groupId>org.cytoscape.distribution</groupId>
<artifactId>parent</artifactId>
- <version>3.0.0-alpha9-SNAPSHOT</version>
+ <version>3.0.0-M4-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.cytoscape.distribution</groupId>
<artifactId>cytoscape</artifactId>
- <version>3.0.0-M4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cytoscape Karaf Distribution</name>
- <properties>
- <karaf.version>2.2.3</karaf.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
@@ -84,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>filter</id>
@@ -102,7 +98,7 @@
<executions>
<execution>
<id>add-features-to-repo</id>
-
<phase>generate-resources</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>add-features-to-repo</goal>
</goals>
@@ -119,7 +115,7 @@
</execution>
<execution>
<id>add-features-to-repo-dev</id>
-
<phase>generate-resources</phase>
+ <phase>process-resources</phase>
<goals>
<goal>add-features-to-repo</goal>
</goals>
@@ -137,6 +133,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+
<version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -156,7 +153,7 @@
<artifactItem>
<groupId>org.cytoscape.distribution</groupId>
<artifactId>karaf-launcher</artifactId>
-
<version>3.0.0-alpha7-SNAPSHOT</version>
+
<version>${project.version}</version>
<type>jar</type>
<outputDirectory>target/dependencies/launcher</outputDirectory>
</artifactItem>
@@ -220,18 +217,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>directory</id>
<phase>compile</phase>
<goals>
-
<goal>directory-single</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>target/generated-resources/xml/xslt/config-dev.xml</descriptor>
</descriptors>
-
<finalName>${project.artifactId}-${project.version}</finalName>
+
<finalName>${project.artifactId}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
Modified:
csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/descriptors/config-dev.xml
===================================================================
---
csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/descriptors/config-dev.xml
2011-10-25 01:16:31 UTC (rev 27292)
+++
csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/descriptors/config-dev.xml
2011-10-25 15:38:32 UTC (rev 27293)
@@ -1,5 +1,6 @@
<config>
- <output-format>tar.gz</output-format>
+ <id>dev</id>
+ <output-format>dir</output-format>
<line-ending>keep</line-ending>
<karaf>
<feature-repository>target/features-repo-dev</feature-repository>
Modified: csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/xsl/template.xslt
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/xsl/template.xslt
2011-10-25 01:16:31 UTC (rev 27292)
+++ csplugins/trunk/toronto/jm/cykaraf/assembly/src/main/xsl/template.xslt
2011-10-25 15:38:32 UTC (rev 27293)
@@ -8,8 +8,12 @@
<xsl:template match="/">
<assembly>
- <id></id>
+ <id><xsl:value-of select="/config/id"/></id>
+ <xsl:if test="/config/id = 'dev'">
+ <includeBaseDirectory>false</includeBaseDirectory>
+ </xsl:if>
+
<formats>
<format><xsl:value-of select="/config/output-format"/></format>
</formats>
@@ -45,6 +49,9 @@
<include><xsl:value-of select="."/></include>
</xsl:for-each>
</includes>
+ <excludes>
+ <exclude>*.jar</exclude>
+ </excludes>
<fileMode>0755</fileMode>
</fileSet>
Modified: csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml 2011-10-25 01:16:31 UTC
(rev 27292)
+++ csplugins/trunk/toronto/jm/cykaraf/branding/pom.xml 2011-10-25 15:38:32 UTC
(rev 27293)
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape.distribution</groupId>
+ <parent>
+ <groupId>org.cytoscape.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-M4-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
<artifactId>branding</artifactId>
- <version>3.0.0-M4-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Cytoscape Branding</name>
@@ -39,7 +43,7 @@
</goals>
<configuration>
<file>src/main/etc/logo.txt</file>
-
<outputFile>target/dependencies/logo.txt</outputFile>
+
<outputFile>${project.basedir}/target/dependencies/logo.txt</outputFile>
<regex>true</regex>
<unescape>true</unescape>
<replacements>
@@ -62,10 +66,10 @@
</goals>
<configuration>
<file>target/classes/org/apache/karaf/branding/branding.properties.template</file>
-
<outputFile>target/dependencies/branding/org/apache/karaf/branding/branding.properties</outputFile>
+
<outputFile>${project.basedir}/target/dependencies/branding/org/apache/karaf/branding/branding.properties</outputFile>
<regex>false</regex>
<token>%LOGO%</token>
-
<valueFile>target/dependencies/logo.txt</valueFile>
+
<valueFile>${project.basedir}/target/dependencies/logo.txt</valueFile>
</configuration>
</execution>
</executions>
@@ -73,7 +77,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
+
<version>${maven-bundle-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: csplugins/trunk/toronto/jm/cykaraf/cmdline-impl/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/cmdline-impl/pom.xml 2011-10-25
01:16:31 UTC (rev 27292)
+++ csplugins/trunk/toronto/jm/cykaraf/cmdline-impl/pom.xml 2011-10-25
15:38:32 UTC (rev 27293)
@@ -2,17 +2,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
- <groupId>org.cytoscape</groupId>
+ <groupId>org.cytoscape.distribution</groupId>
<artifactId>parent</artifactId>
- <version>3.0.0-alpha9-SNAPSHOT</version>
+ <version>3.0.0-M4-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>cmdline-impl</artifactId>
- <version>3.0.0-alpha7-SNAPSHOT</version>
- <name>Command Line Provider Implementation</name>
+ <name>Cytoscape Command Line Provider Implementation</name>
<properties>
<bundle.symbolicName>org.cytoscape.cmdline-impl</bundle.symbolicName>
@@ -31,17 +30,17 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>service-api</artifactId>
- <version>3.0.0-alpha8-SNAPSHOT</version>
+ <version>${cytoscape.api.version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape.distribution</groupId>
- <artifactId>launcher</artifactId>
- <version>3.0.0-alpha7-SNAPSHOT</version>
+ <artifactId>karaf-launcher</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>cmdline</artifactId>
- <version>3.0.0-alpha7-SNAPSHOT</version>
+ <version>${cytoscape.support.version}</version>
</dependency>
</dependencies>
Modified: csplugins/trunk/toronto/jm/cykaraf/features/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/features/pom.xml 2011-10-25 01:16:31 UTC
(rev 27292)
+++ csplugins/trunk/toronto/jm/cykaraf/features/pom.xml 2011-10-25 15:38:32 UTC
(rev 27293)
@@ -3,22 +3,22 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape.distribution</groupId>
+ <parent>
+ <groupId>org.cytoscape.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-M4-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
<artifactId>features</artifactId>
<packaging>pom</packaging>
- <version>3.0.0-M4-SNAPSHOT</version>
<name>Cytoscape Feature Repository</name>
- <properties>
-
<cytoscape.api.version>3.0.0-alpha8-SNAPSHOT</cytoscape.api.version>
-
<cytoscape.impl.version>3.0.0-alpha8-SNAPSHOT</cytoscape.impl.version>
-
<cytoscape.support.version>3.0.0-alpha7-SNAPSHOT</cytoscape.support.version>
- </properties>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
+
<version>${maven-resources-plugin.version}</version>
<executions>
<execution>
<id>copy-resources</id>
Modified: csplugins/trunk/toronto/jm/cykaraf/launcher/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/launcher/pom.xml 2011-10-25 01:16:31 UTC
(rev 27292)
+++ csplugins/trunk/toronto/jm/cykaraf/launcher/pom.xml 2011-10-25 15:38:32 UTC
(rev 27293)
@@ -2,25 +2,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
- <groupId>org.cytoscape</groupId>
+ <groupId>org.cytoscape.distribution</groupId>
<artifactId>parent</artifactId>
- <version>3.0.0-alpha9-SNAPSHOT</version>
+ <version>3.0.0-M4-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape.distribution</groupId>
+
+ <!-- Artifact id *must* start with "karaf-*" so startup scripts
+ add this JAR to the boot classpath -->
<artifactId>karaf-launcher</artifactId>
- <version>3.0.0-alpha7-SNAPSHOT</version>
<name>Cytoscape Launcher</name>
<properties>
<bundle.symbolicName>org.cytoscape.launcher</bundle.symbolicName>
<bundle.namespace>org.cytoscape.launcher</bundle.namespace>
- <karaf.version>2.2.3</karaf.version>
</properties>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
Added: csplugins/trunk/toronto/jm/cykaraf/pom.xml
===================================================================
--- csplugins/trunk/toronto/jm/cykaraf/pom.xml (rev 0)
+++ csplugins/trunk/toronto/jm/cykaraf/pom.xml 2011-10-25 15:38:32 UTC (rev
27293)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-alpha9-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.cytoscape.distribution</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.0.0-M4-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Cytoscape Distribution</name>
+
+ <properties>
+
<cytoscape.api.version>3.0.0-alpha8-SNAPSHOT</cytoscape.api.version>
+
<cytoscape.impl.version>3.0.0-alpha8-SNAPSHOT</cytoscape.impl.version>
+
<cytoscape.support.version>3.0.0-alpha7-SNAPSHOT</cytoscape.support.version>
+ <karaf.version>2.2.3</karaf.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>cytoscape_snapshots</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <name>Cytoscape Snapshots</name>
+
<url>http://code.cytoscape.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>cytoscape_releases</id>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <name>Cytoscape Releases</name>
+
<url>http://code.cytoscape.org/nexus/content/repositories/releases/</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+
<version>${maven-release-plugin.version}</version>
+ <configuration>
+
<autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>deploy</goals>
+ <!-- so that impl bundles with modules
will build correctly -->
+ <preparationGoals>clean
install</preparationGoals>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-dependency-plugin</artifactId>
+
<version>${maven-dependency-plugin.version}</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>
+ <profile>
+ <id>work</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>launcher</module>
+ <module>cmdline-impl</module>
+ <module>branding</module>
+ <module>features</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>all</id>
+ <modules>
+ <module>launcher</module>
+ <module>cmdline-impl</module>
+ <module>branding</module>
+ <module>features</module>
+ <module>assembly</module>
+ </modules>
+ </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.
