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.8'
Date Fri, 22 Jul 2016 23:39:57 GMT
Merge branch '1.8'

Conflicts:
	assemble/pom.xml
	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/976854c6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976854c6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/976854c6

Branch: refs/heads/master
Commit: 976854c6ad258c46e1ea9b5fba2aa4535f71c816
Parents: 2c55074 6cc07fa
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Jul 22 19:39:40 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Jul 22 19:39:40 2016 -0400

----------------------------------------------------------------------
 README.md             |  10 +-
 assemble/build.sh     |   2 +-
 assemble/pom.xml      | 151 ++++++++++++++-------------
 docs/pom.xml          | 248 ++++++++++++++++++++++-----------------------
 pom.xml               |   2 +-
 server/native/pom.xml |   1 +
 test/pom.xml          |  48 ---------
 7 files changed, 207 insertions(+), 255 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/README.md
----------------------------------------------------------------------
diff --cc README.md
index 4269001,fd57394..4cca80d
--- a/README.md
+++ b/README.md
@@@ -55,12 -53,13 +55,13 @@@ to run them after following the [instal
  Building
  --------
  
 -Accumulo uses [Maven][9] to compile, [test][3], and package its source.  The
 +Accumulo uses [Maven] to compile, [test], and package its source.  The
  following command will build the binary tar.gz from source.  Note, these
  instructions will not work for the Accumulo binary distribution as it does not
- include source.
+ include source.  If you just want to build without waiting for the tests to
+ run, add `-DskipTests`.
  
-     mvn package -P assemble
+     mvn package
  
  This command produces a file at the following location.
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/assemble/pom.xml
----------------------------------------------------------------------
diff --cc assemble/pom.xml
index 44dfceb,9c1639a..e009faa
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@@ -110,7 -136,13 +136,8 @@@
      </dependency>
      <dependency>
        <groupId>org.apache.accumulo</groupId>
 -      <artifactId>accumulo-trace</artifactId>
 -      <optional>true</optional>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.apache.accumulo</groupId>
        <artifactId>accumulo-tracer</artifactId>
+       <optional>true</optional>
      </dependency>
      <dependency>
        <groupId>org.apache.accumulo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/docs/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 110cdc7,a09eb87..1c98549
--- a/pom.xml
+++ b/pom.xml
@@@ -724,10 -692,8 +724,10 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-release-plugin</artifactId>
 +          <!-- overridden version from ASF-17 parent pom -->
 +          <version>2.5.3</version>
            <configuration>
-             <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2
${extraReleaseArgs}</arguments>
+             <arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
              <autoVersionSubmodules>true</autoVersionSubmodules>
              <goals>clean deploy</goals>
              <preparationGoals>clean verify</preparationGoals>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/server/native/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/976854c6/test/pom.xml
----------------------------------------------------------------------


Mime
View raw message