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/01/05 13:53:33 UTC
[1/2] incubator-taverna-language git commit: removed redundant rat
exclusions
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 2f246f089 -> ac86734bd
removed redundant rat exclusions
(covered by taverna-maven-parent)
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/ba221941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ba221941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ba221941
Branch: refs/heads/master
Commit: ba221941b9c9f4fdc778a2b268bfe9673eb02dcd
Parents: 2f246f0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jan 5 13:52:08 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jan 5 13:52:08 2018 +0000
----------------------------------------------------------------------
pom.xml | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ba221941/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5bef95..01cd73a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <!--Just a META-INF file -->
- <exclude>DEPENDENCIES</exclude>
+ <excludes combine.children="append">
<!-- Following excludes needed for taverna-scufl2-rdf,
taverna-scufl2-integration-tests and taverna-scufl2-validation-integration
subfolders that should be modules but are not. -->
@@ -48,14 +46,6 @@
<exclude>**/.project</exclude>
<exclude>**/.settings/</exclude>
<exclude>**/target/</exclude>
- <!-- Text and Markdown files are typically used only for documentation
- purposes and license declarations are usually spurious in these files since
- often they will refer to the LICENSE/NOTICE for users to find the actual
- licenses -->
- <exclude>**/*.md</exclude>
- <!-- META-INF services files can include comments but a license header
- would be unecessarily clutter so we exclude these -->
- <exclude>**/META-INF/services/*</exclude>
<!-- No headers in JSON which haven't got comments ... -->
<exclude>**/*.json</exclude>
<!-- Really a binary format, but must look like text -->
@@ -78,9 +68,6 @@
<exclude>src/test/resources/document.odt</exclude>
<exclude>src/test/resources/workflowrun.bundle.zip</exclude>
- <!-- Created by Maven Shade plugin -->
- <exclude>dependency-reduced-pom.xml</exclude>
-
<!--
Below exclusions are for
externally sourced/derived files
[2/2] incubator-taverna-language git commit: Newer jsonld-java broke
test compile
Posted by st...@apache.org.
Newer jsonld-java broke test compile
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/ac86734b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ac86734b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ac86734b
Branch: refs/heads/master
Commit: ac86734bdcd33f63ef77af19d3e10ea8c44d25ce
Parents: ba22194
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jan 5 13:52:28 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jan 5 13:52:28 2018 +0000
----------------------------------------------------------------------
.../org/apache/taverna/robundle/manifest/TestRDFToManifest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ac86734b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
index 2557973..59044ec 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
@@ -22,7 +22,6 @@ package org.apache.taverna.robundle.manifest;
import static org.junit.Assert.assertNotNull;
-import java.net.URL;
import java.util.Map;
import org.junit.Test;
@@ -39,7 +38,7 @@ public class TestRDFToManifest {
// RDFToManifest.makeBaseURI(); // trigger static{} block
@SuppressWarnings("unchecked")
Map<String, Object> context = (Map<String, Object>) new DocumentLoader()
- .fromURL(new URL(CONTEXT));
+ .loadDocument(CONTEXT);
// FIXME: jsonld-java 0.3 and later uses DocumentLoader instead of
// JSONUtils
// Map<String, Object> context = (Map<String, Object>)