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/06/25 16:35:47 UTC

[2/2] incubator-taverna-language git commit: Maven plugin versions from parent

Maven plugin versions from parent

jena-arq rather than jena-osgi


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/7fdc1aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/7fdc1aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/7fdc1aad

Branch: refs/heads/master
Commit: 7fdc1aad1ac74313d3e1e2df1f3bb64ddba8d255
Parents: a872dda
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 25 15:35:08 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 25 15:35:08 2015 +0100

----------------------------------------------------------------------
 pom.xml                              |  1 -
 taverna-language-commandline/pom.xml |  2 ++
 taverna-scufl2-examples/pom.xml      | 13 +------------
 3 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7fdc1aad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 50b74d8..37b3946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,6 @@
 				<plugin>
 					<groupId>org.jvnet.jaxb2.maven2</groupId>
 					<artifactId>maven-jaxb2-plugin</artifactId>
-					<version>0.12.3</version>
 					<configuration>
 						<enableIntrospection>true</enableIntrospection>
 						<specVersion>2.2</specVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7fdc1aad/taverna-language-commandline/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/pom.xml b/taverna-language-commandline/pom.xml
index db80698..bf3665c 100644
--- a/taverna-language-commandline/pom.xml
+++ b/taverna-language-commandline/pom.xml
@@ -124,7 +124,9 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>appassembler-maven-plugin</artifactId>
+        <!--
 				<version>1.1.1</version>
+        -->
 				<executions>
 					<execution>
 						<id>assemble</id>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7fdc1aad/taverna-scufl2-examples/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/pom.xml b/taverna-scufl2-examples/pom.xml
index 922ae44..896ad88 100644
--- a/taverna-scufl2-examples/pom.xml
+++ b/taverna-scufl2-examples/pom.xml
@@ -41,20 +41,11 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-		<!-- Included to get rid of "Could not set prefix mapper" warning, but 
-			should work fine without -->
-		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.2.4-1</version>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- For writing out JSON-LD annotations -->
 
 		<dependency>
 			<groupId>org.apache.jena</groupId>
-			<artifactId>jena-osgi</artifactId>
+			<artifactId>jena-arq</artifactId>
 			<version>${jena.version}</version>
 		</dependency>
 
@@ -117,8 +108,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<!--<version>2.0</version> does not work with Maven 2 :( -->
-				<version>1.7.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>