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/e7e0f381 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7e0f381 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7e0f381 Branch: refs/heads/1.7 Commit: e7e0f381a9a8a54119615a57f59f72fdb083f2bf Parents: d7716d3 fd2c88b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu May 26 22:08:58 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu May 26 22:08:58 2016 -0400 ---------------------------------------------------------------------- assemble/build.sh | 8 +- assemble/pom.xml | 6 +- assemble/src/main/assemblies/component.xml | 16 +- maven-plugin/pom.xml | 11 + .../org/apache/accumulo/plugin/PluginIT.java | 136 --------- .../org/apache/accumulo/plugin/it/PluginIT.java | 137 +++++++++ pom.xml | 289 +++++-------------- server/native/pom.xml | 1 - 8 files changed, 228 insertions(+), 376 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7e0f381/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7e0f381/assemble/src/main/assemblies/component.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7e0f381/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7e0f381/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index d393fcd,c1494d7..3cbba12 --- a/pom.xml +++ b/pom.xml @@@ -24,12 -24,18 +24,18 @@@ </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.6.6-SNAPSHOT</version> + <version>1.7.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Accumulo Project</name> - <description>Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description> - <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site --> - <url>http://accumulo.apache.org/maven-site/</url> + <description>Apache Accumulo is a sorted, distributed key/value store based + on Google's BigTable design. It is built on top of Apache Hadoop, + Zookeeper, and Thrift. It features a few novel improvements on the BigTable + design in the form of cell-level access labels and a server-side + programming mechanism that can modify key/value pairs at various points in + the data management process.</description> + <!-- this URL is where the site derived via the maven-site-plugin ends up, + not the generic site; currently not used --> + <url>https://accumulo.apache.org</url> <!-- this is the year of inception at ASF --> <inceptionYear>2011</inceptionYear> <organization> @@@ -1020,102 -953,8 +1003,15 @@@ </execution> </executions> </plugin> + <plugin> + <!-- Allows us to get the apache-ds bundle artifacts --> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <inherited>true</inherited> + </plugin> </plugins> - <extensions> - <extension> - <!-- enable ssh deployment of site with maven 3 --> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>2.8</version> - </extension> - </extensions> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>2.11</version> - <reportSets> - <reportSet> - <reports> - <report>jira-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.4</version> - <configuration> - <excludes> - <exclude>**/thrift/*.java</exclude> - </excludes> - <format>html</format> - <includeTests>true</includeTests> - <targetJdk>${maven.compiler.target}</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.8</version> - <configuration> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>summary</report> - <report>index</report> - <report>dependencies</report> - <report>issue-tracking</report> - <report>scm</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs.version}</version> - <configuration> - <excludeFilterFile>contrib/findbugs-exclude.xml</excludeFilterFile> - <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - <xmlOutput>true</xmlOutput> - <effort>Max</effort> - <threshold>Medium</threshold> - <failOnError>false</failOnError> - </configuration> - </plugin> - </plugins> - </reporting> <profiles> <profile> <id>m2e</id> http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7e0f381/server/native/pom.xml ---------------------------------------------------------------------- diff --cc server/native/pom.xml index 6c90858,cfe1835..78534bf --- a/server/native/pom.xml +++ b/server/native/pom.xml @@@ -82,9 -79,7 +82,8 @@@ </goals> <phase>package</phase> <configuration> - <attach>true</attach> <appendAssemblyId>false</appendAssemblyId> + <finalName>${project.build.finalName}</finalName> <descriptors> <descriptor>src/main/assemblies/native-tarball.xml</descriptor> </descriptors>
