You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by dl...@apache.org on 2017/09/19 21:44:08 UTC
[2/3] incubator-rya git commit: RYA-372 Excluded org.json:json.
Closes #227
RYA-372 Excluded org.json:json. Closes #227
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/17f02bd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/17f02bd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/17f02bd0
Branch: refs/heads/master
Commit: 17f02bd09824491806f1accee011beb936a0534b
Parents: a91099b
Author: David Lotts <da...@parsons.com>
Authored: Fri Sep 15 14:12:50 2017 -0400
Committer: David Lotts <da...@parsons.com>
Committed: Tue Sep 19 17:06:56 2017 -0400
----------------------------------------------------------------------
extras/rya.giraph/pom.xml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17f02bd0/extras/rya.giraph/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.giraph/pom.xml b/extras/rya.giraph/pom.xml
index a720baf..33455aa 100644
--- a/extras/rya.giraph/pom.xml
+++ b/extras/rya.giraph/pom.xml
@@ -31,15 +31,41 @@ under the License.
<artifactId>rya.giraph</artifactId>
<dependencies>
+<!--
+ Uncomment the following drop-in replacement if the exclusion
+ of the dependency org.json:json causes issues at runtime.
+ <dependency>
+ <groupId>com.tdunning</groupId>
+ <artifactId>json</artifactId>
+ <version>1.8</version>
+ <scope>runtime</scope>
+ </dependency>
+ -->
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-core</artifactId>
<version>1.2.0</version>
+ <exclusions>
+ <!-- Exclude for incompatible license -->
+ <!-- If this exclusion causes a ClassNotFoundException at runtime, -->
+ <!-- then, replace using this alternate library: https://github.com/tdunning/open-json . -->
+ <exclusion>
+ <artifactId>json</artifactId>
+ <groupId>org.json</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-accumulo</artifactId>
<version>1.2.0</version>
+ <exclusions>
+ <!-- exclude for incompatible license, see above if this causes issues. -->
+ <exclusion>
+ <artifactId>json</artifactId>
+ <groupId>org.json</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>