TAVERNA-970 Use Jena 3.1.0 .. but we need explicit xerces and to upgrade jsonld java version
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/95ebd582 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/95ebd582 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/95ebd582 Branch: refs/heads/cwl Commit: 95ebd5826a0ebd7f6b47895f5f0e8c7c2309244b Parents: 8e18be4 Author: Stian Soiland-Reyes <[email protected]> Authored: Sun May 15 16:33:26 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Sun May 15 16:33:26 2016 +0100 ---------------------------------------------------------------------- pom.xml | 6 ++---- taverna-databundle/pom.xml | 13 ++++++++++++ taverna-robundle/pom.xml | 16 +++++++++++++++ taverna-scufl2-annotation/pom.xml | 12 +++++++++++ taverna-scufl2-wfdesc/pom.xml | 37 ++++++++++++++++++++++------------ 5 files changed, 67 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/95ebd582/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c2387bc..fa17111 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.taverna</groupId> <artifactId>apache-taverna-parent</artifactId> - <version>2-incubating</version> + <version>3-incubating-SNAPSHOT</version> </parent> <groupId>org.apache.taverna.language</groupId> <artifactId>apache-taverna-language</artifactId> @@ -31,9 +31,6 @@ <description>Taverna Language API for workflow definitions (SCUFL2) and workflow inputs/outputs/run (DataBundle). </description> - <properties> - <jena.version>3.0.0</jena.version> <!-- TAVERNA-892 - avoid 3.0.1 --> - </properties> <build> <plugins> @@ -249,6 +246,7 @@ </dependency> </dependencies> </dependencyManagement> + <modules> <module>taverna-baclava-language</module> <module>taverna-databundle</module> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/95ebd582/taverna-databundle/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-databundle/pom.xml b/taverna-databundle/pom.xml index eeff849..eefb74a 100644 --- a/taverna-databundle/pom.xml +++ b/taverna-databundle/pom.xml @@ -32,6 +32,19 @@ <artifactId>jena-osgi</artifactId> <version>${jena.version}</version> </dependency> + + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xerces</artifactId> + <version>${servicemix.xerces.version}</version> + </dependency> + <!-- JENA-1178 workaround: Upgrade jsonlld-java --> + <dependency> + <groupId>com.github.jsonld-java</groupId> + <artifactId>jsonld-java</artifactId> + <version>${jsonldjava.version}</version> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>taverna-scufl2-wfbundle</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/95ebd582/taverna-robundle/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-robundle/pom.xml b/taverna-robundle/pom.xml index b884320..be1f5f2 100644 --- a/taverna-robundle/pom.xml +++ b/taverna-robundle/pom.xml @@ -60,6 +60,22 @@ <artifactId>jena-osgi</artifactId> <version>${jena.version}</version> </dependency> + + <!-- Needed by jena-osgi --> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xerces</artifactId> + <version>${servicemix.xerces.version}</version> + </dependency> + <!-- JENA-1178 workaround: Upgrade jsonlld-java --> + <dependency> + <groupId>com.github.jsonld-java</groupId> + <artifactId>jsonld-java</artifactId> + <version>${jsonldjava.version}</version> + </dependency> + + + <!-- <dependency> <groupId>com.sun.xml.bind</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/95ebd582/taverna-scufl2-annotation/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-scufl2-annotation/pom.xml b/taverna-scufl2-annotation/pom.xml index 40c584e..7c1ee19 100644 --- a/taverna-scufl2-annotation/pom.xml +++ b/taverna-scufl2-annotation/pom.xml @@ -49,5 +49,17 @@ <artifactId>jena-osgi</artifactId> <version>${jena.version}</version> </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xerces</artifactId> + <version>${servicemix.xerces.version}</version> + </dependency> + <!-- JENA-1178 workaround: Upgrade jsonlld-java --> + <dependency> + <groupId>com.github.jsonld-java</groupId> + <artifactId>jsonld-java</artifactId> + <version>${jsonldjava.version}</version> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/95ebd582/taverna-scufl2-wfdesc/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-scufl2-wfdesc/pom.xml b/taverna-scufl2-wfdesc/pom.xml index 411fe86..4cc8023 100755 --- a/taverna-scufl2-wfdesc/pom.xml +++ b/taverna-scufl2-wfdesc/pom.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + You under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. 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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -74,7 +74,7 @@ </plugins> <pluginManagement> <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings + <!--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> @@ -140,6 +140,18 @@ <artifactId>jena-osgi</artifactId> <version>${jena.version}</version> </dependency> + <dependency> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.xerces</artifactId> + <version>${servicemix.xerces.version}</version> + </dependency> + <!-- JENA-1178 workaround: Upgrade jsonlld-java --> + <dependency> + <groupId>com.github.jsonld-java</groupId> + <artifactId>jsonld-java</artifactId> + <version>${jsonldjava.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -147,7 +159,6 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -158,13 +169,13 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.3</version> + <version>${jackson.version}</version> <type>jar</type> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> - <version>1.11</version> + <version>${jersey.client.version}</version> <scope>compile</scope> </dependency> </dependencies>
