Skip to content

Commit 52568e4

Browse files
committed
Merge branch 'develop'
2 parents 20648ea + 4eaed0b commit 52568e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+380
-306
lines changed

.github/workflows/check-links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout source code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
submodules: true
2626
fetch-depth: 0
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Check links
3636
id: lychee
37-
uses: lycheeverse/lychee-action@v2.4.0
37+
uses: lycheeverse/lychee-action@v2.7.0
3838
with:
3939
fail: true
4040
args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535

3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v3
42+
uses: github/codeql-action/init@v4
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v3
53+
uses: github/codeql-action/autobuild@v4
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v3
67+
uses: github/codeql-action/analyze@v4

.github/workflows/heylogs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout and Setup Maven
14-
uses: s4u/setup-maven-action@v1.18.0
14+
uses: s4u/setup-maven-action@v1.19.0
1515

1616
- name: Scan changelog
17-
run: mvn -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.output.file=scan.json -Dheylogs.format.id=json
17+
run: mvn -U com.github.nbbrd.heylogs:heylogs-maven-plugin::scan -Dheylogs.outputFile=scan.json
1818

1919
- name: Create badges endpoint json
2020
run: |

.github/workflows/java-ea-maven.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
java: [ 24 ]
17+
java: [ 25 ]
1818
os:
1919
- ubuntu-latest # Linux x64
2020
- ubuntu-24.04-arm # Linux arm64
2121
- macos-latest # macOS arm64
22-
include:
23-
- os: windows-11-arm # Windows arm64
24-
java: 21
22+
- windows-11-arm # Windows arm64
2523

2624
name: JDK${{ matrix.java }} on ${{ matrix.os }}
2725
runs-on: ${{ matrix.os }}
2826

2927
steps:
3028
- name: Checkout and Setup Maven
31-
uses: s4u/setup-maven-action@v1.18.0
29+
uses: s4u/setup-maven-action@v1.19.0
3230
with:
3331
checkout-submodules: true
3432
checkout-fetch-depth: 0

.github/workflows/java8-maven.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
java: [ 8, 21 ]
15-
os: [ ubuntu-latest, macos-13, windows-latest ]
14+
java: [ 17, 21 ]
15+
os: [ ubuntu-latest, macos-15-intel, windows-latest ]
1616

1717
name: JDK${{ matrix.java }} on ${{ matrix.os }}
1818
runs-on: ${{ matrix.os }}
1919

2020
steps:
2121
- name: Checkout source code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
with:
2424
submodules: true
2525
fetch-depth: 0
2626

2727
- name: Setup Java
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
distribution: 'zulu'
3131
java-version: ${{ matrix.java }}
@@ -80,13 +80,13 @@ jobs:
8080

8181
steps:
8282
- name: Checkout source code
83-
uses: actions/checkout@v4
83+
uses: actions/checkout@v5
8484
with:
8585
submodules: true
8686
fetch-depth: 0
8787

8888
- name: Setup Java
89-
uses: actions/setup-java@v4
89+
uses: actions/setup-java@v5
9090
with:
9191
distribution: 'zulu'
9292
java-version: ${{ matrix.java }}
@@ -95,8 +95,8 @@ jobs:
9595
- name: Deploy snapshot with Maven if settings defined
9696
run: test ! -f ci.settings.xml || mvn deploy -DskipTests -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
9797
env:
98-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
99-
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
98+
CENTRAL_PORTAL_USERNAME: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
99+
CENTRAL_PORTAL_TOKEN: ${{ secrets.CENTRAL_PORTAL_TOKEN }}
100100
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
101101
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
102102

@@ -110,7 +110,7 @@ jobs:
110110

111111
- name: Upload JReleaser output
112112
if: always()
113-
uses: actions/upload-artifact@v4
113+
uses: actions/upload-artifact@v5
114114
with:
115115
name: assets-snapshot-log
116116
path: |
@@ -130,13 +130,13 @@ jobs:
130130

131131
steps:
132132
- name: Checkout source code
133-
uses: actions/checkout@v4
133+
uses: actions/checkout@v5
134134
with:
135135
submodules: true
136136
fetch-depth: 0
137137

138138
- name: Setup Java
139-
uses: actions/setup-java@v4
139+
uses: actions/setup-java@v5
140140
with:
141141
distribution: 'zulu'
142142
java-version: ${{ matrix.java }}
@@ -145,8 +145,8 @@ jobs:
145145
- name: Deploy with Maven if settings defined
146146
run: test ! -f ci.settings.xml || mvn deploy -DskipTests -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
147147
env:
148-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
149-
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
148+
CENTRAL_PORTAL_USERNAME: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
149+
CENTRAL_PORTAL_TOKEN: ${{ secrets.CENTRAL_PORTAL_TOKEN }}
150150
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
151151
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
152152
# Fix https://issues.sonatype.org/browse/OSSRH-66257
@@ -162,7 +162,7 @@ jobs:
162162

163163
- name: Upload JReleaser output
164164
if: always()
165-
uses: actions/upload-artifact@v4
165+
uses: actions/upload-artifact@v5
166166
with:
167167
name: assets-release-log
168168
path: |

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
99

10+
## [0.0.35] - 2025-11-07
11+
12+
### Added
13+
14+
- Add support for Bearer authentication scheme in HttpClient
15+
16+
### Fixed
17+
18+
- Fix authentication errors in HttpClient
19+
20+
### Changed
21+
22+
- Migrate OSSRH to Central Portal
23+
- Remove preemptiveAuth option in HttpContext
24+
1025
## [0.0.34] - 2025-05-08
1126

1227
### Added
@@ -303,7 +318,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
303318

304319
- Initial release
305320

306-
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.34...HEAD
321+
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.35...HEAD
322+
[0.0.35]: https://github.com/nbbrd/java-io-util/compare/v0.0.34...v0.0.35
307323
[0.0.34]: https://github.com/nbbrd/java-io-util/compare/v0.0.33...v0.0.34
308324
[0.0.33]: https://github.com/nbbrd/java-io-util/compare/v0.0.32...v0.0.33
309325
[0.0.32]: https://github.com/nbbrd/java-io-util/compare/v0.0.31...v0.0.32

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![Download](https://img.shields.io/github/release/nbbrd/java-io-util.svg)](https://github.com/nbbrd/java-io-util/releases/latest)
44
[![Changes](https://img.shields.io/endpoint?url=https%3A%2F%2Fraw.githubusercontent.com%2Fnbbrd%2Fjava-io-util%2Fbadges%2Funreleased-changes.json)](https://github.com/nbbrd/java-io-util/blob/develop/CHANGELOG.md)
5+
[![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/com/github/nbbrd/java-io-util/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/com/github/nbbrd/java-io-util/README.md)
56

67
This library contains common code used for I/O operations in Java.
78
While not being rocket science, its purpose is to be useful, well documented and well tested.
@@ -29,4 +30,4 @@ flowchart BT
2930
3031
classDef x fill:#00000000,stroke:#00000000,font-style:italic
3132
class x-jaxb,x-picocsv x
32-
```
33+
```

ci.settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
33
<servers>
44
<server>
5-
<id>ossrh</id>
6-
<username>${env.OSSRH_USERNAME}</username>
7-
<password>${env.OSSRH_TOKEN}</password>
5+
<id>central</id>
6+
<username>${env.CENTRAL_PORTAL_USERNAME}</username>
7+
<password>${env.CENTRAL_PORTAL_TOKEN}</password>
88
</server>
99
</servers>
1010
</settings>

java-io-base/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.github.nbbrd.java-io-util</groupId>
77
<artifactId>java-io-parent</artifactId>
8-
<version>0.0.34</version>
8+
<version>0.0.35</version>
99
</parent>
1010

1111
<artifactId>java-io-base</artifactId>
@@ -18,8 +18,8 @@
1818
<dependencies>
1919
<!-- annotations & processors -->
2020
<dependency>
21-
<groupId>org.checkerframework</groupId>
22-
<artifactId>checker-qual</artifactId>
21+
<groupId>org.jspecify</groupId>
22+
<artifactId>jspecify</artifactId>
2323
<scope>provided</scope>
2424
</dependency>
2525
<dependency>

java-io-base/src/main/java/internal/io/IOIterators.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import nbbrd.io.function.IOPredicate;
2323
import nbbrd.io.function.IOSupplier;
2424
import nbbrd.io.function.IOUnaryOperator;
25-
import org.checkerframework.checker.nullness.qual.Nullable;
25+
import org.jspecify.annotations.Nullable;
2626

2727
import java.io.IOException;
2828
import java.io.UncheckedIOException;

0 commit comments

Comments
 (0)