Skip to content

Commit c4aea67

Browse files
LucasMLKclaude
LucasMLK
and
claude
committed
Merge branch 'master' into develop
Resolve pom.xml conflicts by selecting latest versions for each dependency: - xdagj-crypto: 0.1.5 (develop) - lombok: 1.18.42 (master) - guava: 33.5.0-jre (master) - commons-lang3: 3.20.0 (develop) - commons-cli: 1.11.0 (develop) - snappy-java: 1.1.10.8 (master) - aws-dns: 2.39.5 (develop) - maven-assembly-plugin: 3.8.0 (develop) - maven-source-plugin: 3.4.0 (develop) - maven-javadoc-plugin: 3.12.0 (master) - central-publishing-plugin: 0.9.0 (master) - nexus-staging-plugin: 1.7.0 (master) - maven-gpg-plugin: 3.2.8 (master) - jacoco-maven-plugin: 0.8.14 (master) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2 parents 4e76716 + 1ab95f0 commit c4aea67

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828

2929
- name: Set up JDK ${{ matrix.java }}
30-
uses: actions/setup-java@v4
30+
uses: actions/setup-java@v5
3131
with:
3232
java-version: ${{ matrix.java }}
3333
distribution: 'temurin'
@@ -44,7 +44,7 @@ jobs:
4444
run: mvn clean test jacoco:report
4545

4646
- name: Upload test results
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v5
4848
if: always()
4949
with:
5050
name: test-results-${{ matrix.os }}-java${{ matrix.java }}-${{ github.run_number }}
@@ -54,7 +54,7 @@ jobs:
5454
retention-days: 30
5555

5656
- name: Upload coverage to Codecov
57-
uses: codecov/codecov-action@v4
57+
uses: codecov/codecov-action@v5
5858
if: matrix.os == 'ubuntu-latest' && matrix.java == '21'
5959
with:
6060
files: target/site/jacoco/jacoco.xml
@@ -71,10 +71,10 @@ jobs:
7171

7272
steps:
7373
- name: Checkout code
74-
uses: actions/checkout@v4
74+
uses: actions/checkout@v5
7575

7676
- name: Set up JDK 21
77-
uses: actions/setup-java@v4
77+
uses: actions/setup-java@v5
7878
with:
7979
java-version: '21'
8080
distribution: 'temurin'
@@ -90,7 +90,7 @@ jobs:
9090
run: mvn clean package -DskipTests
9191

9292
- name: Upload build artifacts
93-
uses: actions/upload-artifact@v4
93+
uses: actions/upload-artifact@v5
9494
with:
9595
name: ${{ steps.project.outputs.ARTIFACT_ID }}-${{ steps.project.outputs.VERSION }}-build${{ github.run_number }}
9696
path: |
@@ -110,12 +110,12 @@ jobs:
110110

111111
steps:
112112
- name: Checkout code
113-
uses: actions/checkout@v4
113+
uses: actions/checkout@v5
114114
with:
115115
fetch-depth: 0
116116

117117
- name: Set up JDK 21
118-
uses: actions/setup-java@v4
118+
uses: actions/setup-java@v5
119119
with:
120120
java-version: '21'
121121
distribution: 'temurin'

‎.github/workflows/quality.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717

1818
- name: Set up JDK 21
19-
uses: actions/setup-java@v4
19+
uses: actions/setup-java@v5
2020
with:
2121
java-version: '21'
2222
distribution: 'temurin'
@@ -33,10 +33,10 @@ jobs:
3333

3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737

3838
- name: Set up JDK 21
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
java-version: '21'
4242
distribution: 'temurin'
@@ -61,12 +61,12 @@ jobs:
6161

6262
steps:
6363
- name: Checkout code
64-
uses: actions/checkout@v4
64+
uses: actions/checkout@v5
6565
with:
6666
fetch-depth: 0 # Full history for better analysis
6767

6868
- name: Set up JDK 21
69-
uses: actions/setup-java@v4
69+
uses: actions/setup-java@v5
7070
with:
7171
java-version: '21'
7272
distribution: 'temurin'
@@ -86,10 +86,10 @@ jobs:
8686

8787
steps:
8888
- name: Checkout code
89-
uses: actions/checkout@v4
89+
uses: actions/checkout@v5
9090

9191
- name: Set up JDK 21
92-
uses: actions/setup-java@v4
92+
uses: actions/setup-java@v5
9393
with:
9494
java-version: '21'
9595
distribution: 'temurin'

‎pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<xdagj-crypto.version>0.1.5</xdagj-crypto.version>
2424

2525
<!-- utils -->
26-
<lombok.version>1.18.38</lombok.version>
27-
<guava.version>33.4.8-jre</guava.version>
26+
<lombok.version>1.18.42</lombok.version>
27+
<guava.version>33.5.0-jre</guava.version>
2828
<commons-lang3.version>3.20.0</commons-lang3.version>
2929
<commons-cli.version>1.11.0</commons-cli.version>
30-
<snappy-java.version>1.1.10.7</snappy-java.version>
30+
<snappy-java.version>1.1.10.8</snappy-java.version>
3131

3232
<!-- network -->
33-
<netty.version>4.2.6.Final</netty.version>
33+
<netty.version>4.2.7.Final</netty.version>
3434

3535
<!-- dns -->
3636
<dnsjava.version>3.6.3</dnsjava.version>
@@ -40,22 +40,22 @@
4040
<slf4j.version>2.0.17</slf4j.version>
4141

4242
<!-- test -->
43-
<junit.version>5.12.2</junit.version>
44-
<mockito.version>5.14.2</mockito.version>
43+
<junit.version>6.0.0</junit.version>
44+
<mockito.version>5.20.0</mockito.version>
4545
<jmh.version>1.37</jmh.version>
4646

4747
<!-- maven plugin -->
48-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
49-
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
50-
<license-maven-plugin.version>4.6</license-maven-plugin.version>
48+
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
49+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
50+
<license-maven-plugin.version>5.0.0</license-maven-plugin.version>
5151
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
5252
<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
5353
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
54-
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
55-
<central-publishing-plugin.version>0.6.0</central-publishing-plugin.version>
56-
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version>
57-
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
58-
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
54+
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
55+
<central-publishing-plugin.version>0.9.0</central-publishing-plugin.version>
56+
<nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>
57+
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
58+
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
5959
</properties>
6060

6161
<organization>

0 commit comments

Comments
 (0)