svn commit: r39873 - in /dev/johnzon: apache-johnzon-1.2.7-src.zip apache-johnzon-1.2.7-src.zip.asc apache-johnzon-1.2.7-src.zip.sha512
Author: rmannibucau Date: Mon Jun 1 11:21:54 2020 New Revision: 39873 Log: johnzon 1.2.7 take 2 Added: dev/johnzon/apache-johnzon-1.2.7-src.zip (with props) dev/johnzon/apache-johnzon-1.2.7-src.zip.asc dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 Added: dev/johnzon/apache-johnzon-1.2.7-src.zip == Binary file - no diff available. Propchange: dev/johnzon/apache-johnzon-1.2.7-src.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/apache-johnzon-1.2.7-src.zip.asc == --- dev/johnzon/apache-johnzon-1.2.7-src.zip.asc (added) +++ dev/johnzon/apache-johnzon-1.2.7-src.zip.asc Mon Jun 1 11:21:54 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl7U5F0ACgkQcxKfWN5h +7L3ZTQgAl7jD41EU3IZYb69iL+bjIqfrLTMjhQ6XhYcohwHXLdD4QfbTMVZNBy0m +N3ECXj103jLPvVv0N5gL4EHpnEannS47qXSrbwOBQ0OAI97YraNW+YlMSd2T6FsO +IPFO0hOAgRBl/q/hziwPGxIAZb0H6tnRfGb7MR7dkODH7E3bOc5PROvnSkc+7swI +t5PLuvha43R/aBXKLJwcQZl/9TES9XFATboiWk8xxuNRUfbP7nKBHqZBCiuLdxF+ +O1bYqzd3GrnMYa2djkOhb73LogqwO7oLNVm82PfZXc3VHgTzd6dMOzKdLQqzsfg3 +nx0Mam/sCWI4PKcF3JRNEiewf+OLjA== +=vG/R +-END PGP SIGNATURE- Added: dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 == --- dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 (added) +++ dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 Mon Jun 1 11:21:54 2020 @@ -0,0 +1 @@ +297721f9e498e91b35b1454a4979e301523bf4192fbe5d2a479014b0f48a474f5151a413c9afe583f32381b835a6cfe148792f445897cb7ef81f66fbb61288bb apache-johnzon-1.2.7-src.zip
[johnzon] annotated tag v1.2.7 created (now c9260af)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.7 in repository https://gitbox.apache.org/repos/asf/johnzon.git. at c9260af (tag) tagging 72ee48f4fc7377965939ea7d35eadfa60a4552d5 (commit) replaces v1.2.6 by Romain Manni-Bucau on Mon Jun 1 13:18:35 2020 +0200 - Log - [maven-release-plugin] copy for tag v1.2.7 --- This annotated tag includes the following new commits: new 72ee48f [maven-release-plugin] prepare release v1.2.7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[johnzon] 01/02: [maven-release-plugin] prepare release v1.2.7
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 72ee48f4fc7377965939ea7d35eadfa60a4552d5 Author: Romain Manni-Bucau AuthorDate: Mon Jun 1 13:18:25 2020 +0200 [maven-release-plugin] prepare release v1.2.7 --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 41be176..573eeff 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 6da3f72..5b7c062 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 4e0ca57..fc6931f 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 4e19478..ca79ca5 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index e82fcfd..941d709 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 95dfdfa..31896ad 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 4e30032..7f24ba3 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 6128eb2..bea671a 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 6b6d420..bba46d3 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 65e881d..58ed65f 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 6c702c8..1d5d7b5 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/pom.xml b/pom.xml index 9ebcf46..bb12ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.7-SNAPSHOT + 1.2.7 Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -466,7 +466,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -HEAD +v1.2.7
[johnzon] branch master updated (1279c45 -> a1ab290)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git. from 1279c45 revert version to reroll the release new 72ee48f [maven-release-plugin] prepare release v1.2.7 new a1ab290 [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
[johnzon] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit a1ab290806bd880993759dcbb130601be888f0c4 Author: Romain Manni-Bucau AuthorDate: Mon Jun 1 13:18:35 2020 +0200 [maven-release-plugin] prepare for next development iteration --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 573eeff..398b85f 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 5b7c062..7bc5303 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index fc6931f..a716e42 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index ca79ca5..05c3539 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 941d709..8a42bcc 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 31896ad..7a67404 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 7f24ba3..34bcf4a 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index bea671a..312a13d 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index bba46d3..b3d0a67 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 58ed65f..28e95e5 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 1d5d7b5..a019293 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7 +1.2.8-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index bb12ad8..9b5a1df 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.7 + 1.2.8-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -466,7 +466,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -v1.2.7 +HEAD
[johnzon] 01/02: [JOHNZON-314] ensure @JohnzonAny on a field does not duplicate explicit bindings
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit f7343bad9cd3fe249edc09a5e2a9429c28e916ef
Author: Romain Manni-Bucau
AuthorDate: Mon Jun 1 13:15:12 2020 +0200
[JOHNZON-314] ensure @JohnzonAny on a field does not duplicate explicit
bindings
---
.../java/org/apache/johnzon/jsonb/AnySupportTest.java | 15 +++
.../java/org/apache/johnzon/mapper/MappingParserImpl.java | 1 +
2 files changed, 16 insertions(+)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
index 1cf040f..0eb0946 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
@@ -49,6 +49,21 @@ public class AnySupportTest {
assertEquals("{\"a\":{\"b\":\"c\"}}", rule.toJson(object));
}
+@Test
+public void mixed() {
+final Mixed object =
rule.fromJson("{\"explicit\":\"a\",\"bar\":\"dummy\"}", Mixed.class);
+assertEquals("a", object.explicit);
+assertEquals(singletonMap("bar", "dummy"), object.values);
+assertEquals("{\"explicit\":\"a\",\"bar\":\"dummy\"}",
rule.toJson(object));
+}
+
+public static class Mixed {
+public String explicit;
+
+@JohnzonAny
+private Map values;
+}
+
public static class Foo {
@JohnzonAny
private Map values;
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
index 1b7a3a9..1e90acf 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingParserImpl.java
@@ -440,6 +440,7 @@ public class MappingParserImpl implements MappingParser {
final Type tRef = type;
try {
classMapping.anyField.set(t, object.entrySet().stream()
+.filter(it ->
!classMapping.setters.containsKey(it.getKey()))
.collect(toMap(Map.Entry::getKey, e -> toValue(null,
e.getValue(), null, null,
ParameterizedType.class.cast(classMapping.anyField.getGenericType()).getActualTypeArguments()[1],
null,
isDeduplicateObjects ? new
JsonPointerTracker(jsonPointer, e.getKey()) : null, tRef;
[johnzon] 02/02: revert version to reroll the release
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 1279c45040a870e227528cca8e8cd3917df2f41f Author: Romain Manni-Bucau AuthorDate: Mon Jun 1 13:15:22 2020 +0200 revert version to reroll the release --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 398b85f..41be176 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 7bc5303..6da3f72 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index a716e42..4e0ca57 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 05c3539..4e19478 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 8a42bcc..e82fcfd 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 7a67404..95dfdfa 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 34bcf4a..4e30032 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 312a13d..6128eb2 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index b3d0a67..6b6d420 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 28e95e5..65e881d 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index a019293..6c702c8 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.8-SNAPSHOT +1.2.7-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 9b5a1df..9ebcf46 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.8-SNAPSHOT + 1.2.7-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014
svn commit: r39871 - in /dev/johnzon: apache-johnzon-1.2.7-src.zip apache-johnzon-1.2.7-src.zip.asc apache-johnzon-1.2.7-src.zip.sha512
Author: rmannibucau Date: Mon Jun 1 06:37:28 2020 New Revision: 39871 Log: apache johnzon 1.2.7 vote artifacts Added: dev/johnzon/apache-johnzon-1.2.7-src.zip (with props) dev/johnzon/apache-johnzon-1.2.7-src.zip.asc dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 Added: dev/johnzon/apache-johnzon-1.2.7-src.zip == Binary file - no diff available. Propchange: dev/johnzon/apache-johnzon-1.2.7-src.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/apache-johnzon-1.2.7-src.zip.asc == --- dev/johnzon/apache-johnzon-1.2.7-src.zip.asc (added) +++ dev/johnzon/apache-johnzon-1.2.7-src.zip.asc Mon Jun 1 06:37:28 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl7UoL4ACgkQcxKfWN5h +7L3Ngwf9GLqbmN7xdPynLpkh0EKnCwGekc+VNcsxSBDQ6QOyJ3c8Z+dGbGqRGlTZ +sx7E+gzmYuu2KKbH+0bDsvtZ9X80X6lgwLphpDh8Xy3eAPB5uIXbZjCfOQfXF58S +rE15hPHKzIdi5Oz9tKQHGQxfoqdZs/RqxeIB5YObTmiBytpziVt7IcbJaMr+0fwK +AGYq/QO32ulkGsMiK7F7HcARhiVYUigaUX6fuWuFh5vk12I6z+ChwlakNFs5neiZ +ZA9rsHYybmR86FrPEq09sTChGTJZ1jMajrULhZMrQxFbzg3giQFQLxJMOgmvYTfu +5Hjgfgw/xgN/vbzxzfhzUm8JHERUhA== +=s57G +-END PGP SIGNATURE- Added: dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 == --- dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 (added) +++ dev/johnzon/apache-johnzon-1.2.7-src.zip.sha512 Mon Jun 1 06:37:28 2020 @@ -0,0 +1 @@ +6d4931617f9bc50dbef6db2625a092519c8f6fb12e605a85011341b580f26866d5c4769ae5dab74a4dbb911eeb45794b2d6c48a4c8ccc4776b4130d046303594 apache-johnzon-1.2.7-src.zip
[johnzon] annotated tag v1.2.7 created (now 437d3b4)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.7 in repository https://gitbox.apache.org/repos/asf/johnzon.git. at 437d3b4 (tag) tagging e5cb1394c8cc8e35d9ffd5a9e92c4483dfcc27bb (commit) replaces v1.2.6 by Romain Manni-Bucau on Mon Jun 1 08:30:09 2020 +0200 - Log - [maven-release-plugin] copy for tag v1.2.7 --- This annotated tag includes the following new commits: new e5cb139 [maven-release-plugin] prepare release v1.2.7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[johnzon] branch master updated (43eff6c -> 9bff657)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git. from 43eff6c JOHNZON-314 support @JohnzonAny on a field new e5cb139 [maven-release-plugin] prepare release v1.2.7 new 9bff657 [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
[johnzon] 01/02: [maven-release-plugin] prepare release v1.2.7
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit e5cb1394c8cc8e35d9ffd5a9e92c4483dfcc27bb Author: Romain Manni-Bucau AuthorDate: Mon Jun 1 08:29:59 2020 +0200 [maven-release-plugin] prepare release v1.2.7 --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 41be176..573eeff 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 6da3f72..5b7c062 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 4e0ca57..fc6931f 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 4e19478..ca79ca5 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index e82fcfd..941d709 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 95dfdfa..31896ad 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 4e30032..7f24ba3 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 6128eb2..bea671a 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 6b6d420..bba46d3 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 65e881d..58ed65f 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 6c702c8..1d5d7b5 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.7-SNAPSHOT +1.2.7 4.0.0 diff --git a/pom.xml b/pom.xml index 9ebcf46..bb12ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.7-SNAPSHOT + 1.2.7 Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -466,7 +466,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -HEAD +v1.2.7
[johnzon] branch master updated: JOHNZON-314 support @JohnzonAny on a field
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 43eff6c JOHNZON-314 support @JohnzonAny on a field
43eff6c is described below
commit 43eff6cb93efef0e04e75dc2e8a3f710a9265991
Author: Romain Manni-Bucau
AuthorDate: Sun May 31 18:47:16 2020 +0200
JOHNZON-314 support @JohnzonAny on a field
---
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 5 ++
.../org/apache/johnzon/jsonb/AnySupportTest.java | 94 ++
.../java/org/apache/johnzon/mapper/JohnzonAny.java | 3 +-
.../apache/johnzon/mapper/MappingParserImpl.java | 15 +++-
.../java/org/apache/johnzon/mapper/Mappings.java | 12 ++-
.../apache/johnzon/mapper/access/AccessMode.java | 2 +
.../johnzon/mapper/access/BaseAccessMode.java | 23 +-
7 files changed, 149 insertions(+), 5 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
index 3ab3fd0..1130f67 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
@@ -728,6 +728,11 @@ public class JsonbAccessMode implements AccessMode,
Closeable {
}
@Override
+public Field findAnyField(final Class clazz) {
+return partialDelegate.findAnyField(clazz);
+}
+
+@Override
public void afterParsed(final Class clazz) {
parsingCache.remove(clazz);
partialDelegate.afterParsed(clazz);
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
new file mode 100644
index 000..1cf040f
--- /dev/null
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/AnySupportTest.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.johnzon.jsonb;
+
+import org.apache.johnzon.jsonb.test.JsonbRule;
+import org.apache.johnzon.mapper.JohnzonAny;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.Map;
+import java.util.Objects;
+
+import static java.util.Collections.singletonMap;
+import static org.junit.Assert.assertEquals;
+
+public class AnySupportTest {
+@Rule
+public final JsonbRule rule = new JsonbRule();
+
+@Test
+public void roundTrip() {
+final Foo foo = rule.fromJson("{\"a\":\"b\"}", Foo.class);
+assertEquals(singletonMap("a", "b"), foo.values);
+assertEquals("{\"a\":\"b\"}", rule.toJson(foo));
+}
+
+@Test
+public void subObject() {
+final Bar object = rule.fromJson("{\"a\":{\"b\":\"c\"}}", Bar.class);
+final Foo foo = new Foo();
+foo.values = singletonMap("b", "c");
+assertEquals(singletonMap("a", foo), object.values);
+assertEquals("{\"a\":{\"b\":\"c\"}}", rule.toJson(object));
+}
+
+public static class Foo {
+@JohnzonAny
+private Map values;
+
+public Map getValues() {
+return values;
+}
+
+public void setValues(final Map values) {
+this.values = values;
+}
+
+@Override
+public boolean equals(final Object o) {
+if (this == o) {
+return true;
+}
+if (o == null || getClass() != o.getClass()) {
+return false;
+}
+Foo foo = (Foo) o;
+return values.equals(foo.values);
+}
+
+@Override
+public int hashCode() {
+return Objects.hash(values);
+}
+}
+
+public static class Bar {
+@JohnzonAny
+private Map values;
+
+public Map getValues() {
+return values;
+}
+
+public void setValues(final Ma
[johnzon] branch master updated: [JOHNZON-313] implement json-logic based on JSON-P
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 51050c4 [JOHNZON-313] implement json-logic based on JSON-P
51050c4 is described below
commit 51050c423d3ee18415aa9ec4d4cc820a5e63e6d4
Author: Romain Manni-Bucau
AuthorDate: Tue May 26 12:20:21 2020 +0200
[JOHNZON-313] implement json-logic based on JSON-P
---
johnzon-jsonlogic/pom.xml | 40 +
.../apache/johnzon/jsonlogic/JohnzonJsonLogic.java | 665 ++
.../org/apache/johnzon/jsonlogic/spi/Operator.java | 28 +
.../johnzon/jsonlogic/JohnzonJsonLogicTest.java| 982 +
pom.xml| 1 +
src/site/markdown/index.md | 42 +
6 files changed, 1758 insertions(+)
diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml
new file mode 100644
index 000..95dfdfa
--- /dev/null
+++ b/johnzon-jsonlogic/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+johnzon
+org.apache.johnzon
+1.2.7-SNAPSHOT
+
+ 4.0.0
+
+ johnzon-jsonlogic
+ Johnzon :: JSON Logic
+ bundle
+
+
+
+ org.apache.johnzon
+ johnzon-core
+ ${project.version}
+ test
+
+
+
diff --git
a/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
b/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
new file mode 100644
index 000..d77c878
--- /dev/null
+++
b/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
@@ -0,0 +1,665 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.johnzon.jsonlogic;
+
+import org.apache.johnzon.jsonlogic.spi.Operator;
+
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonBuilderFactory;
+import javax.json.JsonException;
+import javax.json.JsonNumber;
+import javax.json.JsonObject;
+import javax.json.JsonPointer;
+import javax.json.JsonString;
+import javax.json.JsonStructure;
+import javax.json.JsonValue;
+import javax.json.spi.JsonProvider;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.BiPredicate;
+import java.util.stream.Collector;
+import java.util.stream.DoubleStream;
+import java.util.stream.Stream;
+
+import static java.util.Collections.emptyMap;
+import static java.util.stream.Collectors.joining;
+
+public class JohnzonJsonLogic {
+private final JsonProvider provider;
+private final Map operators = new HashMap<>();
+private final Map pointers = new HashMap<>();
+private final JsonBuilderFactory builderFactory;
+private boolean cachePointers;
+
+public JohnzonJsonLogic() {
+this(JsonProvider.provider());
+registerDefaultOperators();
+}
+
+public JohnzonJsonLogic(final JsonProvider provider) {
+this.provider = provider;
+this.builderFactory = provider.createBuilderFactory(emptyMap());
+}
+
+public JohnzonJsonLogic cachePointers() {
+this.cachePointers = true;
+return this;
+}
+
+public JohnzonJsonLogic registerOperator(final String name, final Operator
impl) {
+operators.put(name, impl);
+return this;
+}
+
+public JsonValue apply(final JsonValue logic, final JsonValue args) {
+if (logic.getValueType() != JsonValue.ValueType.OBJECT) {
+return logic;
+}
+
+final JsonObject object = logic.asJsonObject();
+if (object.size() > 1) {
+return object;
+}
+
+final Set keys = object.keySet();
+if (keys.size() != 1) {
+throw new IllegalArgumentException("Invaid argument, multiple keys
found: " + keys);
+}
+final String operator = keys.iterator().nex
[maven-surefire] branch SUREFIRE-1733 updated (2ddc3ff -> e924e26)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch SUREFIRE-1733 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. from 2ddc3ff inverstigation commit add e924e26 forkedbooter must use app loader + ensure modular classpath split modules in module path and keep classpath for unamed jars No new revisions were added by this update. Summary of changes: .../ModularClasspathForkConfiguration.java | 36 ++ pom.xml| 4 +-- .../apache/maven/surefire/booter/ForkedBooter.java | 2 +- .../surefire/its/MultiModuleProjectWithJPMSIT.java | 1 + 4 files changed, 28 insertions(+), 15 deletions(-)
[maven-shade-plugin] branch master updated (830d71a -> 3691f60)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. from 830d71a [MSHADE-365] put Properties transformers in separate table add 34736cc [MSHADE-364] drop duplicate resource warning when the resource is handled by a transformer new 3691f60 Merge pull request #48 from apache/MSHADE-364 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/maven/plugins/shade/DefaultShader.java | 22 ++- .../maven/plugins/shade/DefaultShaderTest.java | 161 +++-- 2 files changed, 134 insertions(+), 49 deletions(-)
[maven-shade-plugin] 01/01: Merge pull request #48 from apache/MSHADE-364
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git commit 3691f6025e9c1a7b75a7e064f144a76ca009d8b0 Merge: 830d71a 34736cc Author: Romain Manni-Bucau AuthorDate: Thu May 14 09:03:59 2020 +0200 Merge pull request #48 from apache/MSHADE-364 [MSHADE-364] drop duplicates handled by a transformer .../apache/maven/plugins/shade/DefaultShader.java | 22 ++- .../maven/plugins/shade/DefaultShaderTest.java | 161 +++-- 2 files changed, 134 insertions(+), 49 deletions(-)
[maven-shade-plugin] branch MSHADE-364 updated (d79c689 -> 34736cc)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-364 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard d79c689 drop duplicate resource warning when the resource is handled by a transformer add 34736cc [MSHADE-364] drop duplicate resource warning when the resource is handled by a transformer This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d79c689) \ N -- N -- N refs/heads/MSHADE-364 (34736cc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
svn commit: r1877698 - /johnzon/site/publish/download.html
Author: rmannibucau Date: Wed May 13 15:32:35 2020 New Revision: 1877698 URL: http://svn.apache.org/viewvc?rev=1877698=rev Log: 1.2.6 download links Modified: johnzon/site/publish/download.html Modified: johnzon/site/publish/download.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/download.html?rev=1877698=1877697=1877698=diff == --- johnzon/site/publish/download.html (original) +++ johnzon/site/publish/download.html Wed May 13 15:32:35 2020 @@ -400,11 +400,11 @@ under the License. -https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.5/apache-johnzon-1.2.5-bin.zip;>apache-johnzon-1.2.5-bin.zip +https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-bin.zip;>apache-johnzon-1.2.6-bin.zip -https://www.apache.org/dist/johnzon/johnzon-1.2.5/apache-johnzon-1.2.5-bin.zip.sha1;>apache-johnzon-1.2.5-bin.zip.sha1 +https://www.apache.org/dist/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-bin.zip.sha1;>apache-johnzon-1.2.6-bin.zip.sha1 -https://www.apache.org/dist/johnzon/johnzon-1.2.5/apache-johnzon-1.2.5-bin.zip.asc;>apache-johnzon-1.2.5-bin.zip.asc +https://www.apache.org/dist/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-bin.zip.asc;>apache-johnzon-1.2.6-bin.zip.asc Source @@ -412,11 +412,11 @@ under the License. -https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.5/johnzon-1.2.5-source-release.zip;>johnzon-1.2.5-source-release.zip +https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.6/johnzon-1.2.6-source-release.zip;>johnzon-1.2.6-source-release.zip -https://www.apache.org/dist/johnzon/johnzon-1.2.5/johnzon-1.2.5-source-release.zip.sha1;>johnzon-1.2.5-source-release.zip.sha1 +https://www.apache.org/dist/johnzon/johnzon-1.2.6/johnzon-1.2.6-source-release.zip.sha1;>johnzon-1.2.6-source-release.zip.sha1 -https://www.apache.org/dist/johnzon/johnzon-1.2.5/johnzon-1.2.5-source-release.zip.asc;>johnzon-1.2.5-source-release.zip.asc +https://www.apache.org/dist/johnzon/johnzon-1.2.6/johnzon-1.2.6-source-release.zip.asc;>johnzon-1.2.6-source-release.zip.asc Johnzon-1.0.x @@ -508,4 +508,4 @@ under the License. - \ No newline at end of file +
[johnzon] branch master updated: 1.2.6 download links
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 7c55144 1.2.6 download links 7c55144 is described below commit 7c551447c6217775c00480b5ae3a495ffe70f915 Author: Romain Manni-Bucau AuthorDate: Wed May 13 17:32:08 2020 +0200 1.2.6 download links --- src/site/markdown/download.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index 839d9a4..bcda0f8 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,16 +41,16 @@ Apache Johnzon 1.1.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Binaries The binary distribution contains all Johnzon modules. -* [apache-johnzon-1.2.5-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.5/apache-johnzon-1.2.5-bin.zip) -* [apache-johnzon-1.2.5-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.5/apache-johnzon-1.2.5-bin.zip.sha1) -* [apache-johnzon-1.2.5-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.5/apache-johnzon-1.2.5-bin.zip.asc) +* [apache-johnzon-1.2.6-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-bin.zip) +* [apache-johnzon-1.2.6-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-bin.zip.sha1) +* [apache-johnzon-1.2.6-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-bin.zip.asc) Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.5-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.5/johnzon-1.2.5-source-release.zip) -* [johnzon-1.2.5-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.5/johnzon-1.2.5-source-release.zip.sha1) -* [johnzon-1.2.5-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.5/johnzon-1.2.5-source-release.zip.asc) +* [johnzon-1.2.6-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.6/johnzon-1.2.6-source-release.zip) +* [johnzon-1.2.6-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.6/johnzon-1.2.6-source-release.zip.sha1) +* [johnzon-1.2.6-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.6/johnzon-1.2.6-source-release.zip.asc) ## Johnzon-1.0.x
svn commit: r39526 - in /release/johnzon: johnzon-1.2.5/ johnzon-1.2.6/ johnzon-1.2.6/apache-johnzon-1.2.6-src.zip johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.asc johnzon-1.2.6/apache-johnzon-1.2.6-src
Author: rmannibucau Date: Wed May 13 15:31:24 2020 New Revision: 39526 Log: johnzon 1.2.6 vote passed Added: release/johnzon/johnzon-1.2.6/ release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip (with props) release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.asc release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.sha512 Removed: release/johnzon/johnzon-1.2.5/ Added: release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.asc == --- release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.asc (added) +++ release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.asc Wed May 13 15:31:24 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl64BmYACgkQcxKfWN5h +7L3ihQf+KPhQMg2FXIBSRhrMJAdbpc8x/zvxKUi99I4zlbsRl4xn4iewxYEVka+/ +1OPfE+KFXdlY/FpvBUN0ohtgc3F9oeWHKyYh2dtYrENBsaBEVzjS3jmlfZBx/JmZ +1uEOHWnrmna0uTKHMVf8inguDs6jq5+rndXblfGimVkBTOtGsVi5krTxzY0MciCP +9hJVcgfMDbmrcbccBsxX3dINnFj0YKYw+BvsMuJphGf9X3JOj4y6kSQbNBgQdff+ +DVa9yyQ7ED0v1pHfEJdNZYv3vKRa04h3VNyOCxaHSpisjjOEn/LfbYQjGqsDzrn2 +yy05z24CpFuWwox1mqwgKbmBKzUUeA== +=m7yu +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.sha512 == --- release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.sha512 (added) +++ release/johnzon/johnzon-1.2.6/apache-johnzon-1.2.6-src.zip.sha512 Wed May 13 15:31:24 2020 @@ -0,0 +1 @@ +0889125694d54a094f6f5a6448c558728470be7311b2fe7ccc8766ac40828395726fe4cd8061ffc6cf29d21fd4d464f63df040e2a0a01c706355412660dc8c85 apache-johnzon-1.2.6-src.zip
svn commit: r39527 - in /dev/johnzon: apache-johnzon-1.2.6-src.zip apache-johnzon-1.2.6-src.zip.asc apache-johnzon-1.2.6-src.zip.sha512
Author: rmannibucau Date: Wed May 13 15:31:32 2020 New Revision: 39527 Log: johnzon 1.2.6 vote passed Removed: dev/johnzon/apache-johnzon-1.2.6-src.zip dev/johnzon/apache-johnzon-1.2.6-src.zip.asc dev/johnzon/apache-johnzon-1.2.6-src.zip.sha512
[maven-shade-plugin] branch MSHADE-364 updated (e2ddd07 -> d79c689)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-364 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard e2ddd07 dropping some finals, fixing some english wordings (plural/singular) discard 34f0272 [MSHADE-364] drop duplicate resource warning when the resource is handled by a transformer add d79c689 drop duplicate resource warning when the resource is handled by a transformer This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e2ddd07) \ N -- N -- N refs/heads/MSHADE-364 (d79c689) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/main/java/org/apache/maven/plugins/shade/DefaultShader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-shade-plugin] branch MSHADE-364 updated (6a8986d -> 035ed39)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-364 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. from 6a8986d drop duplicate resource warning when the resource is handled by a transformer add 035ed39 dropping some finals, fixing some english wordings (plural/singular) No new revisions were added by this update. Summary of changes: .../apache/maven/plugins/shade/DefaultShader.java | 18 -- .../maven/plugins/shade/DefaultShaderTest.java | 42 +++--- 2 files changed, 37 insertions(+), 23 deletions(-)
[maven-shade-plugin] branch MSHADE-364 updated (09d6560 -> 6a8986d)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-364 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard 09d6560 drop duplicates handled by a transformer add 6a8986d drop duplicate resource warning when the resource is handled by a transformer This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (09d6560) \ N -- N -- N refs/heads/MSHADE-364 (6a8986d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../maven/plugins/shade/DefaultShaderTest.java | 159 +++-- 1 file changed, 113 insertions(+), 46 deletions(-)
[maven-shade-plugin] 01/01: drop duplicates handled by a transformer
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MSHADE-364
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 09d6560632a14f9272b08ebb13b6eeea24f02cf3
Author: Romain Manni-Bucau
AuthorDate: Tue May 12 13:55:10 2020 +0200
drop duplicates handled by a transformer
---
src/main/java/org/apache/maven/plugins/shade/DefaultShader.java | 4
1 file changed, 4 insertions(+)
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index f5897c3..ffd902d 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -256,6 +256,10 @@ public class DefaultShader
addResource( resources, jos, mappedName, entry.getTime(),
in );
}
+else
+{
+duplicates.remove( name, jar );
+}
}
}
}
[maven-shade-plugin] branch MSHADE-364 created (now 09d6560)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-364 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. at 09d6560 drop duplicates handled by a transformer This branch includes the following new commits: new 09d6560 drop duplicates handled by a transformer The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[openwebbeans] branch master updated: OWB-1324 maven shade 3.2.3 support
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 82f73c3 OWB-1324 maven shade 3.2.3 support
82f73c3 is described below
commit 82f73c3090dacc39930f6d0d31f602fdbb9508f3
Author: Romain Manni-Bucau
AuthorDate: Tue May 12 12:23:55 2020 +0200
OWB-1324 maven shade 3.2.3 support
---
pom.xml | 2 +-
.../openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 29ffa32..847227e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
2.2
2.0
-3.2.2
+3.2.3
diff --git
a/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java
b/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java
index a1046db..3045a0f 100644
---
a/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java
+++
b/webbeans-maven/src/main/java/org/apache/openwebbeans/maven/shade/OpenWebBeansPropertiesTransformer.java
@@ -45,7 +45,7 @@ public class OpenWebBeansPropertiesTransformer implements
ResourceTransformer
}
@Override
-public void processResource(String s, InputStream inputStream,
List list) throws IOException
+public void processResource(String s, InputStream inputStream,
List list, long time) throws IOException
{
Properties p = new Properties();
p.load(inputStream);
[openwebbeans-meecrowave] branch master updated: MEECROWAVE-244 tomcat 9.0.35
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new cdd17ff MEECROWAVE-244 tomcat 9.0.35
cdd17ff is described below
commit cdd17fff16c8884a470770acf0c04e1ba2309a69
Author: Romain Manni-Bucau
AuthorDate: Mon May 11 16:09:50 2020 +0200
MEECROWAVE-244 tomcat 9.0.35
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4d58f73..9d871fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
${project.groupId}.${project.artifactId}
4.13
-9.0.34
+9.0.35
2.0.16
3.3.6
1.2.4
svn commit: r39343 - in /dev/johnzon: apache-johnzon-1.2.6-src.zip apache-johnzon-1.2.6-src.zip.asc apache-johnzon-1.2.6-src.zip.sha512
Author: rmannibucau Date: Sun May 10 14:18:54 2020 New Revision: 39343 Log: johnzon 1.2.6 artifacts for vote Added: dev/johnzon/apache-johnzon-1.2.6-src.zip (with props) dev/johnzon/apache-johnzon-1.2.6-src.zip.asc dev/johnzon/apache-johnzon-1.2.6-src.zip.sha512 Added: dev/johnzon/apache-johnzon-1.2.6-src.zip == Binary file - no diff available. Propchange: dev/johnzon/apache-johnzon-1.2.6-src.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/apache-johnzon-1.2.6-src.zip.asc == --- dev/johnzon/apache-johnzon-1.2.6-src.zip.asc (added) +++ dev/johnzon/apache-johnzon-1.2.6-src.zip.asc Sun May 10 14:18:54 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl64BmYACgkQcxKfWN5h +7L3ihQf+KPhQMg2FXIBSRhrMJAdbpc8x/zvxKUi99I4zlbsRl4xn4iewxYEVka+/ +1OPfE+KFXdlY/FpvBUN0ohtgc3F9oeWHKyYh2dtYrENBsaBEVzjS3jmlfZBx/JmZ +1uEOHWnrmna0uTKHMVf8inguDs6jq5+rndXblfGimVkBTOtGsVi5krTxzY0MciCP +9hJVcgfMDbmrcbccBsxX3dINnFj0YKYw+BvsMuJphGf9X3JOj4y6kSQbNBgQdff+ +DVa9yyQ7ED0v1pHfEJdNZYv3vKRa04h3VNyOCxaHSpisjjOEn/LfbYQjGqsDzrn2 +yy05z24CpFuWwox1mqwgKbmBKzUUeA== +=m7yu +-END PGP SIGNATURE- Added: dev/johnzon/apache-johnzon-1.2.6-src.zip.sha512 == --- dev/johnzon/apache-johnzon-1.2.6-src.zip.sha512 (added) +++ dev/johnzon/apache-johnzon-1.2.6-src.zip.sha512 Sun May 10 14:18:54 2020 @@ -0,0 +1 @@ +0889125694d54a094f6f5a6448c558728470be7311b2fe7ccc8766ac40828395726fe4cd8061ffc6cf29d21fd4d464f63df040e2a0a01c706355412660dc8c85 apache-johnzon-1.2.6-src.zip
[johnzon] annotated tag v1.2.6 created (now c5109b3)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.6 in repository https://gitbox.apache.org/repos/asf/johnzon.git. at c5109b3 (tag) tagging 4e0e79a0e7642851958f7cd7eb406a34bf854556 (commit) replaces v1.2.5 by Romain Manni-Bucau on Sun May 10 15:46:20 2020 +0200 - Log - [maven-release-plugin] copy for tag v1.2.6 --- This annotated tag includes the following new commits: new 4e0e79a [maven-release-plugin] prepare release v1.2.6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[johnzon] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 4add037b1102ba14cdd3e05595b49f72deb0f0f7 Author: Romain Manni-Bucau AuthorDate: Sun May 10 15:46:20 2020 +0200 [maven-release-plugin] prepare for next development iteration --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index bc6ee75..41be176 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 27cb28d..6da3f72 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index f61e71e..4e0ca57 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 231b57d..4e19478 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 12757c5..e82fcfd 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 87820a6..4e30032 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 4c9345d..6128eb2 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 902b74c..6b6d420 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 1f84ca5..65e881d 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 73dbcf7..6c702c8 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.6 +1.2.7-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 6551cc1..34965f8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.6 + 1.2.7-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -465,7 +465,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -v1.2.6 +HEAD
[openjpa] branch master updated: ensure TestSnakeCaseDDL runs in enhanced mode otherwise there is an issue in column name uniqueness check + fixing MappingDefaultsImpl name definition
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push:
new e721abf ensure TestSnakeCaseDDL runs in enhanced mode otherwise there
is an issue in column name uniqueness check + fixing MappingDefaultsImpl name
definition
e721abf is described below
commit e721abfdaa5a89489f7fec11d4cf3a0d2b804556
Author: Romain Manni-Bucau
AuthorDate: Thu May 7 10:02:45 2020 +0200
ensure TestSnakeCaseDDL runs in enhanced mode otherwise there is an issue
in column name uniqueness check + fixing MappingDefaultsImpl name definition
---
.../java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java | 2 +-
.../org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java | 10 --
.../java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java | 5 +++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
index c9f872e..0554235 100644
---
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
+++
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
@@ -643,7 +643,7 @@ public class MappingDefaultsImpl
corrected = true;
}
if (corrected) {
-name = dict.getValidColumnName(name, table, false);
+name = dict.getValidColumnName(name, table, true);
col.setIdentifier(name);
table.addCorrectedColumnName(name, true);
}
diff --git
a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
index f779a04..99dbf71 100644
---
a/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
+++
b/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/TestMappingDefaultsImpl.java
@@ -26,6 +26,7 @@ import org.apache.openjpa.jdbc.schema.Table;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
public class TestMappingDefaultsImpl {
@@ -52,11 +53,8 @@ public class TestMappingDefaultsImpl {
mr.setConfiguration(conf);
Version version = new Version(new ClassMapping(String.class,mr));
mapping.populateColumns(version, table, cols);
-assertFalse("column names are conflicted : " + cols[0].getName(),
-cols[0].getName().equals(cols[1].getName()));
-assertFalse("column names are conflicted : " + cols[0].getName(),
-cols[0].getName().equals(cols[2].getName()));
-assertFalse("column names are conflicted : " + cols[1].getName(),
-cols[1].getName().equals(cols[2].getName()));
+assertNotEquals("column names are conflicted : " + cols[0].getName(),
cols[0].getName(), cols[1].getName());
+assertNotEquals("column names are conflicted : " + cols[0].getName(),
cols[0].getName(), cols[2].getName());
+assertNotEquals("column names are conflicted : " + cols[1].getName(),
cols[1].getName(), cols[2].getName());
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java
index 053ccfa..94d1a51 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestSnakeCaseDDL.java
@@ -57,7 +57,6 @@ public class TestSnakeCaseDDL {
ds.setUrl("jdbc:derby:memory:ddlInSnakeCase;create=true");
persistenceUnitInfo.setJtaDataSource(ds);
persistenceUnitInfo.setProperty("openjpa.jdbc.DBDictionary",
"derby(javaToDbColumnNameProcessing=snake_case)");
-persistenceUnitInfo.setProperty("openjpa.RuntimeUnenhancedClasses",
"supported");
new PersistenceProviderImpl().generateSchema(persistenceUnitInfo, new
HashMap<>());
final Collection createdTables = new HashSet<>();
final Map> columns = new HashMap<>();
@@ -95,7 +94,9 @@ public class TestSnakeCaseDDL {
em.persist(entity);
em.getTransaction().commit();
} catch (final RuntimeException re) {
-em.getTransaction().rollback();
+if (em.getTransaction().isActive()) {
+em.getTransaction().rollback();
+}
throw re;
} finally {
em.close();
[openjpa] branch master updated: activating back seasar repo for uow-api now xbean had been downloaded on the ci
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openjpa.git The following commit(s) were added to refs/heads/master by this push: new 868a446 activating back seasar repo for uow-api now xbean had been downloaded on the ci 868a446 is described below commit 868a446a3e45fd026280c977de86dd6c4f123113 Author: Romain Manni-Bucau AuthorDate: Thu May 7 09:46:06 2020 +0200 activating back seasar repo for uow-api now xbean had been downloaded on the ci --- openjpa-kernel/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 7241235..5d97ccb 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -165,7 +165,7 @@ -
[johnzon] branch master updated: removing useless check
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new f50e448 removing useless check
f50e448 is described below
commit f50e448c03d505777488c7b7fea5cbb83f7fba45
Author: Romain Manni-Bucau
AuthorDate: Thu May 7 09:45:36 2020 +0200
removing useless check
---
johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
index 5ad5958..2d9c461 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
@@ -379,7 +379,7 @@ public class JsonPointerImpl implements JsonPointer {
objectBuilder.add(entry.getKey(),
addInternal(entry.getValue(), newValue, currentPath, canMatch(currentPath)));
currentPath.remove(entry.getKey());
-if (check && isPositionToAdd(currentPath)) {
+if (isPositionToAdd(currentPath)) {
objectBuilder.add(referenceTokens.get(referenceTokens.size() - 1), newValue);
}
}
[openjpa] branch master updated: commenting seasar-repo since it should be useless now (and try to get back the CI green/blue)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openjpa.git The following commit(s) were added to refs/heads/master by this push: new 560a850 commenting seasar-repo since it should be useless now (and try to get back the CI green/blue) 560a850 is described below commit 560a850bfdee09171a34acd3f79cd676f37279a4 Author: Romain Manni-Bucau AuthorDate: Thu May 7 09:39:07 2020 +0200 commenting seasar-repo since it should be useless now (and try to get back the CI green/blue) --- openjpa-kernel/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 5d97ccb..7241235 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -165,7 +165,7 @@ - +
[johnzon] branch master updated: JOHNZON-312 JsonPointer patch process shouldnt check subobjects/arrays not matching the pointer
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 826ca4f JOHNZON-312 JsonPointer patch process shouldnt check
subobjects/arrays not matching the pointer
826ca4f is described below
commit 826ca4f210990cea1dcfb295f34ccb5ada3906d9
Author: Romain Manni-Bucau
AuthorDate: Thu May 7 09:34:52 2020 +0200
JOHNZON-312 JsonPointer patch process shouldnt check subobjects/arrays not
matching the pointer
---
.../org/apache/johnzon/core/JsonPointerImpl.java | 30 ---
.../org/apache/johnzon/core/JsonPointerUtil.java | 24 ++---
.../org/apache/johnzon/core/JsonPatchDiffTest.java | 60 ++
.../apache/johnzon/core/JsonPointerUtilTest.java | 10
4 files changed, 108 insertions(+), 16 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
index e9cd32c..5ad5958 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPointerImpl.java
@@ -31,6 +31,7 @@ import javax.json.spi.JsonProvider;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.regex.Pattern;
@@ -356,12 +357,17 @@ public class JsonPointerImpl implements JsonPointer {
List currentPath = new ArrayList<>();
currentPath.add("");
-return (T) addInternal(jsonValue, newValue, currentPath);
+return (T) addInternal(jsonValue, newValue, currentPath, true);
}
-private JsonValue addInternal(JsonValue jsonValue, JsonValue newValue,
List currentPath) {
+private JsonValue addInternal(JsonValue jsonValue, JsonValue newValue,
List currentPath,
+ boolean check) {
if (jsonValue.getValueType() == JsonValue.ValueType.OBJECT) {
-JsonObject jsonObject = (JsonObject) jsonValue;
+JsonObject jsonObject = jsonValue.asJsonObject();
+if (!check) {
+return provider.createObjectBuilder(jsonObject).build();
+}
+
JsonObjectBuilder objectBuilder = provider.createObjectBuilder();
if (jsonObject.isEmpty() && isPositionToAdd(currentPath)) {
@@ -370,22 +376,25 @@ public class JsonPointerImpl implements JsonPointer {
for (Map.Entry entry :
jsonObject.entrySet()) {
currentPath.add(entry.getKey());
-objectBuilder.add(entry.getKey(),
addInternal(entry.getValue(), newValue, currentPath));
+objectBuilder.add(entry.getKey(),
addInternal(entry.getValue(), newValue, currentPath, canMatch(currentPath)));
currentPath.remove(entry.getKey());
-if (isPositionToAdd(currentPath)) {
+if (check && isPositionToAdd(currentPath)) {
objectBuilder.add(referenceTokens.get(referenceTokens.size() - 1), newValue);
}
}
}
return objectBuilder.build();
} else if (jsonValue.getValueType() == JsonValue.ValueType.ARRAY) {
-JsonArray jsonArray = (JsonArray) jsonValue;
+JsonArray jsonArray = jsonValue.asJsonArray();
+if (!check) {
+return provider.createArrayBuilder(jsonArray).build();
+}
JsonArrayBuilder arrayBuilder = provider.createArrayBuilder();
int arrayIndex = -1;
if (isPositionToAdd(currentPath)) {
-arrayIndex =
getArrayIndex(referenceTokens.get(referenceTokens.size() - 1), jsonArray, true);
+arrayIndex =
getArrayIndex(referenceTokens.get(referenceTokens.size() - 1), jsonArray,
canMatch(currentPath));
}
int jsonArraySize = jsonArray.size();
@@ -399,7 +408,7 @@ public class JsonPointerImpl implements JsonPointer {
String path = String.valueOf(i);
currentPath.add(path);
-arrayBuilder.add(addInternal(jsonArray.get(i), newValue,
currentPath));
+arrayBuilder.add(addInternal(jsonArray.get(i), newValue,
currentPath, canMatch(currentPath)));
currentPath.remove(path);
}
return arrayBuilder.build();
@@ -412,6 +421,11 @@ public class JsonPointerImpl implements JsonPointer {
currentPath.get(currentPath.size() -
1).equals(referenceTokens.get(referenceTokens.size() - 2));
}
+private boolean canMatch(final List currentPath) {
+return currentPath.size() <= referenceTokens.size() &&
+Objects.equals(currentPath.get(cu
[openwebbeans-meecrowave] branch master updated: MEECROWAVE-243 long support in meecrowave configuration
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 9f6fb85 MEECROWAVE-243 long support in meecrowave configuration
9f6fb85 is described below
commit 9f6fb854090eb658b91b2393c7df774bad781efb
Author: Romain Manni-Bucau
AuthorDate: Sat May 2 15:11:44 2020 +0200
MEECROWAVE-243 long support in meecrowave configuration
---
.../main/java/org/apache/meecrowave/configuration/Configuration.java | 4
meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java | 3 +++
2 files changed, 7 insertions(+)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/configuration/Configuration.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/configuration/Configuration.java
index 669c9f0..f5bf2ef 100644
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/configuration/Configuration.java
+++
b/meecrowave-core/src/main/java/org/apache/meecrowave/configuration/Configuration.java
@@ -1093,6 +1093,8 @@ public class Configuration {
toSet = Boolean.parseBoolean(val);
} else if (field.getType() == File.class) {
toSet = new File(val);
+} else if (field.getType() == long.class) {
+toSet = Long.parseLong(val);
} else {
toSet = null;
}
@@ -1195,6 +1197,8 @@ public class Configuration {
f.set(instance, value);
} else if (t == int.class) {
f.set(instance, Integer.parseInt(value));
+} else if (t == long.class) {
+f.set(instance, Long.parseLong(value));
} else if (t == boolean.class) {
f.set(instance, Boolean.parseBoolean(value));
} else {
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java
index 526fe5f..e5545a7 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/runner/Cli.java
@@ -171,6 +171,9 @@ public class Cli implements Runnable, AutoCloseable {
if (int.class == type) {
return Integer.parseInt(optionValues[0]);
}
+if (long.class == type) {
+return Long.parseLong(optionValues[0]);
+}
if (File.class == type) {
return new File(optionValues[0]);
}
svn commit: r1877293 [35/37] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/core/util/ apidocs/org/apach
Modified: johnzon/site/publish/project-info.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/project-info.html?rev=1877293=1877292=1877293=diff
==
--- johnzon/site/publish/project-info.html (original)
+++ johnzon/site/publish/project-info.html Sat May 2 12:34:23 2020
@@ -1,13 +1,13 @@
http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
-
+
Apache Johnzon Project Information
@@ -213,10 +213,10 @@
- Last Published: 2020-03-30
+ Last Published: 2020-05-02
|
- Version: 1.2.5-SNAPSHOT
+ Version: 1.2.6-SNAPSHOT
Modified: johnzon/site/publish/project-reports.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/project-reports.html?rev=1877293=1877292=1877293=diff
==
--- johnzon/site/publish/project-reports.html (original)
+++ johnzon/site/publish/project-reports.html Sat May 2 12:34:23 2020
@@ -1,13 +1,13 @@
http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
-
+
Apache Johnzon Generated Reports
@@ -213,10 +213,10 @@
- Last Published: 2020-03-30
+ Last Published: 2020-05-02
|
- Version: 1.2.5-SNAPSHOT
+ Version: 1.2.6-SNAPSHOT
Modified: johnzon/site/publish/project-summary.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/project-summary.html?rev=1877293=1877292=1877293=diff
==
--- johnzon/site/publish/project-summary.html (original)
+++ johnzon/site/publish/project-summary.html Sat May 2 12:34:23 2020
@@ -1,13 +1,13 @@
http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
-
+
Apache Johnzon Project Summary
@@ -213,10 +213,10 @@
- Last Published: 2020-03-30
+ Last Published: 2020-05-02
|
- Version: 1.2.5-SNAPSHOT
+ Version: 1.2.6-SNAPSHOT
@@ -522,7 +522,7 @@
johnzon
Version
-1.2.5-SNAPSHOT
+1.2.6-SNAPSHOT
Type
pom
Modified: johnzon/site/publish/property-updates-report.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/property-updates-report.html?rev=1877293=1877292=1877293=diff
==
--- johnzon/site/publish/property-updates-report.html (original)
+++ johnzon/site/publish/property-updates-report.html Sat May 2 12:34:23 2020
@@ -1,13 +1,13 @@
http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
-
+
Apache Johnzon Property Updates Report
@@ -213,10 +213,10 @@
- Last Published: 2020-03-30
+ Last Published: 2020-05-02
|
- Version: 1.2.5-SNAPSHOT
+ Version: 1.2.6-SNAPSHOT
@@ -458,7 +458,7 @@
# of properties using the latest version available
-2
+0
# of properties where the next version available is smaller than an
incremental version update
@@ -470,7 +470,7 @@
# of properties where the next version available is a minor version
update
-1
+3
# of properties where the next version available is a major version
update
@@ -503,20 +503,20 @@
3.0.0
-
+
${geronimo-jsonb.version}
1.2
-
+1.3
-
+
${geronimo-jsonp.version}
1.3
-
+1.4
Status
@@ -600,7 +600,7 @@
Status
-No newer versions
available.
+There is at least
one newer minor version available. Minor updates are sometimes
passive.
Property
${geronimo-jsonb.version}
@@ -611,18 +611,21 @@
Current Version
1.2
+Newer versions
+1.3Next Minor
+
Allowed version range
[,)
-
+
Infer associations from project
Yes
-
+
Only use release versions
No
-
+
Include projects from reactor
Yes
-
+
Always use reactor projects (even if older or -SNAPSHOT)
Yes
@@ -630,7 +633,7 @@
Status
-No newer versions
available.
+There is at least
one newer minor version available. Minor updates are sometimes
passive.
Property
${geronimo-jsonp.version}
@@ -641,18 +644,21 @@
Current Version
1.3
+Newer versions
+1.4Next Minor
+
Allowed version range
[,)
-
+
Infer associations from project
Yes
-
+
Only use release versions
No
-
+
Include projects
svn commit: r1877293 [22/37] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/core/util/ apidocs/org/apach
Modified: johnzon/site/publish/johnzon-jsonb-extras/apidocs/org/apache/johnzon/jsonb/extras/polymorphism/class-use/Polymorphic.Wrapper.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/johnzon-jsonb-extras/apidocs/org/apache/johnzon/jsonb/extras/polymorphism/class-use/Polymorphic.Wrapper.html?rev=1877293=1877292=1877293=diff == --- johnzon/site/publish/johnzon-jsonb-extras/apidocs/org/apache/johnzon/jsonb/extras/polymorphism/class-use/Polymorphic.Wrapper.html (original) +++ johnzon/site/publish/johnzon-jsonb-extras/apidocs/org/apache/johnzon/jsonb/extras/polymorphism/class-use/Polymorphic.Wrapper.html Sat May 2 12:34:23 2020 @@ -4,7 +4,7 @@ -Uses of Class org.apache.johnzon.jsonb.extras.polymorphism.Polymorphic.Wrapper (Johnzon :: JSON-B Extensions 1.2.5-SNAPSHOT API) +Uses of Class org.apache.johnzon.jsonb.extras.polymorphism.Polymorphic.Wrapper (Johnzon :: JSON-B Extensions 1.2.6-SNAPSHOT API) @@ -12,7 +12,7 @@ -Uses of Class org.apache.johnzon.jsonb.extras.polymorphism.Polymorphic (Johnzon :: JSON-B Extensions 1.2.5-SNAPSHOT API) +Uses of Class org.apache.johnzon.jsonb.extras.polymorphism.Polymorphic (Johnzon :: JSON-B Extensions 1.2.6-SNAPSHOT API)