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:07 UTC
[1/3] incubator-rya git commit: RYA-373 made module only compile if
mvn -P benchmark re incompatible library. Closes #229
Repository: incubator-rya
Updated Branches:
refs/heads/master de365c179 -> c03c8bbef
RYA-373 made module only compile if mvn -P benchmark re incompatible library. Closes #229
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/a91099bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/a91099bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/a91099bc
Branch: refs/heads/master
Commit: a91099bc401256e3904b3126aab21f6226d8d3fa
Parents: de365c1
Author: David Lotts <da...@parsons.com>
Authored: Sat Sep 16 15:48:14 2017 -0400
Committer: David Lotts <da...@parsons.com>
Committed: Tue Sep 19 17:05:54 2017 -0400
----------------------------------------------------------------------
extras/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/a91099bc/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 53c7b4f..c38947e 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -44,8 +44,6 @@ under the License.
<module>rya.export</module>
<module>rya.merger</module>
<module>rya.giraph</module>
- <module>rya.benchmark</module>
- <module>rya.geoindexing</module>
</modules>
<profiles>
@@ -55,5 +53,11 @@ under the License.
<module>rya.geoindexing</module>
</modules>
</profile>
+ <profile>
+ <id>benchmark</id>
+ <modules>
+ <module>rya.benchmark</module>
+ </modules>
+ </profile>
</profiles>
</project>
[3/3] incubator-rya git commit: RYA-370 Improvements from review of
3.2.11-RC2. Closes #225
Posted by dl...@apache.org.
RYA-370 Improvements from review of 3.2.11-RC2. Closes #225
- Fixed a regression on the geoindexing profile in extras/pom.xml
- Added a 'rya.' prefix to the new geo.* artifactIds to disambiguate
generated artifacts.
- Added pluginManagement definition for
org.codehaus.mojo:license-maven-plugin for release auditing.
- Specified an Xmx value for maven-failsafe-plugin for improved
execution environment consistency on hosts with reduced memory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/c03c8bbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/c03c8bbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/c03c8bbe
Branch: refs/heads/master
Commit: c03c8bbef089e56f7597d4f40adb53b2313e37bd
Parents: 17f02bd
Author: jdasch <hc...@gmail.com>
Authored: Wed Sep 13 14:23:44 2017 -0400
Committer: David Lotts <da...@parsons.com>
Committed: Tue Sep 19 17:10:10 2017 -0400
----------------------------------------------------------------------
extras/pom.xml | 6 +-
extras/rya.geoindexing/geo.common/pom.xml | 47 +++++----
extras/rya.geoindexing/geo.geomesa/pom.xml | 97 ++++++++++---------
extras/rya.geoindexing/geo.geowave/pom.xml | 122 ++++++++++++------------
extras/rya.geoindexing/geo.mongo/pom.xml | 85 +++++++++--------
pom.xml | 8 ++
web/web.rya/pom.xml | 2 +-
7 files changed, 198 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index c38947e..52a823f 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -45,8 +45,8 @@ under the License.
<module>rya.merger</module>
<module>rya.giraph</module>
</modules>
-
- <profiles>
+
+ <profiles>
<profile>
<id>geoindexing</id>
<modules>
@@ -59,5 +59,5 @@ under the License.
<module>rya.benchmark</module>
</modules>
</profile>
- </profiles>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/extras/rya.geoindexing/geo.common/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/geo.common/pom.xml b/extras/rya.geoindexing/geo.common/pom.xml
index 6b4b3ca..41cbb5f 100644
--- a/extras/rya.geoindexing/geo.common/pom.xml
+++ b/extras/rya.geoindexing/geo.common/pom.xml
@@ -1,25 +1,32 @@
-<?xml version='1.0'?>
+<?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
-<!-- 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. -->
+ http://www.apache.org/licenses/LICENSE-2.0
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.rya</groupId>
- <artifactId>rya.geoindexing</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </parent>
+ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geoindexing</artifactId>
+ <version>3.2.11-incubating-SNAPSHOT</version>
+ </parent>
- <artifactId>geo.common</artifactId>
- <name>Apache Rya Geo Indexing Common Code</name>
+ <artifactId>rya.geo.common</artifactId>
+ <name>Apache Rya Geo Indexing Common Code</name>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/extras/rya.geoindexing/geo.geomesa/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/geo.geomesa/pom.xml b/extras/rya.geoindexing/geo.geomesa/pom.xml
index ebadd36..70998d3 100644
--- a/extras/rya.geoindexing/geo.geomesa/pom.xml
+++ b/extras/rya.geoindexing/geo.geomesa/pom.xml
@@ -1,51 +1,56 @@
-<?xml version='1.0'?>
+<?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
-<!-- 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. -->
+ 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.rya</groupId>
- <artifactId>rya.geoindexing</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>geo.geomesa</artifactId>
- <name>Apache Rya Geo Indexing using GeoMesa</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>14.3</geotools.version>
- </properties>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geoindexing</artifactId>
+ <version>3.2.11-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>rya.geo.geomesa</artifactId>
+ <name>Apache Rya Geo Indexing using GeoMesa</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.rya</groupId>
- <artifactId>geo.common</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </dependency>
+ <properties>
+ <geotools.version>14.3</geotools.version>
+ </properties>
- <dependency>
- <groupId>org.locationtech.geomesa</groupId>
- <artifactId>geomesa-accumulo-datastore_2.11</artifactId>
- </dependency>
- <dependency>
- <groupId>org.geotools.xsd</groupId>
- <artifactId>gt-xsd-gml3</artifactId>
- <version>${geotools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-api</artifactId>
- <version>${geotools.version}</version>
- </dependency>
- </dependencies>
- </project>
\ No newline at end of file
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geo.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.locationtech.geomesa</groupId>
+ <artifactId>geomesa-accumulo-datastore_2.11</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools.xsd</groupId>
+ <artifactId>gt-xsd-gml3</artifactId>
+ <version>${geotools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-api</artifactId>
+ <version>${geotools.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/extras/rya.geoindexing/geo.geowave/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/geo.geowave/pom.xml b/extras/rya.geoindexing/geo.geowave/pom.xml
index 92511f3..e07e4e7 100644
--- a/extras/rya.geoindexing/geo.geowave/pom.xml
+++ b/extras/rya.geoindexing/geo.geowave/pom.xml
@@ -1,61 +1,63 @@
-<?xml version='1.0'?>
-<!-- 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. -->
+<?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 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.rya</groupId>
- <artifactId>rya.geoindexing</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>geo.geowave</artifactId>
- <name>Apache Rya Geo indexing using GeoWave</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>16.0</geotools.version>
- </properties>
-
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.rya</groupId>
- <artifactId>geo.common</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>mil.nga.giat</groupId>
- <artifactId>geowave-datastore-accumulo</artifactId>
- <version>${geowave.version}</version>
- </dependency>
-
- <dependency>
- <groupId>mil.nga.giat</groupId>
- <artifactId>geowave-adapter-vector</artifactId>
- <version>${geowave.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.geotools.xsd</groupId>
- <artifactId>gt-xsd-gml3</artifactId>
- <version>${geotools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-api</artifactId>
- <version>${geotools.version}</version>
- </dependency>
- </dependencies>
-
- </project>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geoindexing</artifactId>
+ <version>3.2.11-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>rya.geo.geowave</artifactId>
+ <name>Apache Rya Geo indexing using GeoWave</name>
+
+ <properties>
+ <geotools.version>16.0</geotools.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geo.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mil.nga.giat</groupId>
+ <artifactId>geowave-datastore-accumulo</artifactId>
+ <version>${geowave.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mil.nga.giat</groupId>
+ <artifactId>geowave-adapter-vector</artifactId>
+ <version>${geowave.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools.xsd</groupId>
+ <artifactId>gt-xsd-gml3</artifactId>
+ <version>${geotools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-api</artifactId>
+ <version>${geotools.version}</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/extras/rya.geoindexing/geo.mongo/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.geoindexing/geo.mongo/pom.xml b/extras/rya.geoindexing/geo.mongo/pom.xml
index f8c4f49..65f8fb0 100644
--- a/extras/rya.geoindexing/geo.mongo/pom.xml
+++ b/extras/rya.geoindexing/geo.mongo/pom.xml
@@ -1,41 +1,48 @@
-<?xml version='1.0'?>
+<?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
-<!-- 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.rya</groupId>
- <artifactId>rya.geoindexing</artifactId>
- <version>3.2.11-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>geo.mongo</artifactId>
- <name>Apache Rya Geo Indexing using MongoDB</name>
- <description>Implementation of a geospatial indexing for mongo DB backed Rya</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <geotools.version>16.0</geotools.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.rya</groupId>
- <artifactId>geo.common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.geotools.xsd</groupId>
- <artifactId>gt-xsd-gml3</artifactId>
- <version>${geotools.version}</version>
- </dependency>
-
- </dependencies>
+ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geoindexing</artifactId>
+ <version>3.2.11-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>rya.geo.mongo</artifactId>
+ <name>Apache Rya Geo Indexing using MongoDB</name>
+ <description>Implementation of a geospatial indexing for mongo DB backed Rya</description>
+
+ <properties>
+ <geotools.version>16.0</geotools.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rya</groupId>
+ <artifactId>rya.geo.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools.xsd</groupId>
+ <artifactId>gt-xsd-gml3</artifactId>
+ <version>${geotools.version}</version>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 761f992..f629297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -935,6 +935,13 @@ under the License.
</configuration>
</plugin>
<plugin>
+ <!-- Used for auditing dependency licenses for releases. -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>1.14</version>
+ </plugin>
+ <plugin>
+ <!-- Used to add ASF license headers (without a copyright clause) to generated source. -->
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
@@ -998,6 +1005,7 @@ under the License.
<skipITs>${skip.rya.it}</skipITs>
<reuseForks>false</reuseForks> <!-- Temporary fix until RYA-331 is resolved. -->
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds> <!-- kill fork after 10 minutes -->
+ <argLine>-Xmx2G</argLine> <!-- Specify Xmx to get a consistent memory limit on hosts with reduced RAM. -->
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/c03c8bbe/web/web.rya/pom.xml
----------------------------------------------------------------------
diff --git a/web/web.rya/pom.xml b/web/web.rya/pom.xml
index a033595..38eeaff 100644
--- a/web/web.rya/pom.xml
+++ b/web/web.rya/pom.xml
@@ -202,7 +202,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.rya</groupId>
- <artifactId>geo.geowave</artifactId>
+ <artifactId>rya.geo.geowave</artifactId>
<version>${project.version}</version>
<!-- GeoWave brings in org.springframework jars that are not compatible with web.rya versions -->
<exclusions>
[2/3] incubator-rya git commit: RYA-372 Excluded org.json:json.
Closes #227
Posted by dl...@apache.org.
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>