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 2016/08/21 12:59:22 UTC
[05/50] [abbrv] incubator-taverna-common-activities git commit:
dependencies resovled
dependencies resovled
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/c815a148
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/c815a148
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/c815a148
Branch: refs/heads/cwl-browse
Commit: c815a148b180716b299f09d3f11ca57052cceef6
Parents: dc7e993 80b439e
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Sun Jul 3 16:29:01 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Sun Jul 3 16:29:01 2016 +0530
----------------------------------------------------------------------
pom.xml | 1 +
taverna-cwl-activity-ui/pom.xml | 47 ++++++++++++-------
.../cwl/ui/serviceprovider/CwlServiceDesc.java | 11 +++--
.../ui/serviceprovider/CwlServiceProvider.java | 13 +++--
...rvicedescriptions.ServiceDescriptionProvider | 1 +
...a.t2.workbench.activityicons.ActivityIconSPI | 1 +
...ntextualviews.activity.ContextualViewFactory | 1 +
.../src/main/resources/exampleIcon.png | Bin 0 -> 3654 bytes
.../cwl/CwlActivityConfigurationBean.java | 3 +-
9 files changed, 52 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c815a148/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 882f0cd,d240c4e..184f317
--- a/pom.xml
+++ b/pom.xml
@@@ -16,96 -16,86 +16,97 @@@
See the License for the specific language governing permissions and
limitations under the License.
---><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>
- <parent>
- <groupId>org.apache.taverna</groupId>
- <artifactId>apache-taverna-parent</artifactId>
- <version>2-incubating</version>
- </parent>
- <groupId>org.apache.taverna.commonactivities</groupId>
- <artifactId>apache-taverna-common-activities</artifactId>
- <version>2.1.0-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Taverna Common Activities</name>
- <properties>
+-->
+<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>
+ <parent>
+ <groupId>org.apache.taverna</groupId>
+ <artifactId>apache-taverna-parent</artifactId>
+ <version>2-incubating</version>
+ </parent>
+ <groupId>org.apache.taverna.commonactivities</groupId>
+ <artifactId>apache-taverna-common-activities</artifactId>
+ <version>2.1.1-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Taverna Common Activities</name>
+ <properties>
- <!-- Taverna dependency versions -->
- <taverna.language.version>0.15.0-incubating</taverna.language.version>
- <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
- <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
+ <!-- Taverna dependency versions -->
+ <taverna.language.version>0.15.0-incubating</taverna.language.version>
+ <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
+ <taverna.engine.version>3.1.0-incubating</taverna.engine.version>
- <!-- Third-party dependency versios -->
- <abdera.version>1.1.3</abdera.version>
- <bsh.version>2.0b6</bsh.version>
- <servicemix.javax.wsdl.version>1.6.3_1</servicemix.javax.wsdl.version>
- <javacsv.version>2.0</javacsv.version>
- <jsch.version>1.0.6.RELEASE</jsch.version>
- <odfdom.version>0.7</odfdom.version>
- <!-- <odfdom.version>0.8.8-incubating</odfdom.version> -->
- <santuario.xmlsec.version>1.5.7</santuario.xmlsec.version>
- <xmlschema.version>2.2.1</xmlschema.version>
- <velocity.version>1.7</velocity.version>
- <webdavservlet.version>2.0</webdavservlet.version>
- <woden.version>1.0M10</woden.version>
- <wss4j.version>1.6.18</wss4j.version>
- </properties>
- <modules>
- <module>taverna-cwl-activity</module>
- <module>taverna-beanshell-activity</module>
- <module>taverna-external-tool-activity</module>
- <module>taverna-interaction-activity</module>
- <module>taverna-rest-activity</module>
- <module>taverna-spreadsheet-import-activity</module>
- <module>taverna-wsdl-activity</module>
- <module>taverna-wsdl-generic</module>
- <module>taverna-xpath-activity</module>
- <module>taverna-cwl-activity-ui</module>
- <module>taverna-cwl-utilities</module>
- </modules>
+
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
- <exclude>**/src/test/resources/test-spreadsheet*</exclude> <!-- Our own test spreadsheets -->
- <exclude>**/src/main/resources/json2.js</exclude><!-- public domain -->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <!-- Third-party dependency versios -->
+ <abdera.version>1.1.3</abdera.version>
+ <bsh.version>2.0b6</bsh.version>
+ <servicemix.javax.wsdl.version>1.6.3_1</servicemix.javax.wsdl.version>
+ <javacsv.version>2.0</javacsv.version>
+ <jsch.version>1.0.6.RELEASE</jsch.version>
+ <odfdom.version>0.7</odfdom.version>
+ <!-- <odfdom.version>0.8.8-incubating</odfdom.version> -->
+ <santuario.xmlsec.version>1.5.7</santuario.xmlsec.version>
+ <xmlschema.version>2.2.1</xmlschema.version>
+ <velocity.version>1.7</velocity.version>
+ <webdavservlet.version>2.0</webdavservlet.version>
+ <woden.version>1.0M10</woden.version>
+ <wss4j.version>1.6.18</wss4j.version>
+ </properties>
+ <modules>
+ <module>taverna-cwl-activity</module>
+ <module>taverna-cwl-activity-ui</module>
+ <module>taverna-cwl-utilities</module>
+ <module>taverna-beanshell-activity</module>
+ <module>taverna-external-tool-activity</module>
+ <module>taverna-interaction-activity</module>
+ <module>taverna-rest-activity</module>
+ <module>taverna-spreadsheet-import-activity</module>
+ <module>taverna-wsdl-activity</module>
+ <module>taverna-wsdl-generic</module>
+ <module>taverna-xpath-activity</module>
+ </modules>
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection>
- <url>https://github.com/apache/incubator-taverna-common-activities</url>
- <tag>HEAD</tag>
- </scm>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
+ <exclude>**/src/test/resources/test-spreadsheet*</exclude> <!-- Our own test spreadsheets -->
+ <exclude>**/src/main/resources/json2.js</exclude><!-- public domain -->
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>https://taverna.incubator.apache.org/javadoc/taverna-language/</link>
+ <link>https://taverna.incubator.apache.org/javadoc/taverna-osgi/</link>
+ <link>https://taverna.incubator.apache.org/javadoc/taverna-engine/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection>
+ <url>https://github.com/apache/incubator-taverna-common-activities</url>
+ <tag>HEAD</tag>
+ </scm>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/c815a148/taverna-cwl-activity-ui/pom.xml
----------------------------------------------------------------------