Repository: incubator-rya Updated Branches: refs/heads/develop 71ab4f3a5 -> 64284db6f
Adding RAT Excludes to Merge Tool to fix the build Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/64284db6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/64284db6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/64284db6 Branch: refs/heads/develop Commit: 64284db6f15ebbc1413f4e9484e93b1352f03318 Parents: 71ab4f3 Author: Aaron Mihalik <[email protected]> Authored: Tue Aug 23 19:26:33 2016 -0400 Committer: Aaron Mihalik <[email protected]> Committed: Tue Aug 23 19:26:33 2016 -0400 ---------------------------------------------------------------------- extras/rya.merger/pom.xml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/64284db6/extras/rya.merger/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml index 2886afd..4d83fb7 100644 --- a/extras/rya.merger/pom.xml +++ b/extras/rya.merger/pom.xml @@ -169,6 +169,20 @@ under the License. </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + Accumulo data Files + <exclude>**/*.rf</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -281,7 +295,7 @@ under the License. </plugin> <!-- - Copies all needed files into target/distribution/rya.merger-${version} + Copies all needed files into target/distribution/rya.merger-${project.version} --> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -294,7 +308,7 @@ under the License. <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/distribution/${artifactId}-${version}/bin</outputDirectory> + <outputDirectory>${project.build.directory}/distribution/${project.artifactId}-${project.version}/bin</outputDirectory> <resources> <resource> <directory>${basedir}/startup_scripts</directory> @@ -309,7 +323,7 @@ under the License. <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/distribution/${artifactId}-${version}/config</outputDirectory> + <outputDirectory>${project.build.directory}/distribution/${project.artifactId}-${project.version}/config</outputDirectory> <resources> <resource> <directory>${basedir}/config</directory> @@ -324,7 +338,7 @@ under the License. <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/distribution/${artifactId}-${version}/lib</outputDirectory> + <outputDirectory>${project.build.directory}/distribution/${project.artifactId}-${project.version}/lib</outputDirectory> <resources> <resource> <directory>${project.build.directory}/lib</directory> @@ -342,7 +356,7 @@ under the License. <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/distribution/${artifactId}-${version}/</outputDirectory> + <outputDirectory>${project.build.directory}/distribution/${project.artifactId}-${project.version}/</outputDirectory> <resources> <resource> <directory>${project.build.directory}</directory> @@ -365,7 +379,7 @@ under the License. <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/distribution/${artifactId}-${version}/</outputDirectory> + <outputDirectory>${project.build.directory}/distribution/${project.artifactId}-${project.version}/</outputDirectory> <resources> <resource> <directory>${basedir}</directory>
