Repository: incubator-rya Updated Branches: refs/heads/develop 188791306 -> d5202aa52
RYA-45 Pushing apache-rat constraints to submodules Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/d5202aa5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/d5202aa5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/d5202aa5 Branch: refs/heads/develop Commit: d5202aa52309ab914fb561d73015b22234c0d53f Parents: 1887913 Author: Aaron Mihalik <[email protected]> Authored: Thu Mar 3 21:40:07 2016 -0500 Committer: Aaron Mihalik <[email protected]> Committed: Thu Mar 3 21:40:07 2016 -0500 ---------------------------------------------------------------------- dao/accumulo.rya/pom.xml | 19 +++++++++++ extras/indexing/pom.xml | 17 ++++++++++ extras/rya.prospector/pom.xml | 14 +++++++++ extras/tinkerpop.rya/pom.xml | 13 ++++++++ .../blueprints/impls/sail/log4j.properties | 33 -------------------- osgi/pom.xml | 23 +++++++------- pom.xml | 13 -------- sail/pom.xml | 30 +++++++++++------- web/web.rya/pom.xml | 15 +++++++++ 9 files changed, 108 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/dao/accumulo.rya/pom.xml ---------------------------------------------------------------------- diff --git a/dao/accumulo.rya/pom.xml b/dao/accumulo.rya/pom.xml index d7810a8..c089cfe 100644 --- a/dao/accumulo.rya/pom.xml +++ b/dao/accumulo.rya/pom.xml @@ -74,6 +74,25 @@ under the License. <scope>test</scope> </dependency> </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- RDF data Files --> + <exclude>**/*.ntriples</exclude> + <exclude>**/*.trig</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> <profile> <id>mr</id> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/extras/indexing/pom.xml ---------------------------------------------------------------------- diff --git a/extras/indexing/pom.xml b/extras/indexing/pom.xml index 3bfa0ce..53e516d 100644 --- a/extras/indexing/pom.xml +++ b/extras/indexing/pom.xml @@ -90,6 +90,23 @@ under the License. </dependency> </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- RDF data Files --> + <exclude>**/*.ttl</exclude> + + <!-- Services Files --> + <exclude>**/resources/META-INF/services/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/extras/rya.prospector/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/pom.xml b/extras/rya.prospector/pom.xml index a9b5c61..bf9321e 100644 --- a/extras/rya.prospector/pom.xml +++ b/extras/rya.prospector/pom.xml @@ -62,6 +62,20 @@ under the License. </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- Services Files --> + <exclude>**/resources/META-INF/services/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/extras/tinkerpop.rya/pom.xml ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/pom.xml b/extras/tinkerpop.rya/pom.xml index 88d7a09..9ccb4b1 100644 --- a/extras/tinkerpop.rya/pom.xml +++ b/extras/tinkerpop.rya/pom.xml @@ -62,6 +62,19 @@ under the License. </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>blueprints.log</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.gmaven</groupId> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/extras/tinkerpop.rya/src/test/java/com/tinkerpop/blueprints/impls/sail/log4j.properties ---------------------------------------------------------------------- diff --git a/extras/tinkerpop.rya/src/test/java/com/tinkerpop/blueprints/impls/sail/log4j.properties b/extras/tinkerpop.rya/src/test/java/com/tinkerpop/blueprints/impls/sail/log4j.properties deleted file mode 100644 index a976141..0000000 --- a/extras/tinkerpop.rya/src/test/java/com/tinkerpop/blueprints/impls/sail/log4j.properties +++ /dev/null @@ -1,33 +0,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. - - -# Tinker Pop's "blueprints-sail-graph" actually loads it's own log4j properties -# from the classpath. Unfortunately, it creates a file (blueprints.log) and -# this can be messy. - -# This log4j.properties file overwrites Tinker Pop's "blueprints-sail-graph" -# log4j properties in order to write to the console. - -log4j.debug=true - -log4j.rootLogger=INFO, console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%t] %p %C{1} - %m%n - http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index e0a8992..7775ddb 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -44,21 +44,20 @@ under the License. <!-- <module>sesame-runtime-osgi</module> --> </modules> <build> - <plugins> - <!-- Move to subproject when resolving RYA-8 --> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>sesame-runtime-osgi/openrdf-sesame-osgi.bnd</exclude> - </excludes> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- Services Files --> + <exclude>**/resources/META-INF/services/**</exclude> + <exclude>sesame-runtime-osgi/openrdf-sesame-osgi.bnd</exclude> + </excludes> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <version>${maven-bundle-plugin.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6eace5..6308cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -651,19 +651,6 @@ under the License. <goals> <goal>check</goal> </goals> - <configuration> - <excludes> - <!-- RDF data Files --> - <exclude>**/*.ntriples</exclude> - <exclude>**/*.trig</exclude> - <exclude>**/*.ttl</exclude> - <exclude>**/*.owl</exclude> - <exclude>**/*.nt</exclude> - - <!-- Services Files --> - <exclude>**/resources/META-INF/services/**</exclude> - </excludes> - </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/sail/pom.xml ---------------------------------------------------------------------- diff --git a/sail/pom.xml b/sail/pom.xml index dfd2811..9b2de30 100644 --- a/sail/pom.xml +++ b/sail/pom.xml @@ -83,16 +83,24 @@ under the License. </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>**/resources/META-INF/org.openrdf.store.schemas</exclude> - </excludes> - </configuration> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- RDF data Files --> + <exclude>**/*.trig</exclude> + <exclude>**/*.owl</exclude> + <exclude>**/*.nt</exclude> + + <!-- Services Files --> + <exclude>**/resources/META-INF/services/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d5202aa5/web/web.rya/pom.xml ---------------------------------------------------------------------- diff --git a/web/web.rya/pom.xml b/web/web.rya/pom.xml index 204bbef..3c38401 100644 --- a/web/web.rya/pom.xml +++ b/web/web.rya/pom.xml @@ -132,5 +132,20 @@ under the License. </configuration> </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- RDF data Files --> + <exclude>**/*.trig</exclude> + <exclude>**/*.nt</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </project>
