Skip to content

Commit 4c68401

Browse files
artem-vartem-v
authored
Cleanup dependencies (#101)
* Updated `scalecube-parent` to use jdk17. * Get rid of dependency on `slf4j`. * Bump `jackson` to `2.18.0`.
1 parent eb9218a commit 4c68401

File tree

11 files changed

+78
-74
lines changed

11 files changed

+78
-74
lines changed

‎.github/workflows/branch-ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@ jobs:
1414
name: Branch CI
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
18-
- uses: actions/cache@v1
17+
- uses: actions/checkout@v4
18+
- uses: actions/cache@v3
1919
with:
2020
path: ~/.m2/repository
2121
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2222
restore-keys: |
2323
${{ runner.os }}-maven-
24-
- name: Set up JDK 1.8
25-
uses: actions/setup-java@v1
24+
- name: Set up JDK
25+
uses: actions/setup-java@v4
2626
with:
27-
java-version: 1.8
27+
java-version: 17
28+
distribution: zulu
2829
server-id: github
2930
server-username: GITHUB_ACTOR
3031
server-password: GITHUB_TOKEN
3132
- name: Maven Build
32-
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -Ddockerfile.skip=true -B -V
33+
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
3334
env:
3435
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3536
- name: Maven Verify

‎.github/workflows/pre-release-ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ jobs:
99
name: Pre-release CI
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/cache@v1
12+
- uses: actions/checkout@v4
13+
- uses: actions/cache@v3
1414
with:
1515
path: ~/.m2/repository
1616
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
1717
restore-keys: |
1818
${{ runner.os }}-maven-
1919
- name: Set up Java for publishing to GitHub Packages
20-
uses: actions/setup-java@v1
20+
uses: actions/setup-java@v4
2121
with:
22-
java-version: 1.8
22+
java-version: 17
23+
distribution: zulu
2324
server-id: github
2425
server-username: GITHUB_ACTOR
2526
server-password: GITHUB_TOKEN
@@ -33,9 +34,10 @@ jobs:
3334
env:
3435
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3536
- name: Set up Java for publishing to Maven Central Repository
36-
uses: actions/setup-java@v1
37+
uses: actions/setup-java@v4
3738
with:
38-
java-version: 1.8
39+
java-version: 17
40+
distribution: zulu
3941
server-id: ossrh
4042
server-username: MAVEN_USERNAME
4143
server-password: MAVEN_PASSWORD

‎.github/workflows/release-ci.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@ jobs:
99
name: Release CI
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 0
1515
- run: git checkout ${{ github.event.release.target_commitish }}
16-
- uses: actions/cache@v1
16+
- uses: actions/cache@v3
1717
with:
1818
path: ~/.m2/repository
1919
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2020
restore-keys: |
2121
${{ runner.os }}-maven-
2222
- name: Set up Java for publishing to GitHub Packages
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@v4
2424
with:
25-
java-version: 1.8
25+
java-version: 17
26+
distribution: zulu
2627
server-id: github
2728
server-username: GITHUB_ACTOR
2829
server-password: GITHUB_TOKEN
2930
- name: Maven Build
30-
run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V
31+
run: mvn clean install -DskipTests=true -B -V
3132
env:
3233
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3334
- name: Maven Verify
@@ -41,17 +42,18 @@ jobs:
4142
run: |
4243
mvn -B build-helper:parse-version release:prepare \
4344
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
44-
-Darguments="-DskipTests=true -Ddockerfile.skip=true"
45+
-Darguments="-DskipTests=true"
4546
echo release_tag=$(git describe --tags --abbrev=0) >> $GITHUB_OUTPUT
4647
- name: Perform release
47-
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Ddockerfile.skip=true -Pdeploy2Github"
48+
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Pdeploy2Github"
4849
env:
4950
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5051
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
5152
- name: Set up Java for publishing to Maven Central Repository
52-
uses: actions/setup-java@v1
53+
uses: actions/setup-java@v4
5354
with:
54-
java-version: 1.8
55+
java-version: 17
56+
distribution: zulu
5557
server-id: ossrh
5658
server-username: MAVEN_USERNAME
5759
server-password: MAVEN_PASSWORD

‎checkstyle-suppressions.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
5+
"https://checkstyle.org/dtds/suppressions_1_0.dtd">
6+
7+
8+
<suppressions>
9+
<suppress checks="AbbreviationAsWordInName" files=".*"/>
10+
<suppress checks="MissingJavadocTypeCheck" files=".*"/>
11+
<suppress checks="MissingJavadocMethodCheck" files=".*"/>
12+
<suppress checks="MissingSwitchDefault" files=".*"/>
13+
<suppress checks="VariableDeclarationUsageDistance" files=".*"/>
14+
</suppressions>

‎pom.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>io.scalecube</groupId>
79
<artifactId>scalecube-parent</artifactId>
8-
<version>0.2.20</version>
10+
<version>0.3.1</version>
911
</parent>
1012

1113
<artifactId>scalecube-security-parent</artifactId>
@@ -41,17 +43,18 @@
4143
<properties>
4244
<reactor.version>2020.0.32</reactor.version>
4345
<vault-java-driver.version>5.1.0</vault-java-driver.version>
44-
<jackson.version>2.15.1</jackson.version>
45-
<slf4j.version>2.0.7</slf4j.version>
46+
<jackson.version>2.18.0</jackson.version>
4647
<jjwt.version>0.11.2</jjwt.version>
4748

4849
<mockito-junit.version>4.6.1</mockito-junit.version>
4950
<junit-jupiter.version>5.8.2</junit-jupiter.version>
5051
<hamcrest.version>1.3</hamcrest.version>
5152
<testcontainers.version>1.20.1</testcontainers.version>
53+
<slf4j.version>2.0.7</slf4j.version>
5254

5355
<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-security
5456
</distributionManagement.url>
57+
<checkstyle.suppressions.location>checkstyle-suppressions.xml</checkstyle.suppressions.location>
5558
</properties>
5659

5760
<dependencyManagement>

‎tokens/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<groupId>io.jsonwebtoken</groupId>
2828
<artifactId>jjwt-jackson</artifactId>
2929
</dependency>
30-
<dependency>
31-
<groupId>org.slf4j</groupId>
32-
<artifactId>slf4j-api</artifactId>
33-
</dependency>
3430
<!-- Tests -->
3531
<dependency>
3632
<groupId>org.testcontainers</groupId>

‎tokens/src/main/java/io/scalecube/security/tokens/jwt/JwksKeyProvider.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,12 @@
2020
import java.util.Base64;
2121
import java.util.Base64.Decoder;
2222
import java.util.Optional;
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
2523
import reactor.core.Exceptions;
2624
import reactor.core.publisher.Mono;
2725
import reactor.core.scheduler.Schedulers;
2826

2927
public final class JwksKeyProvider implements KeyProvider {
3028

31-
private static final Logger LOGGER = LoggerFactory.getLogger(JwksKeyProvider.class);
32-
3329
private static final ObjectMapper OBJECT_MAPPER = newObjectMapper();
3430

3531
private String jwksUri;
@@ -101,7 +97,6 @@ private JwkInfoList computeKeyList() throws IOException {
10197

10298
int responseCode = httpClient.getResponseCode();
10399
if (responseCode != 200) {
104-
LOGGER.error("[computeKey][{}] Not expected response code: {}", jwksUri, responseCode);
105100
throw new KeyProviderException("Not expected response code: " + responseCode);
106101
}
107102

@@ -112,7 +107,6 @@ private static JwkInfoList toKeyList(InputStream stream) {
112107
try (InputStream inputStream = new BufferedInputStream(stream)) {
113108
return OBJECT_MAPPER.readValue(inputStream, JwkInfoList.class);
114109
} catch (IOException e) {
115-
LOGGER.error("[toKeyList] Exception occurred: {}", e.toString());
116110
throw Exceptions.propagate(e);
117111
}
118112
}

‎tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package io.scalecube.security.tokens.jwt;
22

33
import io.scalecube.security.tokens.jwt.jsonwebtoken.JsonwebtokenParserFactory;
4+
import java.lang.System.Logger;
5+
import java.lang.System.Logger.Level;
46
import java.security.Key;
57
import java.time.Duration;
68
import java.util.Map;
79
import java.util.Objects;
810
import java.util.concurrent.ConcurrentHashMap;
911
import java.util.concurrent.TimeUnit;
1012
import java.util.concurrent.atomic.AtomicReference;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
1313
import reactor.core.publisher.Mono;
1414
import reactor.core.scheduler.Scheduler;
1515
import reactor.core.scheduler.Schedulers;
1616

1717
public final class JwtTokenResolverImpl implements JwtTokenResolver {
1818

19-
private static final Logger LOGGER = LoggerFactory.getLogger(JwtTokenResolver.class);
19+
private static final Logger LOGGER = System.getLogger(JwtTokenResolver.class.getName());
2020

2121
private KeyProvider keyProvider;
2222
private JwtTokenParserFactory tokenParserFactory = new JsonwebtokenParserFactory();
@@ -100,7 +100,7 @@ public Mono<Map<String, Object>> resolve(String token) {
100100
String kid = (String) header.get("kid");
101101
Objects.requireNonNull(kid, "kid is missing");
102102

103-
LOGGER.debug("[resolveToken][kid:{}] Resolving token {}", kid, mask(token));
103+
LOGGER.log(Level.DEBUG, "[resolveToken][kid:{0}] Resolving token {1}", kid, mask(token));
104104

105105
// workaround to remove safely on errors
106106
AtomicReference<Mono<Key>> computedValueHolder = new AtomicReference<>();
@@ -110,13 +110,19 @@ public Mono<Map<String, Object>> resolve(String token) {
110110
.doOnError(throwable -> cleanup(kid, computedValueHolder))
111111
.doOnError(
112112
throwable ->
113-
LOGGER.error(
114-
"[resolveToken][kid:{}][{}] Exception occurred: {}",
113+
LOGGER.log(
114+
Level.ERROR,
115+
"[resolveToken][kid:{0}][{1}] Exception occurred: {2}",
115116
kid,
116117
mask(token),
117118
throwable.toString()))
118119
.doOnSuccess(
119-
s -> LOGGER.debug("[resolveToken][kid:{}] Resolved token {}", kid, mask(token)));
120+
s ->
121+
LOGGER.log(
122+
Level.DEBUG,
123+
"[resolveToken][kid:{0}] Resolved token {1}",
124+
kid,
125+
mask(token)));
120126
});
121127
}
122128

‎vault/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>com.bettercloud</groupId>
1818
<artifactId>vault-java-driver</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>org.slf4j</groupId>
22-
<artifactId>slf4j-api</artifactId>
23-
</dependency>
2420
<dependency>
2521
<groupId>com.fasterxml.jackson.dataformat</groupId>
2622
<artifactId>jackson-dataformat-yaml</artifactId>

‎vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import java.io.IOException;
1414
import java.io.InputStream;
1515
import java.io.StringReader;
16+
import java.lang.System.Logger;
17+
import java.lang.System.Logger.Level;
1618
import java.util.Arrays;
1719
import java.util.Base64;
1820
import java.util.Collections;
@@ -21,12 +23,10 @@
2123
import java.util.StringJoiner;
2224
import java.util.function.Function;
2325
import java.util.function.Supplier;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
2626

2727
public class VaultServiceRolesInstaller {
2828

29-
private static final Logger LOGGER = LoggerFactory.getLogger(VaultServiceRolesInstaller.class);
29+
private static final Logger LOGGER = System.getLogger(VaultServiceRolesInstaller.class.getName());
3030

3131
private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
3232

@@ -58,23 +58,19 @@ private VaultServiceRolesInstaller(Builder builder) {
5858
this.roleTtl = builder.roleTtl;
5959
}
6060

61-
public static Builder builder() {
62-
return new Builder();
63-
}
64-
6561
/**
6662
* Builds vault oidc micro-infrastructure (identity roles and keys) to use it for
6763
* machine-to-machine authentication.
6864
*/
6965
public void install() {
7066
if (isNullOrNoneOrEmpty(vaultAddress)) {
71-
LOGGER.debug("Skipping serviceRoles installation, vaultAddress not set");
67+
LOGGER.log(Level.DEBUG, "Skipping serviceRoles installation, vaultAddress not set");
7268
return;
7369
}
7470

7571
final ServiceRoles serviceRoles = loadServiceRoles();
7672
if (serviceRoles == null || serviceRoles.roles.isEmpty()) {
77-
LOGGER.debug("Skipping serviceRoles installation, serviceRoles not set");
73+
LOGGER.log(Level.DEBUG, "Skipping serviceRoles installation, serviceRoles not set");
7874
return;
7975
}
8076

@@ -90,7 +86,7 @@ public void install() {
9086
rest.url(buildVaultIdentityRoleUri(roleName)), keyName, roleName, role.permissions);
9187
}
9288

93-
LOGGER.debug("Installed serviceRoles ({})", serviceRoles);
89+
LOGGER.log(Level.DEBUG, "Installed serviceRoles ({0})", serviceRoles);
9490
}
9591

9692
private ServiceRoles loadServiceRoles() {
@@ -108,15 +104,14 @@ private ServiceRoles loadServiceRoles() {
108104
return null;
109105
}
110106

111-
private static void verifyOk(int status, String operation) {
107+
private static void verifyOk(int status) {
112108
if (status != 200 && status != 204) {
113-
LOGGER.error("Not expected status ({}) returned on [{}]", status, operation);
114109
throw new IllegalStateException("Not expected status returned, status=" + status);
115110
}
116111
}
117112

118113
private void createVaultIdentityKey(Rest rest, String keyName) {
119-
LOGGER.debug("[createVaultIdentityKey] {}", keyName);
114+
LOGGER.log(Level.DEBUG, "[createVaultIdentityKey] {0}", keyName);
120115

121116
byte[] body =
122117
Json.object()
@@ -128,15 +123,15 @@ private void createVaultIdentityKey(Rest rest, String keyName) {
128123
.getBytes();
129124

130125
try {
131-
verifyOk(rest.body(body).post().getStatus(), "createVaultIdentityKey");
126+
verifyOk(rest.body(body).post().getStatus());
132127
} catch (RestException e) {
133128
throw new RuntimeException(e);
134129
}
135130
}
136131

137132
private void createVaultIdentityRole(
138133
Rest rest, String keyName, String roleName, List<String> permissions) {
139-
LOGGER.debug("[createVaultIdentityRole] {}", roleName);
134+
LOGGER.log(Level.DEBUG, "[createVaultIdentityRole] {0}", roleName);
140135

141136
byte[] body =
142137
Json.object()
@@ -147,7 +142,7 @@ private void createVaultIdentityRole(
147142
.getBytes();
148143

149144
try {
150-
verifyOk(rest.body(body).post().getStatus(), "createVaultIdentityRole");
145+
verifyOk(rest.body(body).post().getStatus());
151146
} catch (RestException e) {
152147
throw new RuntimeException(e);
153148
}
@@ -352,7 +347,7 @@ public static class Builder {
352347
private String keyVerificationTtl = "1h";
353348
private String roleTtl = "1m";
354349

355-
private Builder() {}
350+
public Builder() {}
356351

357352
public Builder vaultAddress(String vaultAddress) {
358353
this.vaultAddress = vaultAddress;

0 commit comments

Comments
 (0)