Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd37134c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd37134c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd37134c Branch: refs/heads/master Commit: fd37134c9b86b83ad8f0e57301ab50beda54e789 Parents: e15b023 e7e0f38 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu May 26 22:23:13 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu May 26 22:23:13 2016 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 2 - assemble/src/main/assemblies/component.xml | 16 +- maven-plugin/pom.xml | 6 + .../org/apache/accumulo/plugin/PluginIT.java | 136 ----------- .../org/apache/accumulo/plugin/it/PluginIT.java | 137 +++++++++++ pom.xml | 234 +++++-------------- server/native/pom.xml | 1 - test/pom.xml | 2 + 8 files changed, 213 insertions(+), 321 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 8241b64,3cbba12..f783731 --- a/pom.xml +++ b/pom.xml @@@ -24,12 -24,18 +24,18 @@@ </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.2-SNAPSHOT</version> + <version>1.8.0-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> @@@ -109,23 -114,12 +115,16 @@@ <system>Apache Jenkins</system> <url>https://builds.apache.org/view/A-D/view/Accumulo/</url> </ciManagement> - <distributionManagement> - <site> - <id>accumulo.mvn.website</id> - <name>Accumulo Maven Site</name> - <!-- this is not likely to be what we really want, but it's good enough for a test --> - <url>scm:svn:https://svn.apache.org/repos/asf/accumulo/site/trunk/maven-site</url> - </site> - </distributionManagement> <properties> + <!-- Interface used to separate tests with JUnit category --> + <accumulo.performanceTests>org.apache.accumulo.test.PerformanceTest</accumulo.performanceTests> <!-- used for filtering the java source with the current version --> <accumulo.release.version>${project.version}</accumulo.release.version> + <assembly.tarLongFileMode>gnu</assembly.tarLongFileMode> <!-- bouncycastle version for test dependencies --> <bouncycastle.version>1.50</bouncycastle.version> + <!-- Curator version --> + <curator.version>2.7.1</curator.version> <!-- relative path for Eclipse format; should override in child modules if necessary --> <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle> <!-- extra release args for testing --> @@@ -614,23 -589,8 +620,13 @@@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <attach>false</attach> - <!-- this is for releases; override for other assembly executions --> - <finalName>accumulo-${project.version}</finalName> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.11</version> + <version>2.12</version> <configuration> <issueManagementSystems> <issueManagementSystem>JIRA</issueManagementSystem> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/server/native/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd37134c/test/pom.xml ---------------------------------------------------------------------- diff --cc test/pom.xml index 6da0f0e,a5533bd..ea2e374 --- a/test/pom.xml +++ b/test/pom.xml @@@ -238,49 -233,8 +238,50 @@@ </systemPropertyVariables> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> ++ <id>create-iterator-test-jar</id> + <goals> + <goal>test-jar</goal> + </goals> + <phase>pre-integration-test</phase> + <configuration> + <finalName>TestIterators</finalName> + <classifier /> + <includes> + <include>org/apache/accumulo/test/functional/ValueReversingIterator.class</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>check-for-misplaced-ITs</id> + <goals> + <goal>exec</goal> + </goals> + <phase>validate</phase> + <configuration> + <executable>bash</executable> + <arguments> + <argument>-c</argument> + <argument>! find src/test/java -name '*IT.java' -exec echo '[ERROR] {} should be in src/main/java' \; | grep 'src/test/java'</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> <profiles> <profile> @@@ -375,62 -330,6 +376,63 @@@ </dependency> </dependencies> </profile> + <profile> + <!-- create shaded test jar appropriate for running ITs on MapReduce --> + <id>mrit</id> + <activation> + <property> + <name>mrit</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <artifactSet> + <excludes> + <exclude>com.google.auto.service</exclude> + <exclude>com.google.auto</exclude> + <exclude>javax.servlet:servlet-api</exclude> + <exclude>org.apache.accumulo:accumulo-native</exclude> + <exclude>org.slf4j:slf4j-log4j12</exclude> + </excludes> + </artifactSet> + <shadedArtifactAttached>true</shadedArtifactAttached> + <shadedClassifierName>mrit</shadedClassifierName> + <createDependencyReducedPom>false</createDependencyReducedPom> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/DEPENDENCIES</exclude> + </excludes> + </filter> + </filters> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Sealed>false</Sealed> + <Main-Class>org.apache.accumulo.test.mrit.IntegrationTestMapReduce</Main-Class> + </manifestEntries> + </transformer> + </transformers> + </configuration> + <executions> + <execution> ++ <id>create-shaded-mrit</id> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
