accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.7'
Date Wed, 03 Feb 2016 21:56:37 GMT
Merge branch '1.7'

Conflicts:
	maven-plugin/src/it/plugin-test/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/03246da4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/03246da4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/03246da4

Branch: refs/heads/master
Commit: 03246da498401033669d6405f42cc6c87d71173c
Parents: 78cbeab 81f1c7d
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Feb 3 16:56:14 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Feb 3 16:56:14 2016 -0500

----------------------------------------------------------------------
 maven-plugin/src/it/plugin-test/pom.xml | 11 +++++++----
 pom.xml                                 |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/03246da4/maven-plugin/src/it/plugin-test/pom.xml
----------------------------------------------------------------------
diff --cc maven-plugin/src/it/plugin-test/pom.xml
index 19f59b9,2eb8626..f114fa4
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@@ -118,21 -114,12 +114,28 @@@
          </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>
 +              <goal>verify</goal>
 +            </goals>
 +            <configuration>
 +              <excludedGroups combine.self="override" />
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
++      <plugin>
+         <groupId>org.apache.rat</groupId>
+         <artifactId>apache-rat-plugin</artifactId>
+         <configuration>
+           <skip>true</skip>
+         </configuration>
+       </plugin>
      </plugins>
    </build>
  </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/03246da4/pom.xml
----------------------------------------------------------------------


Mime
View raw message