Merge branch 'master' into snyk-upgrade-bd02b8abbbd23108883d3bb5095d1426

Author: gkorland

.circleci/config.yml

@@ -38,7 +38,7 @@ jobs:
       # run tests!
       - run: mvn integration-test
       - run: mvn cobertura:cobertura
-      - run: bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-action/master/codecov) -t ${CODECOV_TOKEN}
+      - run: bash <(curl -s https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov) -t ${CODECOV_TOKEN}
 
       - run: mvn -s .circleci.settings.xml -DskipTests -Dgpg.skip deploy
 

pom.xml

@@ -159,13 +159,13 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
-                        <configuration>
-                            <gpgArguments>
-                                <arg>--pinentry-mode</arg>
-                                <arg>loopback</arg>
-                            </gpgArguments>
-                        </configuration>
+						<version>3.0.1</version>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>