Skip to content

Commit adef579

Browse files
artem-vartem-v
authored
Merge pull request #99 from scalecube/update-checkstyle
- Updated jdk to 17 - Updated mvn plugins - Updated github workflows
2 parents 84d1a31 + d23435d commit adef579

File tree

4 files changed

+35
-37
lines changed

4 files changed

+35
-37
lines changed

‎.github/workflows/branch-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ 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
2828
server-id: github
2929
server-username: GITHUB_ACTOR
3030
server-password: GITHUB_TOKEN
3131
- name: Maven Build
32-
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -Ddockerfile.skip=true -B -V
32+
run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3535
- name: Maven Verify

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ 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
2323
server-id: github
2424
server-username: GITHUB_ACTOR
2525
server-password: GITHUB_TOKEN
@@ -33,9 +33,9 @@ jobs:
3333
env:
3434
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3535
- name: Set up Java for publishing to Maven Central Repository
36-
uses: actions/setup-java@v1
36+
uses: actions/setup-java@v4
3737
with:
38-
java-version: 1.8
38+
java-version: 17
3939
server-id: ossrh
4040
server-username: MAVEN_USERNAME
4141
server-password: MAVEN_PASSWORD

‎.github/workflows/release-ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ 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
2626
server-id: github
2727
server-username: GITHUB_ACTOR
2828
server-password: GITHUB_TOKEN
2929
- name: Maven Build
30-
run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V
30+
run: mvn clean install -DskipTests=true -B -V
3131
env:
3232
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }}
3333
- name: Maven Verify
@@ -41,17 +41,17 @@ jobs:
4141
run: |
4242
mvn -B build-helper:parse-version release:prepare \
4343
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
44-
-Darguments="-DskipTests=true -Ddockerfile.skip=true"
44+
-Darguments="-DskipTests=true"
4545
echo release_tag=$(git describe --tags --abbrev=0) >> $GITHUB_OUTPUT
4646
- name: Perform release
47-
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Ddockerfile.skip=true -Pdeploy2Github"
47+
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Pdeploy2Github"
4848
env:
4949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5050
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
5151
- name: Set up Java for publishing to Maven Central Repository
52-
uses: actions/setup-java@v1
52+
uses: actions/setup-java@v4
5353
with:
54-
java-version: 1.8
54+
java-version: 17
5555
server-id: ossrh
5656
server-username: MAVEN_USERNAME
5757
server-password: MAVEN_PASSWORD

‎pom.xml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444

4545
<properties>
4646
<!-- plugins versions -->
47-
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
48-
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
49-
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
50-
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
51-
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
52-
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
53-
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
54-
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
55-
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
56-
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
57-
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
58-
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
59-
<com.puppycrawl.tools.checkstyle-version>8.14</com.puppycrawl.tools.checkstyle-version>
47+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
48+
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
49+
<maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
50+
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
51+
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
52+
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
53+
<maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
54+
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
55+
<maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
56+
<versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
57+
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
58+
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
59+
<com.puppycrawl.tools.checkstyle-version>10.12.4</com.puppycrawl.tools.checkstyle-version>
6060

6161
<!-- check style configuration -->
6262
<checkstyle.skip>false</checkstyle.skip>
@@ -110,9 +110,7 @@
110110
<artifactId>maven-compiler-plugin</artifactId>
111111
<version>${maven-compiler-plugin.version}</version>
112112
<configuration>
113-
<source>1.8</source>
114-
<target>1.8</target>
115-
<optimize>true</optimize>
113+
<release>17</release>
116114
</configuration>
117115
</plugin>
118116
<plugin>

0 commit comments

Comments
 (0)