Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c94ea0d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c94ea0d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c94ea0d Branch: refs/heads/master Commit: 7c94ea0da37620f540444a263dad737f123642bd Parents: 6558b4a 6c4df76 Author: Josh Elser <els...@apache.org> Authored: Sat Sep 12 18:47:58 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Sep 12 18:47:58 2015 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 14 ++++ .../src/main/appended-resources/META-INF/NOTICE | 9 +++ .../main/appended-resources/META-INF/LICENSE | 74 ++++++++++++++++++++ .../main/appended-resources/META-INF/LICENSE | 74 -------------------- .../src/main/appended-resources/META-INF/NOTICE | 9 --- 5 files changed, 97 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c94ea0d/assemble/pom.xml ---------------------------------------------------------------------- diff --cc assemble/pom.xml index 9258d87,35d974a..87c0ed4 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@@ -170,30 -162,22 +170,44 @@@ </dependency> </dependencies> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>bin-LICENSE</exclude> + <exclude>bin-NOTICE</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <!-- generate version listing for packaged dependencies --> + <id>generate-dependencies-raw</id> + <goals> + <goal>list</goal> + </goals> + <phase>compile</phase> + <configuration> + <outputFile>${project.build.directory}/dependencies.raw.txt</outputFile> + <outputScope>false</outputScope> + <sort>true</sort> + <!-- this list should match that in src/main/assemblies/component.xml --> + <includeArtifactIds>commons-math,commons-vfs2,gson,guava,htrace-core,javax.servlet-api,jcommander,jetty-http,jetty-io,jetty-security,jetty-server,jetty-servlet,jetty-util,jline,libthrift,protobuf-java,slf4j-api,slf4j-log4j12</includeArtifactIds> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions>