Skip to content

Commit a3d73a9

Browse files
charphicharphi
committed
Merge branch 'develop'
2 parents a99568d + 33cd2a4 commit a3d73a9

File tree

22 files changed

+1279
-29
lines changed

22 files changed

+1279
-29
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
cache: 'maven'
3333

3434
- name: Build and (headless) test with Maven
35-
uses: GabrielBB/xvfb-action@v1
35+
uses: smithki/xvfb-action@v1.1.2
3636
with:
3737
run: mvn -U -B -ntp package

‎.github/workflows/java8-maven.yml‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
cache: 'maven'
3030

3131
- name: Build and (headless) test with Maven
32-
uses: GabrielBB/xvfb-action@v1
32+
uses: smithki/xvfb-action@v1.1.2
3333
with:
3434
run: mvn -U -B -ntp package
3535

@@ -59,21 +59,30 @@ jobs:
5959
cache: 'maven'
6060

6161
- name: Deploy snapshot with Maven if settings defined
62-
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
62+
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
6363
env:
6464
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
6565
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
6666
SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
6767
SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
6868

6969
- name: Dryrun release assets with Maven
70-
run: mvn -B -ntp install -DskipTests=true -P full-release -Djreleaser.dry.run=true
70+
run: mvn -B -ntp install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser -Djreleaser.dry.run
7171
env:
7272
JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
7373
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
7474
JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
7575
JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
7676

77+
- name: Upload JReleaser output
78+
if: always()
79+
uses: actions/upload-artifact@v3
80+
with:
81+
name: assets-snapshot-log
82+
path: |
83+
out/jreleaser/trace.log
84+
out/jreleaser/output.properties
85+
7786
release-job:
7887
needs: build-and-test-job
7988
if: startsWith(github.repository, 'nbbrd/') && startsWith(github.ref, 'refs/tags/v')
@@ -100,7 +109,7 @@ jobs:
100109
cache: 'maven'
101110

102111
- name: Deploy with Maven if settings defined
103-
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
112+
run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
104113
env:
105114
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
106115
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -110,9 +119,18 @@ jobs:
110119
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"
111120

112121
- name: Release assets with Maven
113-
run: mvn -B -ntp install -DskipTests=true -P full-release
122+
run: mvn -B -ntp install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser
114123
env:
115124
JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
116125
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
117126
JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
118127
JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
128+
129+
- name: Upload JReleaser output
130+
if: always()
131+
uses: actions/upload-artifact@v3
132+
with:
133+
name: assets-release-log
134+
path: |
135+
out/jreleaser/trace.log
136+
out/jreleaser/output.properties

‎CHANGELOG.md‎

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

88
## [Unreleased]
99

10+
## [0.0.23] - 2023-06-09
11+
12+
### Added
13+
14+
- Add curl module
15+
1016
## [0.0.22] - 2023-05-09
1117

1218
### Fixed
@@ -202,7 +208,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
202208

203209
- Initial release
204210

205-
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.22...HEAD
211+
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.23...HEAD
212+
[0.0.23]: https://github.com/nbbrd/java-io-util/compare/v0.0.22...v0.0.23
206213
[0.0.22]: https://github.com/nbbrd/java-io-util/compare/v0.0.21...v0.0.22
207214
[0.0.21]: https://github.com/nbbrd/java-io-util/compare/v0.0.20...v0.0.21
208215
[0.0.20]: https://github.com/nbbrd/java-io-util/compare/v0.0.19...v0.0.20

‎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.22</version>
8+
<version>0.0.23</version>
99
</parent>
1010

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

‎java-io-bom/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>java-io-parent</artifactId>
99
<groupId>com.github.nbbrd.java-io-util</groupId>
10-
<version>0.0.22</version>
10+
<version>0.0.23</version>
1111
</parent>
1212

1313
<artifactId>java-io-bom</artifactId>
@@ -44,6 +44,11 @@
4444
<artifactId>java-io-xml-bind</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
47+
<dependency>
48+
<groupId>${project.groupId}</groupId>
49+
<artifactId>java-io-curl</artifactId>
50+
<version>${project.version}</version>
51+
</dependency>
4752
</dependencies>
4853
</dependencyManagement>
4954

@@ -52,7 +57,7 @@
5257
<plugin>
5358
<groupId>org.codehaus.mojo</groupId>
5459
<artifactId>flatten-maven-plugin</artifactId>
55-
<version>1.4.1</version>
60+
<version>1.5.0</version>
5661
<configuration>
5762
<flattenMode>bom</flattenMode>
5863
<outputDirectory>${project.build.directory}</outputDirectory>

‎java-io-curl/pom.xml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.github.nbbrd.java-io-util</groupId>
9+
<artifactId>java-io-parent</artifactId>
10+
<version>0.0.23</version>
11+
</parent>
12+
13+
<artifactId>java-io-curl</artifactId>
14+
<packaging>jar</packaging>
15+
16+
<name>java-io-curl</name>
17+
<description>Common IO utilities - curl</description>
18+
<url>https://github.com/nbbrd/java-io-util</url>
19+
20+
<dependencies>
21+
<!-- annotations & processors -->
22+
<dependency>
23+
<groupId>org.checkerframework</groupId>
24+
<artifactId>checker-qual</artifactId>
25+
<scope>provided</scope>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.projectlombok</groupId>
29+
<artifactId>lombok</artifactId>
30+
<scope>provided</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.github.nbbrd.java-design-util</groupId>
34+
<artifactId>java-design-processor</artifactId>
35+
<scope>provided</scope>
36+
</dependency>
37+
38+
<!-- compile & runtime -->
39+
<dependency>
40+
<groupId>${project.groupId}</groupId>
41+
<artifactId>java-io-base</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
44+
45+
<!-- test libraries -->
46+
<dependency>
47+
<groupId>org.junit.jupiter</groupId>
48+
<artifactId>junit-jupiter</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.assertj</groupId>
53+
<artifactId>assertj-core</artifactId>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.github.tomakehurst</groupId>
58+
<artifactId>wiremock-jre8-standalone</artifactId>
59+
<scope>test</scope>
60+
</dependency>
61+
</dependencies>
62+
</project>

‎java-io-curl/src/main/java/module-info.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright 2023 National Bank of Belgium
3+
*
4+
* Licensed under the EUPL, Version 1.1 or - as soon they will be approved
5+
* by the European Commission - subsequent versions of the EUPL (the "Licence");
6+
* You may not use this work except in compliance with the Licence.
7+
* You may obtain a copy of the Licence at:
8+
*
9+
* http://ec.europa.eu/idabc/eupl
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the Licence is distributed on an "AS IS" basis,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the Licence for the specific language governing permissions and
15+
* limitations under the Licence.
16+
*/
17+
18+
module nbbrd.io.curl {
19+
20+
requires static org.checkerframework.checker.qual;
21+
requires static lombok;
22+
requires static nbbrd.design;
23+
24+
requires nbbrd.io.base;
25+
26+
exports nbbrd.io.curl;
27+
}

0 commit comments

Comments
 (0)