Skip to content

Commit 89f7095

Browse files
committed
Merge branch 'develop'
2 parents eca93ad + 1169a4b commit 89f7095

File tree

18 files changed

+675
-141
lines changed

18 files changed

+675
-141
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
version: 2
22
updates:
3-
- package-ecosystem: maven
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "04:00"
8-
open-pull-requests-limit: 10
3+
- package-ecosystem: maven
4+
target-branch: "develop"
5+
directory: "/"
6+
schedule:
7+
interval: daily
8+
time: "04:00"
9+
open-pull-requests-limit: 10
10+
- package-ecosystem: "github-actions"
11+
target-branch: "develop"
12+
directory: "/"
13+
schedule:
14+
interval: "daily"

.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@v2
38+
uses: actions/checkout@v3
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v1
42+
uses: github/codeql-action/init@v2
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@v1
53+
uses: github/codeql-action/autobuild@v2
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@v1
67+
uses: github/codeql-action/analyze@v2

.github/workflows/java8-maven.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on: [ push, pull_request ]
44

55
jobs:
66
build-and-test-job:
7+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
78
strategy:
89
fail-fast: false
910
matrix:
@@ -21,13 +22,13 @@ jobs:
2122

2223
steps:
2324
- name: Checkout source code
24-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2526
with:
2627
submodules: true
2728
fetch-depth: 0
2829

2930
- name: Setup Java
30-
uses: actions/setup-java@v2
31+
uses: actions/setup-java@v3
3132
with:
3233
distribution: 'temurin'
3334
java-version: ${{ matrix.java }}
@@ -36,7 +37,7 @@ jobs:
3637
- name: Build and (headless) test with Maven
3738
uses: GabrielBB/xvfb-action@v1
3839
with:
39-
run: mvn -B -ntp package
40+
run: mvn -U -B -ntp package
4041

4142
snapshot-job:
4243
needs: build-and-test-job
@@ -51,13 +52,13 @@ jobs:
5152

5253
steps:
5354
- name: Checkout source code
54-
uses: actions/checkout@v2
55+
uses: actions/checkout@v3
5556
with:
5657
submodules: true
5758
fetch-depth: 0
5859

5960
- name: Setup Java
60-
uses: actions/setup-java@v2
61+
uses: actions/setup-java@v3
6162
with:
6263
distribution: 'temurin'
6364
java-version: ${{ matrix.java }}
@@ -71,6 +72,14 @@ jobs:
7172
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
7273
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
7374

75+
- name: Dryrun release assets with Maven
76+
run: mvn -B -ntp install -DskipTests=true -P full-release -Djreleaser.dry.run=true
77+
env:
78+
JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
79+
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
80+
JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
81+
JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
82+
7483
release-job:
7584
needs: build-and-test-job
7685
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
@@ -84,13 +93,13 @@ jobs:
8493

8594
steps:
8695
- name: Checkout source code
87-
uses: actions/checkout@v2
96+
uses: actions/checkout@v3
8897
with:
8998
submodules: true
9099
fetch-depth: 0
91100

92101
- name: Setup Java
93-
uses: actions/setup-java@v2
102+
uses: actions/setup-java@v3
94103
with:
95104
distribution: 'temurin'
96105
java-version: ${{ matrix.java }}
@@ -106,18 +115,10 @@ jobs:
106115
# Fix https://issues.sonatype.org/browse/OSSRH-66257
107116
MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
108117

109-
- name: Build assets with Maven
110-
run: mvn -B -ntp install -DskipTests=true -P base-deploy
111-
env:
112-
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
113-
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
114-
115-
- name: Create dummy file if no assets
116-
run: test -d "binaries" || (mkdir binaries && echo "no assets" > binaries/no_assets.txt)
117-
118-
- name: Create draft release and upload assets
119-
uses: xresloader/upload-to-github-release@v1
118+
- name: Release assets with Maven
119+
run: mvn -B -ntp install -DskipTests=true -P full-release
120120
env:
121-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122-
with:
123-
file: 'binaries/*'
121+
JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
122+
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
123+
JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
124+
JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
66
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [Unreleased]
9+
10+
## [0.0.20] - 2022-10-28
11+
12+
### Added
13+
14+
- Add `MediaType` object to handle Internet Media Type (aka MIME Type or Content Type)
15+
- Add convenient methods to supply resources in Picocsv
16+
17+
### Fixed
18+
19+
- Fix dependency inheritance in BOM
20+
821
## [0.0.19] - 2022-03-18
922

1023
### Added
@@ -173,7 +186,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
173186

174187
- Initial release
175188

176-
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.19...HEAD
189+
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.20...HEAD
190+
[0.0.20]: https://github.com/nbbrd/java-io-util/compare/v0.0.19...v0.0.20
177191
[0.0.19]: https://github.com/nbbrd/java-io-util/compare/v0.0.18...v0.0.19
178192
[0.0.18]: https://github.com/nbbrd/java-io-util/compare/v0.0.17...v0.0.18
179193
[0.0.17]: https://github.com/nbbrd/java-io-util/compare/v0.0.16...v0.0.17

README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,28 @@
22

33
This library contains common code used for I/O operations in Java.
44
While not being rocket science, its purpose is to be useful, well documented and well tested.
5+
6+
## Dependency graph
7+
8+
```mermaid
9+
flowchart BT
10+
11+
x-jaxb{{javax.xml.bind:jaxb-api}}
12+
x-picocsv{{<a href='https://github.com/nbbrd/picocsv'>com.github.nbbrd.picocsv:picocsv}}
13+
14+
base
15+
xml
16+
xml-bind
17+
picocsv
18+
win
19+
20+
xml --> base
21+
xml-bind --> xml
22+
xml-bind -.-> x-jaxb
23+
win --> base
24+
picocsv --> base
25+
picocsv -.-> x-picocsv
26+
27+
classDef x fill:#00000000,stroke:#00000000,font-style:italic
28+
class x-jaxb,x-picocsv x
29+
```

java-io-base/pom.xml

Lines changed: 1 addition & 1 deletion
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.19</version>
8+
<version>0.0.20</version>
99
</parent>
1010

1111
<artifactId>java-io-base</artifactId>

java-io-base/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
exports nbbrd.io;
2525
exports nbbrd.io.function;
26+
exports nbbrd.io.net;
2627
exports nbbrd.io.sys;
2728
exports nbbrd.io.text;
2829
exports nbbrd.io.zip;

0 commit comments

Comments
 (0)