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:41 UTC
[33/49] incubator-taverna-workbench-product git commit: T3-821 Added
workaround for http://jira.codehaus.org/browse/MASSEMBLY-449
T3-821 Added workaround for http://jira.codehaus.org/browse/MASSEMBLY-449
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16085 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/31a56151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/31a56151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/31a56151
Branch: refs/heads/master
Commit: 31a56151edb1a23cdbc7bee1129744cee286cd40
Parents: 8dd432c
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 2 13:32:32 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 2 13:32:32 2013 +0000
----------------------------------------------------------------------
pom.xml | 168 +++++++++++++++++++++++++++++------------------------------
1 file changed, 83 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/31a56151/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c57b3e0..d53a2c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,10 @@
<descriptors>
<descriptor>${assembly.descriptor}</descriptor>
</descriptors>
+ <archiverConfig>
+ <directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
+ <defaultDirectoryMode>493</defaultDirectoryMode>
+ </archiverConfig>
</configuration>
</plugin>
<plugin>
@@ -116,43 +120,44 @@
</plugin>
</plugins>
<pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- net.sf.taverna.t2.maven.plugins
- </groupId>
- <artifactId>
- taverna-maven-plugin
- </artifactId>
- <versionRange>
- [0.3.1-SNAPSHOT,)
- </versionRange>
- <goals>
- <goal>
- profile-generate
- </goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ net.sf.taverna.t2.maven.plugins
+ </groupId>
+ <artifactId>
+ taverna-maven-plugin
+ </artifactId>
+ <versionRange>
+ [0.3.1-SNAPSHOT,)
+ </versionRange>
+ <goals>
+ <goal>
+ profile-generate
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
<distributionManagement>
@@ -178,24 +183,23 @@
</dependency>
- <!-- Explicit org.osgi.* with <scope>provided as these are also provided by
- the felix osgi package.
- Avoids:
- Caused by: java.lang.SecurityException: class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information does not match signer information of other classes in the same package
- -->
+ <!-- Explicit org.osgi.* with <scope>provided as these are also provided
+ by the felix osgi package. Avoids: Caused by: java.lang.SecurityException:
+ class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information
+ does not match signer information of other classes in the same package -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Spring DM -->
<dependency>
@@ -306,11 +310,8 @@
<artifactId>dataflow-activity</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>external-tool-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>external-tool-activity</artifactId>
+ <version>2.0.1-SNAPSHOT</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>localworker-activity</artifactId>
@@ -513,11 +514,8 @@
</dependency>
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
<version>2.0-SNAPSHOT</version> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>renderers-exts</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>renderers-exts</artifactId>
+ <version>2.0-SNAPSHOT</version> </dependency> -->
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>retry-ui</artifactId>
<version>2.0-SNAPSHOT</version> </dependency> -->
@@ -606,27 +604,27 @@
<!-- Data bundle -->
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
- <artifactId>databundle</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- </dependency>
- <!-- HTTP client needed by Data Bundle -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.2.5</version>
- </dependency>
- <!-- Jena bundle needed by jsonld-java-jena -->
- <!-- See https://github.com/stain/jena/tree/jena-bundle/jena-bundle -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-bundle</artifactId>
- <version>2.11.0-SNAPSHOT</version>
- </dependency>
+ <artifactId>databundle</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <!-- HTTP client needed by Data Bundle -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+ <!-- Jena bundle needed by jsonld-java-jena -->
+ <!-- See https://github.com/stain/jena/tree/jena-bundle/jena-bundle -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-bundle</artifactId>
+ <version>2.11.0-SNAPSHOT</version>
+ </dependency>