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 2018/06/29 11:03:29 UTC

incubator-taverna-plugin-component git commit: pom massage

Repository: incubator-taverna-plugin-component
Updated Branches:
  refs/heads/master b7b61e713 -> 4dc0ed936


pom massage


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/commit/4dc0ed93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/tree/4dc0ed93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/diff/4dc0ed93

Branch: refs/heads/master
Commit: 4dc0ed9368f1104c15837cc4ca947ed38fdd98c0
Parents: b7b61e7
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jun 29 12:03:21 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jun 29 12:03:21 2018 +0100

----------------------------------------------------------------------
 pom.xml                                  | 102 +++++++++++++++++++++++++-
 taverna-component-activity-ui/pom.xml    |   6 +-
 taverna-component-activity/pom.xml       |   6 +-
 taverna-component-repository-api/pom.xml |   8 +-
 4 files changed, 111 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4dc0ed93/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e996ced..cf39568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,113 @@
 	<artifactId>taverna-plugin-component</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Taverna Plugin for Component activity</name>
+	<name>Component Plugin for Taverna</name>
   <properties>
     <taverna.language.version>0.15.1-incubating</taverna.language.version>
     <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
     <taverna.engine.version>3.1.0-incubating</taverna.engine.version>
     <taverna.commonactivities.version>2.1.0-incubating</taverna.commonactivities.version>
     <taverna.workbench.version>3.1.0-incubating-SNAPSHOT</taverna.workbench.version>
+
+    <!-- TODO: Only keep the versions needed -->
+
+    <activation.version>1.1.1</activation.version>
+    <antlr.version>2.7.7</antlr.version>
+    <apache.commons.csv.version>1.5</apache.commons.csv.version>
+    <apache.httpclient.version>4.5.3</apache.httpclient.version><!-- must be compatibe with jsonld-java/jena -->
+    <apache.httpcore.version>4.4.6</apache.httpcore.version> <!-- must match what httpclient depends on -->
+    <aspectj.version>1.6.9</aspectj.version>
+    <axis.jaxrpc.version>1.4</axis.jaxrpc.version>
+    <axis.sggj.version>1.4</axis.sggj.version>
+    <axis.version>1.4.0</axis.version>
+    <!--<axis.wsdl4j.version>1.5.1</axis.wsdl4j.version>-->
+    <batik.version>1.7.0</batik.version>
+    <bcprov.version>1.54</bcprov.version><!-- bcprov-jdk15on --><!-- bcprov-jdk15on --><!-- bcprov-jdk15on --><!-- bcprov-jdk15on -->
+    <cglib.version>2.1.3</cglib.version>
+    <commons.beanutils.version>1.9.2</commons.beanutils.version>
+    <commons.cli.version>1.4</commons.cli.version>
+    <commons.codec.version>1.10</commons.codec.version>
+    <commons.collections.version>3.2.2</commons.collections.version>
+    <commons.configuration.version>1.10</commons.configuration.version>
+    <commons.dbcp.version>1.4</commons.dbcp.version>
+    <commons.httpclient.version>3.1.0</commons.httpclient.version>
+    <commons.io.version>2.6</commons.io.version>
+    <commons.lang.version>2.6</commons.lang.version>
+    <commons.logging.version>1.1.3</commons.logging.version>
+    <commons.net.version>2.0.0</commons.net.version>
+    <dexx.collection.version>0.6</dexx.collection.version>
+    <dom4j.version>1.6.1</dom4j.version>
+    <geronimo.spec.jta.version>1.0-M1</geronimo.spec.jta.version>
+    <gson.version>1.4</gson.version>
+    <htmlparser.version>1.4</htmlparser.version>
+    <icu4j.version>3.4.4</icu4j.version>
+    <io.airlift.airline.version>0.7</io.airlift.airline.version>
+    <jackson.version>2.9.0</jackson.version> <!-- See also jsonldjava -->
+    <jai.imageio.core.version>1.3.1</jai.imageio.core.version> <!-- http://github.com/jai-imageio/ -->
+    <javahelp.version>2.0.02</javahelp.version>
+    <javax.el.version>1.0.0</javax.el.version>
+    <javax.servlet.jsp.version>2.1.0</javax.servlet.jsp.version>
+    <javax.servlet.version>2.5.0</javax.servlet.version>
+    <javax.transaction.version>1.1.0</javax.transaction.version>
+    <jaxb.version>2.2.11</jaxb.version>
+    <jaxen.version>1.1.6</jaxen.version>
+    <jaxp.ri.version>1.4</jaxp.ri.version>
+    <jaxws.api.version>2.1</jaxws.api.version>
+    <jdom.version>1.1.0</jdom.version> <!-- com.springsource.org.jdom -->
+    <jedit.syntax.version>2.2.5</jedit.syntax.version>
+    <jena.version>3.6.0</jena.version><!-- See also jsonld-java and httpcomponents -->
+    <jersey.client.version>1.19.1</jersey.client.version>
+    <jetty.version>6.1.24</jetty.version>
+    <jmimemagic.version>0.1.2</jmimemagic.version>
+    <jmoby.version>1.1.5-taverna</jmoby.version>
+    <joda-time.version>2.9.9</joda-time.version>
+    <json.lib.version>2.3</json.lib.version>
+    <jsonldjava.version>0.11.1</jsonldjava.version> <!-- upgrade from jena, sync with jackson and httpcomponents -->
+    <junit.version>4.11</junit.version>
+    <log4j.version>1.2.17</log4j.version>
+    <mail.version>1.4.1</mail.version>
+    <macify.version>1.6</macify.version>
+    <martj.version>0.6</martj.version>
+    <mimeutil.version>2.1.2-6</mimeutil.version>
+    <mockito.version>1.9.5</mockito.version>
+    <opm.version>1.1.8</opm.version>
+    <org.fife.ui.hexeditor.version>1.0.2011-07-04</org.fife.ui.hexeditor.version>
+    <org.icepdf.version>4.1.1-taverna</org.icepdf.version>
+    <org.xhtmlrenderer.core-renderer.version>R8</org.xhtmlrenderer.core-renderer.version>
+    <osgi.core.version>4.3.1</osgi.core.version>
+    <osgi.enterprise.version>4.2.0</osgi.enterprise.version>
+    <osgi.equinox.version>3.8.0.v20120529-1548</osgi.equinox.version>
+    <osgi.compendium.version>4.3.1</osgi.compendium.version>
+    <poi.ooxml.version>3.6</poi.ooxml.version>
+    <poi.version>3.6</poi.version>
+    <saxpath.version>1.0-FCS</saxpath.version>
+    <servletapi.version>2.5</servletapi.version>
+    <sesame.version>2.7.0</sesame.version>
+    <simple-jndi.version>0.11.1</simple-jndi.version>
+    <slf4j.version>1.7.20</slf4j.version>
+    <spring.dm.version>2.0.0.M1</spring.dm.version>
+    <spring.version>3.0.5.RELEASE</spring.version>
+    <stax.version>1.0</stax.version>
+    <tupelo.version>2.6</tupelo.version>
+    <xalan.version>2.7.1</xalan.version>
+    <servicemix.xerces.version>2.11.0_1</servicemix.xerces.version>
+    <xmlbeans.version>2.4.0</xmlbeans.version>
+    <xml.rpc.version>1.1.0</xml.rpc.version>
+    <xstream.version>1.4.1</xstream.version>
+
+
   </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+      </plugins>
+      </build>
+
 	<modules>
     <module>taverna-component-activity</module>
     <module>taverna-component-activity-ui</module>
@@ -43,6 +142,7 @@
     <url>https://github.com/apache/incubator-taverna-plugin-component</url>
     <tag>HEAD</tag>
   </scm>
+  
 
   <repositories>
     <repository>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4dc0ed93/taverna-component-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-component-activity-ui/pom.xml b/taverna-component-activity-ui/pom.xml
index 2c28f27..7531e60 100644
--- a/taverna-component-activity-ui/pom.xml
+++ b/taverna-component-activity-ui/pom.xml
@@ -22,11 +22,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>io.github.taverna-extras.component</groupId>
-		<artifactId>apache-taverna-plugin-component</artifactId>
-		<version>2.1.0-incubating-SNAPSHOT</version>
+		<artifactId>taverna-plugin-component</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>component-activity-ui</artifactId>
-	<name>Apache Taverna Component Workbench integration</name>
+	<name>Component Plugin Taverna Workbench integration</name>
 	<dependencies>
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4dc0ed93/taverna-component-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-component-activity/pom.xml b/taverna-component-activity/pom.xml
index 6bffac2..d41d3a4 100644
--- a/taverna-component-activity/pom.xml
+++ b/taverna-component-activity/pom.xml
@@ -22,12 +22,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>io.github.taverna-extras.component</groupId>
-		<artifactId>apache-taverna-plugin-component</artifactId>
-		<version>2.1.0-incubating-SNAPSHOT</version>
+		<artifactId>taverna-plugin-component</artifactId>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>taverna-component-activity</artifactId>
 	<packaging>bundle</packaging>
-  <name>Apache Taverna Component Repository activity/implementation</name>
+  <name>Component Plugin Taverna Activity and Repository impl</name>
 
 	<dependencies>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-component/blob/4dc0ed93/taverna-component-repository-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-component-repository-api/pom.xml b/taverna-component-repository-api/pom.xml
index af1ac18..0311a7b 100644
--- a/taverna-component-repository-api/pom.xml
+++ b/taverna-component-repository-api/pom.xml
@@ -21,13 +21,13 @@
 	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>io.github.taverna-extras</groupId>
-    <artifactId>apache-taverna-plugin-component</artifactId>
-    <version>2.1.0-incubating-SNAPSHOT</version>
+    <groupId>io.github.taverna-extras.component</groupId>
+    <artifactId>taverna-plugin-component</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>taverna-component-repository-api</artifactId>
 	<packaging>bundle</packaging>
-	<name>Apache Taverna Component Repository API</name>
+	<name>Component Plugin Repository API</name>
 	<inceptionYear>2014</inceptionYear>
 	<dependencies>
 		<dependency>