accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [7/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Date Wed, 13 Aug 2014 01:35:50 GMT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 3ee78d994d51ad342bcaf260f1f87284dd0bba0e
Parents: e440e47 c4d46bb
Author: Josh Elser <elserj@apache.org>
Authored: Tue Aug 12 21:32:26 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Aug 12 21:32:26 2014 -0400

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ee78d99/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0d75f10,2f14d07..ca99168
--- a/pom.xml
+++ b/pom.xml
@@@ -605,13 -481,15 +605,15 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-release-plugin</artifactId>
+           <!-- Work around MRELEASE-812 -->
+           <version>2.5</version>
            <configuration>
 -            <arguments>-P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
 +            <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
              <autoVersionSubmodules>true</autoVersionSubmodules>
 -            <goals>clean compile javadoc:aggregate deploy</goals>
 -            <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
 +            <goals>clean deploy</goals>
 +            <preparationGoals>clean verify</preparationGoals>
              <tagNameFormat>@{project.version}</tagNameFormat>
 -            <releaseProfiles>seal-jars</releaseProfiles>
 +            <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
              <useReleaseProfile>false</useReleaseProfile>
              <pushChanges>false</pushChanges>
              <localCheckout>true</localCheckout>


Mime
View raw message