Skip to content

Commit c6a5e8a

Browse files
artem-vartem-v
committed
Added compiler parameter "source 17"
1 parent 9eacb4e commit c6a5e8a

File tree

15 files changed

+155
-165
lines changed

15 files changed

+155
-165
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>

‎config-examples/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
35

46
<parent>
57
<groupId>io.scalecube</groupId>
@@ -16,6 +18,14 @@
1618
<artifactId>scalecube-config</artifactId>
1719
<version>${project.version}</version>
1820
</dependency>
21+
<dependency>
22+
<groupId>org.apache.logging.log4j</groupId>
23+
<artifactId>log4j-core</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>org.apache.logging.log4j</groupId>
27+
<artifactId>log4j-jpl</artifactId>
28+
</dependency>
1929
</dependencies>
2030

2131
</project>

‎config-vault/pom.xml‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -22,58 +22,6 @@
2222
<groupId>com.bettercloud</groupId>
2323
<artifactId>vault-java-driver</artifactId>
2424
</dependency>
25-
<!-- Test -->
26-
<dependency>
27-
<groupId>org.testcontainers</groupId>
28-
<artifactId>vault</artifactId>
29-
<scope>test</scope>
30-
</dependency>
31-
<dependency>
32-
<groupId>com.google.guava</groupId>
33-
<artifactId>guava</artifactId>
34-
<scope>test</scope>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.junit.jupiter</groupId>
38-
<artifactId>junit-jupiter-engine</artifactId>
39-
<version>${junit-jupiter.version}</version>
40-
<scope>test</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.junit.jupiter</groupId>
44-
<artifactId>junit-jupiter-params</artifactId>
45-
<version>${junit-jupiter.version}</version>
46-
<scope>test</scope>
47-
</dependency>
48-
<dependency>
49-
<groupId>org.mockito</groupId>
50-
<artifactId>mockito-junit-jupiter</artifactId>
51-
<version>${mockito-junit.version}</version>
52-
<scope>test</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.hamcrest</groupId>
56-
<artifactId>hamcrest-all</artifactId>
57-
<version>${hamcrest.version}</version>
58-
<scope>test</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.slf4j</groupId>
62-
<artifactId>jul-to-slf4j</artifactId>
63-
<scope>test</scope>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.apache.logging.log4j</groupId>
67-
<artifactId>log4j-slf4j-impl</artifactId>
68-
<version>${log4j.version}</version>
69-
<scope>test</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.apache.logging.log4j</groupId>
73-
<artifactId>log4j-core</artifactId>
74-
<version>${log4j.version}</version>
75-
<scope>test</scope>
76-
</dependency>
7725
</dependencies>
7826

7927
</project>

‎config-vault/src/test/java/io/scalecube/config/vault/VaultInstance.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import java.util.concurrent.atomic.AtomicInteger;
1818
import java.util.function.Predicate;
1919
import java.util.function.UnaryOperator;
20-
import org.slf4j.Logger;
21-
import org.slf4j.LoggerFactory;
2220
import org.testcontainers.DockerClientFactory;
2321
import org.testcontainers.containers.Container.ExecResult;
2422
import org.testcontainers.containers.ContainerLaunchException;
@@ -30,8 +28,6 @@
3028

3129
public class VaultInstance implements AutoCloseable {
3230

33-
private static final Logger LOGGER = LoggerFactory.getLogger(VaultInstance.class);
34-
3531
private static final String VAULT_IMAGE_NAME = "vault:1.6.1";
3632
private static final int VAULT_PORT = 8200;
3733
private static final AtomicInteger PORT_COUNTER = new AtomicInteger(VAULT_PORT);
@@ -115,10 +111,8 @@ public AuthResponse createToken(String... options) {
115111
}
116112

117113
public String execInContainer(String command) {
118-
LOGGER.debug("execInContainer command: {}", command);
119114
ExecResult execResult = invoke(() -> container.execInContainer("/bin/sh", "-c", command));
120115
assertEquals(0, execResult.getExitCode(), execResult.toString());
121-
LOGGER.debug("execInContainer result: {}", execResult.getStdout());
122116
return execResult.getStdout();
123117
}
124118

‎config/pom.xml‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,4 @@
1212

1313
<artifactId>scalecube-config</artifactId>
1414

15-
<dependencies>
16-
<!-- Test -->
17-
<dependency>
18-
<groupId>com.google.guava</groupId>
19-
<artifactId>guava</artifactId>
20-
<scope>test</scope>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.junit.jupiter</groupId>
24-
<artifactId>junit-jupiter-engine</artifactId>
25-
<version>${junit-jupiter.version}</version>
26-
<scope>test</scope>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.junit.jupiter</groupId>
30-
<artifactId>junit-jupiter-params</artifactId>
31-
<version>${junit-jupiter.version}</version>
32-
<scope>test</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.mockito</groupId>
36-
<artifactId>mockito-junit-jupiter</artifactId>
37-
<version>${mockito-junit.version}</version>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.hamcrest</groupId>
42-
<artifactId>hamcrest-all</artifactId>
43-
<version>${hamcrest.version}</version>
44-
<scope>test</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.apache.logging.log4j</groupId>
48-
<artifactId>log4j-core</artifactId>
49-
<scope>test</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.apache.logging.log4j</groupId>
53-
<artifactId>log4j-jpl</artifactId>
54-
<version>2.20.0</version>
55-
<scope>test</scope>
56-
</dependency>
57-
</dependencies>
58-
5915
</project>

‎config/src/main/java/io/scalecube/config/AbstractConfigProperty.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.scalecube.config;
22

33
import io.scalecube.config.source.LoadedConfigProperty;
4+
import java.lang.System.Logger;
5+
import java.lang.System.Logger.Level;
46
import java.util.Collection;
57
import java.util.List;
68
import java.util.Map;
@@ -10,8 +12,6 @@
1012
import java.util.function.BiConsumer;
1113
import java.util.function.Function;
1214
import java.util.function.Predicate;
13-
import java.util.logging.Level;
14-
import java.util.logging.Logger;
1515
import java.util.stream.Collectors;
1616

1717
/**
@@ -25,13 +25,10 @@
2525
*/
2626
abstract class AbstractConfigProperty<T> {
2727

28-
private static final Logger LOGGER = Logger.getLogger(AbstractConfigProperty.class.getName());
28+
private static final Logger LOGGER = System.getLogger(AbstractConfigProperty.class.getName());
2929

3030
private static final String ERROR_VALIDATION_FAILED =
31-
"Validation failed on config property: '%s', failed value: %s";
32-
private static final String INVOKE_CALLBACK_FAILED =
33-
"Exception occurred on "
34-
+ "property-change callback: %s, property name: '%s', oldValue: %s, newValue: %s";
31+
"Validation failed on config property: %s, failed value: %s";
3532

3633
final String name;
3734
final Class<?> propertyClass;
@@ -136,7 +133,15 @@ private void invokeCallback(BiConsumer<T, T> callback, T t1, T t2) {
136133
try {
137134
callback.accept(t1, t2);
138135
} catch (Exception e) {
139-
LOGGER.log(Level.SEVERE, String.format(INVOKE_CALLBACK_FAILED, callback, name, t1, t2), e);
136+
LOGGER.log(
137+
Level.ERROR,
138+
"Exception occurred on property-change callback: "
139+
+ "{0}, property name: {1}, oldValue: {2}, newValue: {3}",
140+
callback,
141+
name,
142+
t1,
143+
t2,
144+
e);
140145
}
141146
}
142147

0 commit comments

Comments
 (0)