Merge branch 'master' into snyk-upgrade-1be466e45a71e5aa7e9f374f6bc6c65b

Author: sazzad16

.circleci.settings.xml

@@ -3,8 +3,8 @@
   <servers>
     <server>
       <id>ossrh</id>
-      <username>${env.OSSRH_USERNAME}</username>
-      <password>${env.OSSRH_PASSWORD}</password>
+      <username>${env.OSSH_USERNAME}</username>
+      <password>${env.OSSH_PASSWORD}</password>
     </server>
     <server>
       <id>gpg.passphrase</id>

.circleci/config.yml

@@ -38,9 +38,9 @@ jobs:
       # run tests!
       - run: mvn integration-test
       - run: mvn cobertura:cobertura
-      - run: bash <(curl -s https://codecov.io/bash) -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 deploy
+      - run: mvn -s .circleci.settings.xml -DskipTests -Dgpg.skip deploy
 
 workflows:
   version: 2

.github/release-drafter-config.yml

@@ -1,7 +1,7 @@
-name-template: 'Version $NEXT_PATCH_VERSION🌈'
+name-template: 'Version $NEXT_PATCH_VERSION'
 tag-template: 'v$NEXT_PATCH_VERSION'
 categories:
-  - title: '🚀Features'
+  - title: 'Features'
     labels:
       - 'feature'
       - 'enhancement'
@@ -10,9 +10,9 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '🧰Maintenance'
+  - title: 'Maintenance'
     label: 'chore'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-template: '- $TITLE (#$NUMBER)'
 exclude-labels:
   - 'skip-changelog'
 template: |

.github/workflows/version-and-release.yml

@@ -0,0 +1,46 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: get version from tag
+        id: get_version
+        run: |
+          realversion="${GITHUB_REF/refs\/tags\//}"
+          realversion="${realversion//v/}"
+          echo "::set-output name=VERSION::$realversion"
+
+      - name: Set up publishing to maven central
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+
+      - name: mvn versions
+        run: mvn versions:set -DnewVersion=${{ steps.get_version.outputs.VERSION }}
+
+      - name: Install gpg key
+        run: |
+          cat <(echo -e "${{ secrets.OSSH_GPG_SECRET_KEY }}") | gpg --batch --import
+          gpg --list-secret-keys --keyid-format LONG
+
+      - name: Publish
+        run: |
+          mvn --no-transfer-progress \
+            --batch-mode \
+            -Dgpg.passphrase='${{ secrets.OSSH_GPG_SECRET_KEY_PASSWORD }}' \
+            -DskipTests deploy -P release
+        env:
+          MAVEN_USERNAME: ${{secrets.OSSH_USERNAME}}
+          MAVEN_PASSWORD: ${{secrets.OSSH_TOKEN}}

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.redislabs</groupId>
     <artifactId>jrejson</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    
+
     <name>JReJSON</name>
 	<description>Official client for ReJSON</description>
 	<url>https://oss.redislabs.com/rejson</url>
@@ -45,9 +45,9 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.test.source>8</maven.test.source>
-	<maven.test.target>8</maven.test.target>
+        <maven.test.target>8</maven.test.target>
         <gson.version>2.8.7</gson.version>
-        <jedis.version>3.6.0</jedis.version>
+        <jedis.version>3.6.3</jedis.version>
         <commons.pool2.version>2.10.0</commons.pool2.version>
     </properties>
 
@@ -159,7 +159,13 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
+						<version>3.0.1</version>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>