merge main into hive-3.x

sivaponting · May 4, 2021 · 9f3839a · 9f3839a
1 parent 6da7c42
commit 9f3839a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,6 +1,10 @@
 name: Java CI
 
-on: [push, pull_request]
+on: 
+  pull_request:
+  push:
+    branches: 
+      - main
 
 jobs:
   test:
@@ -10,10 +14,22 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    - name: Init Coveralls
+      shell: bash
+      run: |
+          COVERALLS_TOKEN=${{ secrets.COVERALLS_REPO_TOKEN }}
+          if [[ -z "${COVERALLS_TOKEN}" ]];
+          then
+             echo "Coveralls token not available"
+             COVERALLS_SKIP=true
+          else
+             echo "Coveralls token available"
+             COVERALLS_SKIP=false
+          fi
+          echo "COVERALLS_SKIP=${COVERALLS_SKIP}" >> $GITHUB_ENV        
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
         java-version: 8
     - name: Run Maven Targets
-      run: mvn package jacoco:report coveralls:report --batch-mode --show-version --no-transfer-progress --activate-profiles coveralls -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }}
-
+       run: mvn package jacoco:report coveralls:report --batch-mode --show-version --activate-profiles coveralls -Dcoveralls.skip=$COVERALLS_SKIP -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [3.9.5] - TBD
+### Changed
+* `commons-io` updated to `2.7.` (was `2.6`).
+
 ## [3.9.4] - 2021-04-08
 ### Fixed
 * Support for '.' wildcards in database pattern calls. See [#216](https://github.com/HotelsDotCom/waggle-dance/issues/216)

diff --git a/README.md b/README.md
@@ -5,7 +5,10 @@
 You can obtain Waggle Dance from Maven Central:
 
 [![Maven Central TGZ](https://maven-badges.herokuapp.com/maven-central/com.hotels/waggle-dance/badge.svg?subject=com.hotels:waggle-dance-bin.tgz)](https://maven-badges.herokuapp.com/maven-central/com.hotels/waggle-dance)
-[![Maven Central RPM](https://maven-badges.herokuapp.com/maven-central/com.hotels/waggle-dance-rpm/badge.svg?subject=com.hotels:waggle-dance.rpm)](https://maven-badges.herokuapp.com/maven-central/com.hotels/waggle-dance-rpm)  [![Build Status](https://travis-ci.org/HotelsDotCom/waggle-dance.svg?branch=main)](https://travis-ci.org/HotelsDotCom/waggle-dance) ![Java CI](https://github.com/HotelsDotCom/waggle-dance/workflows/Java%20CI/badge.svg?event=push) [![Coverage Status](https://coveralls.io/repos/github/HotelsDotCom/waggle-dance/badge.svg?branch=main)](https://coveralls.io/github/HotelsDotCom/waggle-dance?branch=main) ![GitHub license](https://img.shields.io/github/license/HotelsDotCom/waggle-dance.svg)
+[![Maven Central RPM](https://maven-badges.herokuapp.com/maven-central/com.hotels/waggle-dance-rpm/badge.svg?subject=com.hotels:waggle-dance.rpm)](https://maven-badges.herokuapp.com/maven-central/com.hotels/waggle-dance-rpm) 
+![Build](https://github.com/HotelsDotCom/waggle-dance/workflows/Java%20CI/badge.svg?event=push) 
+[![Coverage Status](https://coveralls.io/repos/github/HotelsDotCom/waggle-dance/badge.svg?branch=main)](https://coveralls.io/github/HotelsDotCom/waggle-dance?branch=main) 
+![GitHub license](https://img.shields.io/github/license/HotelsDotCom/waggle-dance.svg)
 
 ## Overview
 

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.6</version>
+        <version>2.7</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>