Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/55106851 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/55106851 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/55106851 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 55106851ab6516d56a2a43427ab95f9b0dcf1208 Parents: 17f4de1 7547b29 Author: Mike Drob <md...@cloudera.com> Authored: Fri Dec 27 17:19:04 2013 -0800 Committer: Mike Drob <md...@cloudera.com> Committed: Fri Dec 27 17:19:04 2013 -0800 ---------------------------------------------------------------------- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/55106851/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 4d223d9,955818d..672204e --- a/pom.xml +++ b/pom.xml @@@ -594,134 -401,25 +594,150 @@@ </pluginExecution> <pluginExecution> <pluginExecutionFilter> + <groupId>com.google.code.sortpom</groupId> + <artifactId>maven-sortpom-plugin</artifactId> + <versionRange>[2.1.0,)</versionRange> + <goals> + <goal>verify</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> ++ <pluginExecution> ++ <pluginExecutionFilter> + <groupId>com.github.koraktor</groupId> + <artifactId>mavanagaiata</artifactId> + <versionRange>[0.6.1,)</versionRange> + <goals> + <goal>commit</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> </configuration> </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <!-- verify only; 'mvn clean -P sortpom' sorts --> + <groupId>com.google.code.sortpom</groupId> + <artifactId>maven-sortpom-plugin</artifactId> + <executions> + <execution> + <id>verify-sorted-pom</id> + <goals> + <goal>verify</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <outputDirectory>../lib</outputDirectory> + <!-- just grab the non-provided runtime dependencies --> + <stripVersion>true</stripVersion> + <includeScope>runtime</includeScope> + <excludeTransitive>true</excludeTransitive> + <excludeClassifiers>sources,test-sources</excludeClassifiers> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-mvn</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>[${maven.min-version},)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.github.koraktor</groupId> + <artifactId>mavanagaiata</artifactId> ++ <configuration> ++ <skipNoGit>true</skipNoGit> ++ </configuration> + <executions> + <execution> + <id>git-commit</id> + <goals> + <goal>commit</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <id>run-integration-tests</id> + <goals> + <goal>integration-test</goal> + </goals> + <phase>integration-test</phase> + </execution> + <execution> + <id>verify-integration-tests</id> + <goals> + <goal>verify</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <executions> + <execution> + <id>scm-publish</id> + <goals> + <goal>publish-scm</goal> + </goals> + <phase>site-deploy</phase> + </execution> + </executions> + </plugin> + </plugins> + <extensions> + <extension> + <!-- enable ssh deployment of site with maven 3 --> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + <version>2.4</version> + </extension> + </extensions> </build> - <reporting> <plugins> <plugin>
