update codecov action in workflow (#194)

* update codecov action in workflow
* update test dependency versions

.github/workflows/pull-requests.yml

@@ -24,3 +24,9 @@ jobs:
 
       - name: Step 4 - Build client
         run: ./scripts/build_client.sh
+
+      - name: Step 5 - Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true

.github/workflows/push-in-develop.yml

@@ -21,15 +21,21 @@ jobs:
       - name: Step 3 - Build & Test
         run: mvn clean verify -ntp
 
-      - name: Step 5 - Build client
+      - name: Step 4 - Build client
         run: ./scripts/build_client.sh
 
-      - name: Maven deploy snapshot
+      - name: Step 5 - Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
+
+      - name: Step 6 - Maven deploy snapshot
         run: ./scripts/mvn_deploy.sh
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           GPG_EXECUTABLE: gpg
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
+          GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}

README.md

@@ -1,4 +1,6 @@
-# secure-token-service [![Build Status](https://travis-ci.com/adorsys/secure-token-service.svg?branch=master)](https://travis-ci.com/adorsys/secure-token-service)
+[![codecov](https://codecov.io/gh/adorsys/secure-token-service/branch/develop/graph/badge.svg)](https://codecov.io/gh/adorsys/secure-token-service)
+
+# secure-token-service
 
 This an implementation of the secure token service as specified in the token exchange working draft https://tools.ietf.org/html/draft-ietf-oauth-token-exchange-08. 
 

pom.xml

@@ -57,14 +57,15 @@
         <jackson.version>2.15.1</jackson.version>
         <jackson-databind.version>2.15.1</jackson-databind.version>
         <keycloak.version>22.0.4</keycloak.version>
-        <surefire.version>3.0.0-M4</surefire.version>
-        <jacoco.version>0.8.8</jacoco.version>
+        <surefire.version>3.2.5</surefire.version>
+        <failsafe.version>3.2.5</failsafe.version>
+        <jacoco.version>0.8.12</jacoco.version>
         <testcontainers.version>1.19.7</testcontainers.version>
         <flyway.version>10.10.0</flyway.version>
         <postgres.version>42.7.3</postgres.version>
         <h2.version>2.2.224</h2.version>
-        <mockito.version>5.11.0</mockito.version>
-        <catch-exception.version>1.4.6</catch-exception.version>
+        <mockito.version>5.12.0</mockito.version>
+        <catch-exception.version>2.0</catch-exception.version>
         <nimbus-jose-jwt.version>9.37.3</nimbus-jose-jwt.version>
         <scmBranch/>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>

sts-secret-server/pom.xml

@@ -134,9 +134,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <!--https://stackoverflow.com/questions/49363222/maven-failsafe-plugin-surefirebooterforkexception-there-was-an-error-in-the-f-->
-                <version>2.22.0</version>
+                <version>${failsafe.version}</version>
                 <configuration>
-                    <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
                     <includes>
                         <include>**/*IT.java</include>
                     </includes>

sts-secret-server/src/test/java/de/adorsys/sts/secretserver/SecretServerApplicationTest.java

@@ -141,7 +141,7 @@ void shouldNotGetSecretForInvalidAccessToken() throws Exception {
                 "20qD2QfgDoA0CpOZCQzMe9WoIfo8L-g4099--XouFyMWRU8VyVsx_73ekNKPUmWvuNIxeF3PBk9KGs7ABUnv_6n8A-KqzYTyA4y0gU" +
                 "8E9mgIuWpDmQ2FROf1Gd-2it9k3tvr83k7N1dMvg";
 
-        catchException(client).exchangeToken("/secret-server/token-exchange", MOPED_CLIENT_AUDIENCE, invalidAccessToken);
+        catchException(() -> client.exchangeToken("/secret-server/token-exchange", MOPED_CLIENT_AUDIENCE, invalidAccessToken));
 
         Exception caughtException = caughtException();
 
@@ -153,7 +153,7 @@ void shouldNotGetSecretForInvalidAccessToken() throws Exception {
     void shouldNotGetSecretForFakeAccessToken() throws Exception {
         final String fakeAccessToken = "my fake access token";
 
-        catchException(client).exchangeToken("/secret-server/token-exchange", MOPED_CLIENT_AUDIENCE, fakeAccessToken);
+        catchException(() -> client.exchangeToken("/secret-server/token-exchange", MOPED_CLIENT_AUDIENCE, fakeAccessToken));
 
         Exception caughtException = caughtException();