[accumulo] 01/01: Merge branch '1.9' into 2.0

2019-06-21 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit e0e9c471fc5beaba71b1b826675ab867ba47418b
Merge: 4160067 d7fccfd
Author: Christopher Tubbs 
AuthorDate: Fri Jun 21 04:20:36 2019 -0400

Merge branch '1.9' into 2.0

 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc .travis.yml
index c96e059,1b72b5b..c883b19
--- a/.travis.yml
+++ b/.travis.yml
@@@ -22,12 -22,11 +22,12 @@@ cache
  - $HOME/.m2
  install: echo NOOP Skipping pre-fetch of Maven dependencies
  jdk:
--  - openjdk8
++  - openjdk11
  before_script:
- unset _JAVA_OPTIONS
  env:
- BUILD_CMD="mvn clean verify javadoc:jar -DskipITs"  # main build of unit 
tests and javadoc
 -  - BUILD_CMD="mvn clean verify javadoc:jar -DskipITs -Dhadoop.profile=3"
 +  - BUILD_CMD="travis_wait 30 mvn clean verify -PskipQA,sec-bugs 
-Dspotbugs.skip=false -Dspotbugs.timeout=180"  # check for spotbugs+security
-   - BUILD_CMD="mvn clean compile -Dhadoop.version=3.0.3"  # quick compile to 
verify older API
++  - BUILD_CMD="mvn clean package -DskipTests -Dhadoop.version=3.0.3"  # quick 
compile to verify older API
  script:
- $BUILD_CMD



[accumulo] branch 1.9 updated: Update travis-ci configuration

2019-06-21 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
 new d7fccfd  Update travis-ci configuration
d7fccfd is described below

commit d7fccfda29ef55f352227ccc8288a754b609a253
Author: Christopher Tubbs 
AuthorDate: Fri Jun 21 04:16:45 2019 -0400

Update travis-ci configuration
---
 .travis.yml | 24 ++--
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b32d335..1b72b5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,25 +12,21 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+
+# requiring sudo forces Travis to build in an environment with more RAM
+sudo: required
 language: java
-notifications:
-  irc:
-channels:
-  - "chat.freenode.net#accumulo"
-use_notice: true
-on_success: change
-on_failure: always
-template:
-  - "%{result} %{repository_slug} %{branch} (%{build_url}): %{message}"
-# speed up builds; don't use with default install step
+# speed up builds; don't use cache with default install step
 cache:
   directories:
 - $HOME/.m2
 install: echo NOOP Skipping pre-fetch of Maven dependencies
 jdk:
-  - oraclejdk8
+  - openjdk8
+before_script:
+  - unset _JAVA_OPTIONS
 env:
-  - HADOOP_PROFILE=
-  - HADOOP_PROFILE=-Dhadoop.profile=3
+  - BUILD_CMD="mvn clean verify javadoc:jar -DskipITs"  # main build of unit 
tests and javadoc
+  - BUILD_CMD="mvn clean verify javadoc:jar -DskipITs -Dhadoop.profile=3"
 script:
-  - mvn clean verify javadoc:jar -DskipITs $HADOOP_PROFILE
+  - $BUILD_CMD



[accumulo] 01/01: Merge branch '2.0'

2019-06-21 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 309833ae2997d30a59024eef93e90013c0ca6188
Merge: 06c82a0 e0e9c47
Author: Christopher Tubbs 
AuthorDate: Fri Jun 21 04:20:45 2019 -0400

Merge branch '2.0'

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[accumulo] branch 2.0 updated (4160067 -> e0e9c47)

2019-06-21 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 4160067  Fix #1223 Correct recovery status on monitor
 new d7fccfd  Update travis-ci configuration
 new e0e9c47  Merge branch '1.9' into 2.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



[accumulo] branch master updated (06c82a0 -> 309833a)

2019-06-21 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 06c82a0  Merge branch '2.0'
 new d7fccfd  Update travis-ci configuration
 new e0e9c47  Merge branch '1.9' into 2.0
 new 309833a  Merge branch '2.0'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)