Skip to content

Commit d994029

Browse files
AklakanAklakan
committed
Merge branch 'release/0.9.8'
2 parents 9c833e6 + d8c6412 commit d994029

File tree

70 files changed

+1411
-533
lines changed

Some content is hidden

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

70 files changed

+1411
-533
lines changed

‎README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
## AKSW Commons
1+
# AKSW Commons
22

33
A modular utility collection for solving recurrent basic tasks in a productive and robust way.
44

5-
### Modules
5+
## Building
6+
7+
The parent pom of this project resides in the directory `./aksw-commons-bom`. You can build the project as follows:
8+
9+
* Run `mvn clean install` from `./aksw-commons-bom` or
10+
* Specify the parent with explicitly to run a full build from any folder: `mvn -f aksw-commons-bom/pom.xml clean install`
11+
12+
## Modules
613

714
* [Lambdas: Serializable](aksw-commons-lambdas-parent/aksw-commons-lambdas-serializable): Interfaces derived from the Java8 functions and collector ones that extend Serializable.
815
* [Lambdas: Throwing](aksw-commons-lambdas-parent/aksw-commons-lambdas-throwing): Alternate version of the Java8 function interfaces that declare to throw exceptions.
@@ -20,17 +27,17 @@ A modular utility collection for solving recurrent basic tasks in a productive a
2027
* [util](aksw-commons-util): This package needs refactoring as it contains utils for unrelated domains, such as JDBC metadata retrieval and health checking. Also the name 'util' is too generic.
2128

2229

23-
### Where is it used?
30+
## Where is it used?
2431

2532
AKSW Commons is essentially the jena-idenpendent code from our [jena-sparql-api](https://github.com/SmartDataAnalytics/jena-sparql-api) Semantic Web toolkit.
2633

2734
* [RDFUnit](https://github.com/AKSW/RDFUnit): RDF data quality assessment framework
2835
* [DL-Learner](https://github.com/SmartDataAnalytics/DL-Learner): Framework for symbolic machine learning
29-
* [Facete](https://github.com/SmartDataAnalytics/DL-Learner): Faceted Search framework
36+
* [Facete](https://github.com/Scaseco/facete3): Faceted Search framework
3037
* [SANSA](https://github.com/SANSA-Stack/SANSA-Stack): Big Data RDF Processing and Analytics framework
3138

3239

33-
### License
40+
## License
3441

3542
This code is released under the Apache License Version 2.0.
3643

‎aksw-commons-algebra-parent/aksw-commons-algebra-allen-interval/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>aksw-commons-algebra-parent</artifactId>
1111
<groupId>org.aksw.commons</groupId>
12-
<version>0.9.7</version>
12+
<version>0.9.8</version>
1313
</parent>
1414

1515
<dependencies>

‎aksw-commons-algebra-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>aksw-commons-parent</artifactId>
1111
<groupId>org.aksw.commons</groupId>
12-
<version>0.9.7</version>
12+
<version>0.9.8</version>
1313
</parent>
1414

1515
<modules>

‎aksw-commons-beans/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>aksw-commons-parent</artifactId>
1111
<groupId>org.aksw.commons</groupId>
12-
<version>0.9.7</version>
12+
<version>0.9.8</version>
1313
</parent>
1414

1515
<dependencies>

‎aksw-commons-bom/pom.xml

Lines changed: 123 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>org.aksw.commons</groupId>
77
<artifactId>aksw-commons-bom</artifactId>
88
<packaging>pom</packaging>
9-
<version>0.9.7</version>
9+
<version>0.9.8</version>
1010
<name>AKSW Commons BOM</name>
1111
<description>A library of commonly used classes in AKSW applications.</description>
1212
<url>https://github.com/SmartDataAnalytics/aksw-commons</url>
@@ -24,7 +24,8 @@
2424
<scm>
2525
<url>https://github.com/SmartDataAnalytics/aksw-commons</url>
2626
<connection>scm:git:git://github.com/SmartDataAnalytics/aksw-commons.git</connection>
27-
<developerConnection>scm:git:git@github.com:SmartDataAnalytics/aksw-commons.git</developerConnection>
27+
<developerConnection>
28+
scm:git:git@github.com:SmartDataAnalytics/aksw-commons.git</developerConnection>
2829
<tag>HEAD</tag>
2930
</scm>
3031
<developers>
@@ -43,21 +44,31 @@
4344
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4445
<gpg.keyname>AKSW</gpg.keyname>
4546

46-
<gson.version>2.9.0</gson.version>
47-
<guava.version>32.1.2-jre</guava.version>
47+
<slf4j.version>2.0.9</slf4j.version>
48+
<log4j.version>2.21.0</log4j.version>
49+
50+
<gson.version>2.10.1</gson.version>
51+
<guava.version>32.1.3-jre</guava.version>
4852
<junit.version>4.13.2</junit.version>
4953
<xstream.version>1.4.20</xstream.version>
50-
<commons-compress.version>1.21</commons-compress.version>
51-
<picocli.version>4.6.2</picocli.version>
52-
<univocity.version>2.9.0</univocity.version>
53-
54-
<hadoop.version>3.3.4</hadoop.version>
54+
<commons-compress.version>1.24.0</commons-compress.version>
55+
<picocli.version>4.7.5</picocli.version>
56+
<univocity.version>2.9.1</univocity.version>
57+
<caffeine.version>3.1.8</caffeine.version>
58+
<kryo-serializers.version>0.42</kryo-serializers.version>
59+
<commons-lang3.version>3.13.0</commons-lang3.version>
60+
<rxjava.version>3.1.8</rxjava.version>
61+
<commons-validator.version>1.7</commons-validator.version>
62+
<protonpack.version>1.16</protonpack.version>
63+
<commons-io.version>2.15.0</commons-io.version>
64+
<jcraft.version>0.0.9</jcraft.version>
65+
<jgit.version>5.6.0.201912101111-r</jgit.version>
66+
67+
<hadoop.version>3.3.6</hadoop.version>
5568
<!-- <slf4j.version>2.0.0-alpha5</slf4j.version> -->
56-
<slf4j.version>1.7.36</slf4j.version>
57-
<log4j.version>2.20.0</log4j.version>
58-
<jackson.version>2.13.3</jackson.version>
69+
<jackson.version>2.15.2</jackson.version>
5970
<streamex.version>0.8.2</streamex.version>
60-
71+
6172
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
6273
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
6374
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
@@ -81,7 +92,8 @@
8192
<autoVersionSubmodules>true</autoVersionSubmodules>
8293
</configuration>
8394
</plugin>
84-
<!-- For jgitflow doc see: https://bitbucket.org/atlassian/jgit-flow/wiki/goals.wiki -->
95+
<!-- For jgitflow doc see:
96+
https://bitbucket.org/atlassian/jgit-flow/wiki/goals.wiki -->
8597
<plugin>
8698
<groupId>com.amashchenko.maven.plugin</groupId>
8799
<artifactId>gitflow-maven-plugin</artifactId>
@@ -100,11 +112,13 @@
100112
<version>3.6.2</version>
101113
<configuration>
102114
<release>${maven.compiler.release}</release>
103-
<!-- <source>${maven.compiler.source}</source> <target>${maven.compiler.target}</target> -->
115+
<!-- <source>${maven.compiler.source}</source>
116+
<target>${maven.compiler.target}</target> -->
104117
<encoding>${project.build.sourceEncoding}</encoding>
105118
</configuration>
106119
</plugin>
107-
<!-- Solution from http://stackoverflow.com/questions/4725668/how-to-deploy-snapshot-with-sources-and-javadoc -->
120+
<!-- Solution from
121+
http://stackoverflow.com/questions/4725668/how-to-deploy-snapshot-with-sources-and-javadoc -->
108122
<plugin>
109123
<groupId>org.apache.maven.plugins</groupId>
110124
<artifactId>maven-source-plugin</artifactId>
@@ -139,12 +153,34 @@
139153
<groupId>org.apache.maven.plugins</groupId>
140154
<artifactId>maven-surefire-plugin</artifactId>
141155
<version>3.0.0-M1</version>
142-
<!-- <configuration> <skipTests>false</skipTests> </configuration> -->
156+
<!-- <configuration> <skipTests>false</skipTests>
157+
</configuration> -->
158+
</plugin>
159+
<plugin>
160+
<groupId>org.owasp</groupId>
161+
<artifactId>dependency-check-maven</artifactId>
162+
<version>8.4.2</version>
143163
</plugin>
144164
</plugins>
145165
</build>
146166
<dependencyManagement>
147167
<dependencies>
168+
<dependency>
169+
<groupId>org.apache.logging.log4j</groupId>
170+
<artifactId>log4j-bom</artifactId>
171+
<version>${log4j.version}</version>
172+
<scope>import</scope>
173+
<type>pom</type>
174+
</dependency>
175+
176+
<dependency>
177+
<groupId>org.slf4j</groupId>
178+
<artifactId>slf4j-bom</artifactId>
179+
<version>${slf4j.version}</version>
180+
<scope>import</scope>
181+
<type>pom</type>
182+
</dependency>
183+
148184
<!-- Jackson for mapping models (e.g. csvw) to json -->
149185
<dependency>
150186
<groupId>com.fasterxml.jackson</groupId>
@@ -153,7 +189,7 @@
153189
<type>pom</type>
154190
<scope>import</scope>
155191
</dependency>
156-
192+
157193
<dependency>
158194
<groupId>one.util</groupId>
159195
<artifactId>streamex</artifactId>
@@ -290,43 +326,35 @@
290326
<version>${project.version}</version>
291327
</dependency>
292328
<dependency>
293-
<groupId>org.aksw.commons</groupId>
294-
<artifactId>aksw-commons-algebra-allen-interval</artifactId>
295-
<version>${project.version}</version>
296-
</dependency>
329+
<groupId>org.aksw.commons</groupId>
330+
<artifactId>aksw-commons-algebra-allen-interval</artifactId>
331+
<version>${project.version}</version>
332+
</dependency>
297333

298334
<!-- Kryo -->
299-
<!-- Note: don't use versions above 0.43 for now, for whatever reason
335+
<!-- Note: don't use versions above 0.43 for now, for whatever
336+
reason
300337
they depend on Kryo 5.0.0 RC1 which is binary incompatible and not used by
301338
Spark -->
302339
<dependency>
303340
<groupId>de.javakaffee</groupId>
304341
<artifactId>kryo-serializers</artifactId>
305-
<version>0.43</version>
342+
<version>${kryo-serializers.version}</version>
306343
</dependency>
307344
<dependency>
308345
<groupId>com.github.ben-manes.caffeine</groupId>
309346
<artifactId>caffeine</artifactId>
310-
<version>3.0.3</version>
347+
<version>${caffeine.version}</version>
311348
</dependency>
312-
<!-- <dependency> <groupId>org.aksw.commons</groupId> <artifactId>aksw-commons-sparql</artifactId>
349+
<!-- <dependency> <groupId>org.aksw.commons</groupId>
350+
<artifactId>aksw-commons-sparql</artifactId>
313351
<version>${project.version}</version> </dependency> -->
314352
<!--Junits -->
315353
<dependency>
316354
<groupId>junit</groupId>
317355
<artifactId>junit</artifactId>
318356
<version>${junit.version}</version>
319357
</dependency>
320-
<dependency>
321-
<groupId>org.apache.logging.log4j</groupId>
322-
<artifactId>log4j-slf4j-impl</artifactId>
323-
<version>${log4j.version}</version>
324-
</dependency>
325-
<dependency>
326-
<groupId>org.slf4j</groupId>
327-
<artifactId>slf4j-api</artifactId>
328-
<version>${slf4j.version}</version>
329-
</dependency>
330358
<dependency>
331359
<groupId>org.slf4j</groupId>
332360
<artifactId>slf4j-ext</artifactId>
@@ -337,7 +365,8 @@
337365
<artifactId>jaxb-api</artifactId>
338366
<version>2.3.1</version>
339367
</dependency>
340-
<!-- Usually we depend on slf4j, but for testing we depend on a concrete
368+
<!-- Usually we depend on slf4j, but for testing we depend on a
369+
concrete
341370
implementation -->
342371
<!-- <dependency> -->
343372
<!-- <groupId>log4j</groupId> -->
@@ -346,27 +375,23 @@
346375
<!-- <scope>test</scope> -->
347376
<!-- </dependency> -->
348377
<!-- Used for SQL-Escapting (StringEscapeUtils) -->
349-
<!-- <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId>
378+
<!-- <dependency> <groupId>commons-lang</groupId>
379+
<artifactId>commons-lang</artifactId>
350380
<version>2.5</version> </dependency> -->
351381
<dependency>
352382
<groupId>org.apache.commons</groupId>
353383
<artifactId>commons-lang3</artifactId>
354-
<version>3.12.0</version>
384+
<version>${commons-lang3.version}</version>
355385
</dependency>
356386
<dependency>
357387
<groupId>com.thoughtworks.xstream</groupId>
358388
<artifactId>xstream</artifactId>
359389
<version>${xstream.version}</version>
360390
</dependency>
361-
<dependency>
362-
<groupId>net.sourceforge.collections</groupId>
363-
<artifactId>collections-generic</artifactId>
364-
<version>4.01</version>
365-
</dependency>
366391
<dependency>
367392
<groupId>commons-validator</groupId>
368393
<artifactId>commons-validator</artifactId>
369-
<version>1.6</version>
394+
<version>${commons-validator.version}</version>
370395
</dependency>
371396
<!-- Collection APIs -->
372397
<dependency>
@@ -377,12 +402,12 @@
377402
<dependency>
378403
<groupId>io.reactivex.rxjava3</groupId>
379404
<artifactId>rxjava</artifactId>
380-
<version>3.1.3</version>
405+
<version>${rxjava.version}</version>
381406
</dependency>
382407
<dependency>
383408
<groupId>com.codepoetics</groupId>
384409
<artifactId>protonpack</artifactId>
385-
<version>1.11</version>
410+
<version>${protonpack.version}</version>
386411
</dependency>
387412
<dependency>
388413
<groupId>org.apache.commons</groupId>
@@ -392,7 +417,7 @@
392417
<dependency>
393418
<groupId>commons-io</groupId>
394419
<artifactId>commons-io</artifactId>
395-
<version>2.8.0</version>
420+
<version>${commons-io.version}</version>
396421
</dependency>
397422
<dependency>
398423
<groupId>info.picocli</groupId>
@@ -419,6 +444,11 @@
419444
<artifactId>aksw-commons-models-csvw-picocli</artifactId>
420445
<version>${project.version}</version>
421446
</dependency>
447+
<dependency>
448+
<groupId>org.aksw.commons</groupId>
449+
<artifactId>aksw-commons-models-maven</artifactId>
450+
<version>${project.version}</version>
451+
</dependency>
422452
<dependency>
423453
<groupId>com.google.code.gson</groupId>
424454
<artifactId>gson</artifactId>
@@ -434,9 +464,54 @@
434464
<artifactId>hadoop-common</artifactId>
435465
<version>${hadoop.version}</version>
436466
</dependency>
467+
<dependency>
468+
<groupId>org.eclipse.jgit</groupId>
469+
<artifactId>org.eclipse.jgit</artifactId>
470+
<version>${jgit.version}</version>
471+
</dependency>
472+
473+
<dependency>
474+
<groupId>com.jcraft</groupId>
475+
<artifactId>jsch.agentproxy.jsch</artifactId>
476+
<version>${jcraft.version}</version>
477+
</dependency>
478+
479+
<dependency>
480+
<groupId>com.jcraft</groupId>
481+
<artifactId>jsch.agentproxy.usocket-jna</artifactId>
482+
<version>${jcraft.version}</version>
483+
</dependency>
484+
485+
<dependency>
486+
<groupId>com.jcraft</groupId>
487+
<artifactId>jsch.agentproxy.sshagent</artifactId>
488+
<version>${jcraft.version}</version>
489+
</dependency>
490+
491+
437492
</dependencies>
438493
</dependencyManagement>
439494
<profiles>
495+
<profile>
496+
<id>audit</id>
497+
<build>
498+
<plugins>
499+
<plugin>
500+
<groupId>org.owasp</groupId>
501+
<artifactId>dependency-check-maven</artifactId>
502+
<version>8.4.2</version>
503+
<executions>
504+
<execution>
505+
<goals>
506+
<goal>check</goal>
507+
</goals>
508+
</execution>
509+
</executions>
510+
</plugin>
511+
</plugins>
512+
</build>
513+
</profile>
514+
440515
<profile>
441516
<id>doclint-java8-disable</id>
442517
<activation>

‎aksw-commons-claimingcache/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>aksw-commons-parent</artifactId>
1111
<groupId>org.aksw.commons</groupId>
12-
<version>0.9.7</version>
12+
<version>0.9.8</version>
1313
</parent>
1414

1515
<dependencies>

0 commit comments

Comments
 (0)