You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:54:25 UTC
[17/49] incubator-taverna-workbench-product git commit: Build
assemblies release/dev/nightly
Build assemblies release/dev/nightly
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15253 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/6718c2a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/6718c2a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/6718c2a7
Branch: refs/heads/master
Commit: 6718c2a756aed9836b7000222866dc0783464c23
Parents: 181f00a
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 10 11:54:08 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 10 11:54:08 2012 +0000
----------------------------------------------------------------------
pom.xml | 246 ++++++++++++++++------
src/main/assembly/dependencies-component.xml | 41 ++++
src/main/assembly/developer-assembly.xml | 13 ++
src/main/assembly/nightly-assembly.xml | 15 ++
src/main/assembly/release-assembly.xml | 43 +---
5 files changed, 259 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index edb4857..78b6286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,171 @@
<groupId>uk.org.taverna.workbench</groupId>
<artifactId>taverna-workbench-product</artifactId>
<name>Taverna Workbench Product</name>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
+ <profiles>
+ <profile>
+ <id>developer</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,yyyyMMdd}T{0,date,HHmm}
+ </format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/developer-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ <profile>
+ <id>nightly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,yyyyMMdd}
+ </format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/nightly-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,yyyyMMdd}
+ </format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/release-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <build>
+ <finalName>taverna-workbench-${project.version}</finalName>
+ </build>
+
<dependencies>
<!-- Spring DM -->
<dependency>
@@ -35,7 +199,7 @@
</dependency>
<!-- Java Extension Implementations -->
- <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
<version>2.2.0</version> </dependency> -->
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -91,14 +255,11 @@
</dependency>
<!-- Taverna Activities -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>beanshell-activity</artifactId>
- <version>${t2.activities.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>beanshell-activity</artifactId>
+ <version>${t2.activities.version}</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>stringconstant-activity</artifactId>
@@ -106,14 +267,11 @@
</dependency>
<!-- Taverna Activities UI -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>beanshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>beanshell-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
@@ -156,11 +314,8 @@
<artifactId>menu-impl</artifactId>
<version>${t2.ui.impl.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>report-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-impl</groupId> <artifactId>report-impl</artifactId>
+ <version>${t2.ui.impl.version}</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
@@ -173,26 +328,13 @@
<version>${t2.ui.components.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>menu-items</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>loop-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>parallelize-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>retry-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>menu-items</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>loop-ui</artifactId> <version>${t2.ui.exts.version}</version>
+ </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>retry-ui</artifactId> <version>${t2.ui.exts.version}</version>
+ </dependency> -->
<!-- Taverna Platform -->
@@ -304,28 +446,6 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/release-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<repositories>
<repository>
<releases />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/dependencies-component.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/dependencies-component.xml b/src/main/assembly/dependencies-component.xml
new file mode 100644
index 0000000..539fa7b
--- /dev/null
+++ b/src/main/assembly/dependencies-component.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>/bundles</outputDirectory>
+ <excludes>
+ <!-- Exclude anything in lib/ (except configuration) -->
+ <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
+ <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
+ <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
+ <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
+ <!-- Exclude ourselves -->
+ <exclude>uk.org.taverna.workbench:taverna-workbench-product</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>uk.org.taverna.workbench:taverna-workbench</include>
+ <include>uk.org.taverna.osgi:osgi-launcher</include>
+ <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
+ <include>org.osgi:org.osgi.core</include>
+ <include>org.eclipse.osgi:org.eclipse.osgi</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/developer-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/developer-assembly.xml b/src/main/assembly/developer-assembly.xml
new file mode 100644
index 0000000..ae2a7c3
--- /dev/null
+++ b/src/main/assembly/developer-assembly.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>dev</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <componentDescriptors>
+ <componentDescriptor>dependencies-component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/nightly-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/nightly-assembly.xml b/src/main/assembly/nightly-assembly.xml
new file mode 100644
index 0000000..d5b631d
--- /dev/null
+++ b/src/main/assembly/nightly-assembly.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>nightly</id>
+ <baseDirectory>taverna-workbench-${project.version}-${buildNumber}-nightly</baseDirectory>
+ <formats>
+ <!-- <format>dir</format> -->
+ <format>zip</format>
+ </formats>
+ <componentDescriptors>
+ <componentDescriptor>dependencies-component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/release-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/release-assembly.xml b/src/main/assembly/release-assembly.xml
index 5687d70..a83f9b8 100644
--- a/src/main/assembly/release-assembly.xml
+++ b/src/main/assembly/release-assembly.xml
@@ -3,42 +3,13 @@
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>bin</id>
+ <id>release</id>
+ <baseDirectory>taverna-workbench-${project.version}</baseDirectory>
<formats>
- <format>dir</format>
- <!-- <format>zip</format> -->
+ <!-- <format>dir</format> -->
+ <format>zip</format>
</formats>
-
- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>/bundles</outputDirectory>
- <excludes>
- <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
- <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
- <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
- <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>uk.org.taverna.workbench:taverna-workbench</include>
- <include>uk.org.taverna.osgi:osgi-launcher</include>
- <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
- <include>org.osgi:org.osgi.core</include>
- <include>org.eclipse.osgi:org.eclipse.osgi</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>src/main/etc</directory>
- <fileMode>0755</fileMode>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
+ <componentDescriptors>
+ <componentDescriptor>dependencies-component.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>