Skip to content

Commit 42c4900

Browse files
charphicharphi
committed
Merge branch 'develop'
2 parents 43e2fa9 + c8da075 commit 42c4900

File tree

14 files changed

+521
-22
lines changed

14 files changed

+521
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ 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.18] - 2022-03-15
11+
12+
### Added
13+
14+
- Add picocsv module
15+
16+
### Fixed
17+
18+
- Fix compile-time dependencies convergence in BOM
19+
820
## [0.0.17] - 2022-02-04
921

1022
### Fixed
@@ -152,7 +164,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
152164

153165
- Initial release
154166

155-
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.17...HEAD
167+
[Unreleased]: https://github.com/nbbrd/java-io-util/compare/v0.0.18...HEAD
168+
[0.0.18]: https://github.com/nbbrd/java-io-util/compare/v0.0.17...v0.0.18
156169
[0.0.17]: https://github.com/nbbrd/java-io-util/compare/v0.0.16...v0.0.17
157170
[0.0.16]: https://github.com/nbbrd/java-io-util/compare/v0.0.15...v0.0.16
158171
[0.0.15]: https://github.com/nbbrd/java-io-util/compare/v0.0.14...v0.0.15

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
exports nbbrd.io.text;
2828
exports nbbrd.io.zip;
2929

30-
exports internal.io.text to nbbrd.io.xml, nbbrd.io.xml.bind;
30+
exports internal.io.text to nbbrd.io.xml, nbbrd.io.xml.bind, nbbrd.io.picocsv;
3131
}

‎java-io-base/src/test/java/_test/io/ResourceId.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,17 @@ public String copyToString(Charset encoding) throws IOException {
4848
}
4949
}
5050
}
51+
52+
public String copyByLineToString(Charset encoding, String separator) throws IOException {
53+
try (StringWriter writer = new StringWriter()) {
54+
try (BufferedReader reader = open(encoding)) {
55+
String line;
56+
while ((line = reader.readLine()) != null) {
57+
writer.write(line);
58+
writer.write(separator);
59+
}
60+
return writer.toString();
61+
}
62+
}
63+
}
5164
}

‎java-io-bom/pom.xml‎

Lines changed: 80 additions & 5 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.17</version>
10+
<version>0.0.18</version>
1111
</parent>
1212

1313
<artifactId>java-io-bom</artifactId>
@@ -20,24 +20,99 @@
2020
<dependencyManagement>
2121
<dependencies>
2222
<dependency>
23-
<groupId>com.github.nbbrd.java-io-util</groupId>
23+
<groupId>${project.groupId}</groupId>
2424
<artifactId>java-io-base</artifactId>
2525
<version>${project.version}</version>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>com.github.nbbrd.java-design-util</groupId>
29+
<artifactId>*</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>org.checkerframework</groupId>
33+
<artifactId>*</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>org.projectlombok</groupId>
37+
<artifactId>*</artifactId>
38+
</exclusion>
39+
</exclusions>
2640
</dependency>
2741
<dependency>
28-
<groupId>com.github.nbbrd.java-io-util</groupId>
42+
<groupId>${project.groupId}</groupId>
43+
<artifactId>java-io-picocsv</artifactId>
44+
<version>${project.version}</version>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>com.github.nbbrd.java-design-util</groupId>
48+
<artifactId>*</artifactId>
49+
</exclusion>
50+
<exclusion>
51+
<groupId>org.checkerframework</groupId>
52+
<artifactId>*</artifactId>
53+
</exclusion>
54+
<exclusion>
55+
<groupId>org.projectlombok</groupId>
56+
<artifactId>*</artifactId>
57+
</exclusion>
58+
</exclusions>
59+
</dependency>
60+
<dependency>
61+
<groupId>${project.groupId}</groupId>
2962
<artifactId>java-io-win</artifactId>
3063
<version>${project.version}</version>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>com.github.nbbrd.java-design-util</groupId>
67+
<artifactId>*</artifactId>
68+
</exclusion>
69+
<exclusion>
70+
<groupId>org.checkerframework</groupId>
71+
<artifactId>*</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>org.projectlombok</groupId>
75+
<artifactId>*</artifactId>
76+
</exclusion>
77+
</exclusions>
3178
</dependency>
3279
<dependency>
33-
<groupId>com.github.nbbrd.java-io-util</groupId>
80+
<groupId>${project.groupId}</groupId>
3481
<artifactId>java-io-xml</artifactId>
3582
<version>${project.version}</version>
83+
<exclusions>
84+
<exclusion>
85+
<groupId>com.github.nbbrd.java-design-util</groupId>
86+
<artifactId>*</artifactId>
87+
</exclusion>
88+
<exclusion>
89+
<groupId>org.checkerframework</groupId>
90+
<artifactId>*</artifactId>
91+
</exclusion>
92+
<exclusion>
93+
<groupId>org.projectlombok</groupId>
94+
<artifactId>*</artifactId>
95+
</exclusion>
96+
</exclusions>
3697
</dependency>
3798
<dependency>
38-
<groupId>com.github.nbbrd.java-io-util</groupId>
99+
<groupId>${project.groupId}</groupId>
39100
<artifactId>java-io-xml-bind</artifactId>
40101
<version>${project.version}</version>
102+
<exclusions>
103+
<exclusion>
104+
<groupId>com.github.nbbrd.java-design-util</groupId>
105+
<artifactId>*</artifactId>
106+
</exclusion>
107+
<exclusion>
108+
<groupId>org.checkerframework</groupId>
109+
<artifactId>*</artifactId>
110+
</exclusion>
111+
<exclusion>
112+
<groupId>org.projectlombok</groupId>
113+
<artifactId>*</artifactId>
114+
</exclusion>
115+
</exclusions>
41116
</dependency>
42117
</dependencies>
43118
</dependencyManagement>

‎java-io-picocsv/pom.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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+
<artifactId>java-io-parent</artifactId>
9+
<groupId>com.github.nbbrd.java-io-util</groupId>
10+
<version>0.0.18</version>
11+
</parent>
12+
13+
<artifactId>java-io-picocsv</artifactId>
14+
<packaging>jar</packaging>
15+
16+
<name>java-io-picocsv</name>
17+
<description>Common IO utilities - picocsv</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+
<dependency>
45+
<groupId>com.github.nbbrd.picocsv</groupId>
46+
<artifactId>picocsv</artifactId>
47+
<version>2.1.0</version>
48+
</dependency>
49+
50+
<!-- test libraries -->
51+
<dependency>
52+
<groupId>${project.groupId}</groupId>
53+
<artifactId>java-io-base</artifactId>
54+
<version>${project.version}</version>
55+
<classifier>tests</classifier>
56+
<type>test-jar</type>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.junit.jupiter</groupId>
61+
<artifactId>junit-jupiter</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.assertj</groupId>
66+
<artifactId>assertj-core</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.google.jimfs</groupId>
71+
<artifactId>jimfs</artifactId>
72+
<scope>test</scope>
73+
</dependency>
74+
</dependencies>
75+
</project>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright 2019 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.picocsv {
19+
20+
requires static org.checkerframework.checker.qual;
21+
requires static lombok;
22+
requires static nbbrd.design;
23+
24+
requires transitive nbbrd.io.base;
25+
requires transitive nbbrd.picocsv;
26+
27+
exports nbbrd.io.picocsv;
28+
}

0 commit comments

Comments
 (0)