Skip to content

Commit 1822460

Browse files
jan-niestadtjan-niestadt
committed
Move everything from util to common; remove util module.
1 parent cb66821 commit 1822460

82 files changed

Lines changed: 56 additions & 123 deletions

File tree

Some content is hidden

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

‎common/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,34 @@
1616

1717
<dependencies>
1818

19+
20+
<!-- Specific more efficient collection types -->
21+
<dependency>
22+
<groupId>org.eclipse.collections</groupId>
23+
<artifactId>eclipse-collections</artifactId>
24+
<version>${eclipse.collections.version}</version>
25+
</dependency>
26+
27+
<!-- jackson is our json and yaml library, it's not a part of jakarta/Java EE -->
28+
<!-- transitively pulls in data-binding, core -->
29+
<!-- Jakarta equivalent would be some implementation JSONB (as opposed to JAXB). But would require porting all json code. -->
30+
<dependency>
31+
<groupId>com.fasterxml.jackson.dataformat</groupId>
32+
<artifactId>jackson-dataformat-yaml</artifactId>
33+
<version>${jackson.version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.fasterxml.jackson.module</groupId>
37+
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
38+
<version>${jackson.version}</version>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>com.ibm.icu</groupId>
43+
<artifactId>icu4j</artifactId>
44+
<version>78.3</version>
45+
</dependency>
46+
1947
</dependencies>
2048

2149

util/src/main/java/nl/inl/util/BlockTimer.java renamed to common/src/main/java/nl/inl/util/BlockTimer.java

File renamed without changes.

util/src/main/java/nl/inl/util/CollectionsUtil.java renamed to common/src/main/java/nl/inl/util/CollectionsUtil.java

File renamed without changes.

util/src/main/java/nl/inl/util/ConcatenatedIterator.java renamed to common/src/main/java/nl/inl/util/ConcatenatedIterator.java

File renamed without changes.

util/src/main/java/nl/inl/util/CountingReader.java renamed to common/src/main/java/nl/inl/util/CountingReader.java

File renamed without changes.

util/src/main/java/nl/inl/util/CurrentThreadExecutorService.java renamed to common/src/main/java/nl/inl/util/CurrentThreadExecutorService.java

File renamed without changes.

util/src/main/java/nl/inl/util/DownloadCache.java renamed to common/src/main/java/nl/inl/util/DownloadCache.java

File renamed without changes.

util/src/main/java/nl/inl/util/FileUtil.java renamed to common/src/main/java/nl/inl/util/FileUtil.java

File renamed without changes.

util/src/main/java/nl/inl/util/Json.java renamed to common/src/main/java/nl/inl/util/Json.java

File renamed without changes.

util/src/main/java/nl/inl/util/LogUtil.java renamed to common/src/main/java/nl/inl/util/LogUtil.java

File renamed without changes.

0 commit comments

Comments
 (0)