Skip to content

Commit

Permalink
bumped snapshot version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aklakan
Aklakan committed Nov 13, 2024
1 parent e20ae2d commit bed6bd2
Show file tree
Hide file tree
Showing 43 changed files with 57 additions and 48 deletions.
2 changes: 1 addition & 1 deletion aksw-commons-algebra-parent/aksw-commons-algebra-allen-interval/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-algebra-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-algebra-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-beans/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.aksw.commons</groupId>
<artifactId>aksw-commons-bom</artifactId>
<packaging>pom</packaging>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
<name>AKSW Commons BOM</name>
<description>A library of commonly used classes in AKSW applications.</description>
<url>https://github.com/SmartDataAnalytics/aksw-commons</url>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-claimingcache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-collections/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-collectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-entity-codecs-parent/aksw-commons-entity-codecs-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>aksw-commons-entity-codecs-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-entity-codecs-parent/aksw-commons-entity-codecs-sql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-entity-codecs-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-entity-codecs-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-index/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-io-parent/aksw-commons-io-buffers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-io-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-io-parent/aksw-commons-io-hadoop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-io-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-io-parent/aksw-commons-io-process-pipes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-io-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-io-parent/aksw-commons-io-syscalls/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-io-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-io-parent/aksw-commons-io-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-io-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-io-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-jgit-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-lambdas-parent/aksw-commons-lambdas-serializable/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>aksw-commons-lambdas-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-lambdas-parent/aksw-commons-lambdas-throwing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>aksw-commons-lambdas-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-lambdas-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-legacy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ons-models-parent/aksw-commons-models-csvw-parent/aksw-commons-models-csvw-domain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>aksw-commons-models-csvw-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ns-models-parent/aksw-commons-models-csvw-parent/aksw-commons-models-csvw-jackson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-models-csvw-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...ns-models-parent/aksw-commons-models-csvw-parent/aksw-commons-models-csvw-picocli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-models-csvw-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...-models-parent/aksw-commons-models-csvw-parent/aksw-commons-models-csvw-univocity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-models-csvw-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-models-parent/aksw-commons-models-csvw-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-models-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-models-parent/aksw-commons-models-maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-models-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>
</project>

2 changes: 1 addition & 1 deletion aksw-commons-models-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.aksw.commons</groupId>
<artifactId>aksw-commons-parent</artifactId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-objectstore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-paths/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-picocli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-resources-test-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-rx-ex/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-rx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-tuples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-txn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion aksw-commons-utils-parent/aksw-commons-utils-gson/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-utils-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
21 changes: 15 additions & 6 deletions ...ls-parent/aksw-commons-utils-gson/src/main/java/org/aksw/commons/util/gson/GsonUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.Map.Entry;
import java.util.Set;

import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
Expand Down Expand Up @@ -55,7 +55,6 @@ public static JsonObject makePath(JsonObject obj, List<String> keys) {

obj = (JsonObject)member;
}

return obj;
}

Expand All @@ -67,9 +66,9 @@ public static List<String> parsePathSegments(String str) {

public static JsonElement merge(JsonElement a, JsonElement b) {
JsonElement result;
if (a == null) {
result = b == null ? null : b.deepCopy();
} else if (b == null) {
if (isNull(a)) {
result = copyOrNull(b);
} else if (isNull(b)) {
result = a;
} else if (a.isJsonArray() && b.isJsonArray()) {
result = merge(a.getAsJsonArray(), b.getAsJsonArray());
Expand Down Expand Up @@ -105,4 +104,14 @@ public static JsonArray merge(JsonArray a, JsonArray b) {
}
return a;
}
}

/** Returns true if the argument is either java null or json null. */
public static boolean isNull(JsonElement elt) {
return elt == null || elt.isJsonNull();
}

/** Returns null if the argument is null, otherwise a deep copy. */
public static JsonElement copyOrNull(JsonElement elt) {
return elt == null ? null : elt.deepCopy();
}
}
2 changes: 1 addition & 1 deletion aksw-commons-utils-parent/aksw-commons-utils-xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>aksw-commons-utils-parent</artifactId>
<groupId>org.aksw.commons</groupId>
<version>0.9.9-SNAPSHOT</version>
<version>0.9.10-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
Loading

0 comments on commit bed6bd2

Please sign in to comment.