(johnzon) branch master updated (b377d513 -> 93430a24)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from b377d513 Merge pull request #119 from jungm/versionbump-tck-modules add a5a0e4df Update specs referenced in site add 0e0a5953 Fix site generation add 1942fc82 Fix links in User Guide menu add 84a3476f Update/fix download links add 6f8e06a0 Update documentation - Removal of johnzon-jsonp-strict - Properties added to jsonb for BigInteger/BigDecimal mapping add a913a27f typo add 972c0e20 Johnzon 2.0.0 download links, replace binary links with maven central add e0245e37 proper mvn central url add 6d11a83f Add note that parsson is a hardcoded default in json-p api jar new 93430a24 Merge pull request #113 from jungm/site-updates 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: pom.xml | 2 +- src/site/markdown/download.md | 53 +-- src/site/markdown/index.md| 19 +++- src/site/site.xml | 4 ++-- 4 files changed, 52 insertions(+), 26 deletions(-)
(johnzon) branch master updated (904c0810 -> f775f710)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 904c0810 [JOHNZON-401] fix serialization of nested polymorphic objects add ef966dc9 [JOHNZON-402] Reworked scanning for @JsonbTypeInfo annotations new f775f710 Merge pull request #120 from jungm/402-jsonbtypeinfoscanning-rework 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: .../org/apache/johnzon/jsonb/JsonbMappings.java| 1 - .../polymorphism/JsonbPolymorphismHandler.java | 157 - .../polymorphism/JsonbPolymorphismTypeInfo.java| 38 - .../jsonb/polymorphism/JsonbPolymorphismTest.java | 13 ++ 4 files changed, 143 insertions(+), 66 deletions(-)
(johnzon) 01/01: Merge pull request #113 from jungm/site-updates
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 93430a245401eb66ee808eae146c8d4dd5453f63 Merge: b377d513 6d11a83f Author: Jean-Louis Monteiro AuthorDate: Fri Feb 2 16:46:37 2024 +0100 Merge pull request #113 from jungm/site-updates Site updates pom.xml | 2 +- src/site/markdown/download.md | 53 +-- src/site/markdown/index.md| 19 +++- src/site/site.xml | 4 ++-- 4 files changed, 52 insertions(+), 26 deletions(-)
(johnzon) 01/01: Merge pull request #119 from jungm/versionbump-tck-modules
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit b377d51356f2eb3516fdcee8d91d00097d325675 Merge: f775f710 970b0176 Author: Jean-Louis Monteiro AuthorDate: Fri Feb 2 16:46:23 2024 +0100 Merge pull request #119 from jungm/versionbump-tck-modules Align version of TCK modules again tck/jsonb/pom.xml | 2 +- tck/jsonp/pom.xml | 2 +- tck/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(johnzon) branch master updated (f775f710 -> b377d513)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from f775f710 Merge pull request #120 from jungm/402-jsonbtypeinfoscanning-rework add 970b0176 Align version of TCK modules again new b377d513 Merge pull request #119 from jungm/versionbump-tck-modules 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: tck/jsonb/pom.xml | 2 +- tck/jsonp/pom.xml | 2 +- tck/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(johnzon) 01/01: Merge pull request #120 from jungm/402-jsonbtypeinfoscanning-rework
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit f775f710e4d6c37dd4ad1e4d944765366bdf99ad Merge: 904c0810 ef966dc9 Author: Jean-Louis Monteiro AuthorDate: Fri Feb 2 16:46:08 2024 +0100 Merge pull request #120 from jungm/402-jsonbtypeinfoscanning-rework [JOHNZON-402] Reworked scanning for @JsonbTypeInfo annotations .../org/apache/johnzon/jsonb/JsonbMappings.java| 1 - .../polymorphism/JsonbPolymorphismHandler.java | 157 - .../polymorphism/JsonbPolymorphismTypeInfo.java| 38 - .../jsonb/polymorphism/JsonbPolymorphismTest.java | 13 ++ 4 files changed, 143 insertions(+), 66 deletions(-)
svn commit: r65045 - /release/johnzon/johnzon-2.0.0/
Author: jlmonteiro Date: Sun Nov 5 19:22:21 2023 New Revision: 65045 Log: Vote passed for Apache Johnzon 2.0.0 Added: release/johnzon/johnzon-2.0.0/ release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz (with props) release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip (with props) release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.sha512 Added: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz == Binary file - no diff available. Propchange: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc == --- release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc (added) +++ release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc Sun Nov 5 19:22:21 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmU3u60ACgkQNYgHxStL +DiOOcxAAxOzgtOfLnrb71HJ29WtrUleUPJcSqfolPZQMKpepD9InOkXRhaBgKDOn +IlLHPH2SliueGFGHdBk+AkK/c03fpfQ5Wv48rGmwUv82WKn/fZqVeTC751mapCVU +kk5GeyGaKXN6q49LZUJmjiWq+FXbZwdsmVntsqgERcoE1GLkl0IWw+3dagIvS4AE +KCIs3E5wj5+2NCuNPb9dl+by0W8Ra735IEcuntz2Dv6j9pCFAU2mxUnYEGLKIUwa +FT9uiCJy8Q7VNCdg8bfCmiAZV/UWCXTCyZqNlsPMeAYiJoxVl76bNfN+kIiH705y +PR+ioiqWFYhCrKu0Jl3MHOlrQboXC+XzKbW7Q5HpYl9kjP6SOi6aXr4ScPgnfUeV +4Tl/cr673Ppc5MUliRy5j4ae2r2zG50E+lTjhrY/SGGxprD0CSohJRBvCEY6c7qi +hZ2yc/u0gIm0qF2p0n3wHk/NZ1uqlQh+JDNBVuwwWURmF15r3oukyVCZkSbm3Aev +9dy3rSCk6BiGv5RjMKzltaSszh4QFJrHnN1XzDaCE6ahFp8sjNzlbyIl3TJU23G/ +44t3YAnLt2Yhuht+vFOGH7Rb4rEZ4LQCZcEE2UPDpxWa51Viqq9Vw7bhNGCi5e7f +/Tob3XJJjH4TUQVJCyzGCI/VFugnz1BsbpoDVaVeZUzn/lEkABA= +=jEkO +-END PGP SIGNATURE- Added: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 == --- release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 (added) +++ release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 Sun Nov 5 19:22:21 2023 @@ -0,0 +1 @@ +6025b833f2c9e4ac49294a03482704dc380ca2c2571c6e5d292404becdcfc7e15a1f95b766b440f67701cfa2d88398316609f384f523b8ed2ab76b4c8c3475c5 apache-johnzon-2.0.0-src.tar.gz Added: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc == --- release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc (added) +++ release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc Sun Nov 5 19:22:21 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmU3u60ACgkQNYgHxStL +DiMgCxAAo3ByPUIyWLwxQCYxl57nW+mHTVBytANqyw+Mdoc8T9BSyvHX9yaOciPR +riM5LWXaGPpKKO+koUmW7KNkImTbNco1Mbl9FIvtSBSkB8xdWbAG9IE7tSPnVBA9 +/XsoX/pRSEYU3Fzxnofsy+/S169uOmeJ8Tfn7YddaXznFzh1aB1XtcCPRjzQT818 +A10fU0DyHEaUZ1s5z0vHw1XcYfimX1nDfki25pjOpw5xqnURLpnM9ZyETsT+1Ri3 +qC/nOTdm7eR6cHkYW+Bgj8y07Up0YxUwmwTB0HhiwnYwBRnGvBGKWlnjBLRHWdLh +3tZn5FqaXG3f0E0isRtWdKyNrwJPGR4UiCjtmT7desAy3sBOH5OHreyU5/lJMu78 +gQbJ4FqxwnX1CMDmlqJRUpO9x3LNKNIlICzvulEEhGLRUVUVH5TNsS3EZazmgdqa +izMsTEpAIESJbg/h9Pl0rsLx0rVz9l7xC5ba6MbI4qM9c+aPSwAdcAqz3CW43Ne5 +HB4lV8miygjWwGF3mn6kHFcbpLjA+x63aN1dbAEQ+7St98XcmIJ9nHZuXwpzpT8u +yOQh45VpGdyFFUBdE5+EMmKM69M5R6iwr9uJ3N482Uh2yatcA3Kh/9EwoJ558bY1 +KKDCX8sjs2qAiTB9Y5naVHgIpGKdxHcIN3lEtIdxGxC+2XEwnWo= +=/Jvu +-END PGP SIGNATURE- Added: release/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.sha512 == (empty)
svn commit: r65044 - /dev/johnzon/johnzon-2.0.0/
Author: jlmonteiro Date: Sun Nov 5 19:21:56 2023 New Revision: 65044 Log: Vote passed for Apache Johnzon 2.0.0 Removed: dev/johnzon/johnzon-2.0.0/
[johnzon] 01/02: [maven-release-plugin] prepare release v2.0.0
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 3845e13be4d7e345a5df33cba82b2de87a07ca44 Author: Jean-Louis Monteiro AuthorDate: Tue Oct 24 14:40:25 2023 +0200 [maven-release-plugin] prepare release v2.0.0 --- 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 | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 3fb3941f..89bf3b1c 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index f91dc176..d1353531 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index af972123..f3cd6a62 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index e47ca9ea..8e9c77ed 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 3409e1e5..757952bb 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 779e79c2..7b1a4127 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 22735174..fdb57317 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 067a2f97..e48d12a9 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 115e3da0..541c790a 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index f384edf1..b64067c1 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index ae87122e..95b53def 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0-SNAPSHOT +2.0.0 4.0.0 diff --git a/pom.xml b/pom.xml index 36eec8cd..d8d8cf52 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 2.0.0-SNAPSHOT + 2.0.0 Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -38,7 +38,7 @@ UTF-8 UTF-8 -10 +1698151118 2.1.1 3.0.0 @@ -517,7 +517,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 +v2.0.0
[johnzon] 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 885cec0ef9484c3666c82315826143045f1c492a Author: Jean-Louis Monteiro AuthorDate: Tue Oct 24 14:40:25 2023 +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 | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 89bf3b1c..4253a8f0 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index d1353531..ba1abaeb 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index f3cd6a62..75123b2e 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 8e9c77ed..be54f8f1 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 757952bb..9d59a7ba 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 7b1a4127..9f98eab2 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index fdb57317..84ff5497 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index e48d12a9..e40b9b6e 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 541c790a..2b28f36c 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index b64067c1..d1fb1021 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 95b53def..7d78159a 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -2.0.0 +2.0.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d8d8cf52..2af0f510 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 2.0.0 + 2.0.1-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -38,7 +38,7 @@ UTF-8 UTF-8 -1698151118 +1698151225 2.1.1 3.0.0 @@ -517,7 +517,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 -v2.0.0 +HEAD
[johnzon] annotated tag v2.0.0 updated (3845e13b -> d8b60118)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to annotated tag v2.0.0 in repository https://gitbox.apache.org/repos/asf/johnzon.git *** WARNING: tag v2.0.0 was modified! *** from 3845e13b (commit) to d8b60118 (tag) tagging 3845e13be4d7e345a5df33cba82b2de87a07ca44 (commit) replaces v1.2.19 by Jean-Louis Monteiro on Tue Oct 24 14:40:25 2023 +0200 - Log - [maven-release-plugin] copy for tag v2.0.0 --- No new revisions were added by this update. Summary of changes:
[johnzon] branch master updated (ae40a27b -> 885cec0e)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from ae40a27b feat: revert source plugin because it fails and no time to spend on this now new 3845e13b [maven-release-plugin] prepare release v2.0.0 new 885cec0e [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 | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-)
svn commit: r64794 - /dev/johnzon/johnzon-2.0.0/
Author: jlmonteiro Date: Tue Oct 24 13:09:40 2023 New Revision: 64794 Log: Apache Johnzon 2.0.0 up for vote Added: dev/johnzon/johnzon-2.0.0/ dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz (with props) dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip (with props) dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.sha512 Added: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz == Binary file - no diff available. Propchange: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc == --- dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc (added) +++ dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.asc Tue Oct 24 13:09:40 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmU3u60ACgkQNYgHxStL +DiOOcxAAxOzgtOfLnrb71HJ29WtrUleUPJcSqfolPZQMKpepD9InOkXRhaBgKDOn +IlLHPH2SliueGFGHdBk+AkK/c03fpfQ5Wv48rGmwUv82WKn/fZqVeTC751mapCVU +kk5GeyGaKXN6q49LZUJmjiWq+FXbZwdsmVntsqgERcoE1GLkl0IWw+3dagIvS4AE +KCIs3E5wj5+2NCuNPb9dl+by0W8Ra735IEcuntz2Dv6j9pCFAU2mxUnYEGLKIUwa +FT9uiCJy8Q7VNCdg8bfCmiAZV/UWCXTCyZqNlsPMeAYiJoxVl76bNfN+kIiH705y +PR+ioiqWFYhCrKu0Jl3MHOlrQboXC+XzKbW7Q5HpYl9kjP6SOi6aXr4ScPgnfUeV +4Tl/cr673Ppc5MUliRy5j4ae2r2zG50E+lTjhrY/SGGxprD0CSohJRBvCEY6c7qi +hZ2yc/u0gIm0qF2p0n3wHk/NZ1uqlQh+JDNBVuwwWURmF15r3oukyVCZkSbm3Aev +9dy3rSCk6BiGv5RjMKzltaSszh4QFJrHnN1XzDaCE6ahFp8sjNzlbyIl3TJU23G/ +44t3YAnLt2Yhuht+vFOGH7Rb4rEZ4LQCZcEE2UPDpxWa51Viqq9Vw7bhNGCi5e7f +/Tob3XJJjH4TUQVJCyzGCI/VFugnz1BsbpoDVaVeZUzn/lEkABA= +=jEkO +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 == --- dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 (added) +++ dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.tar.gz.sha512 Tue Oct 24 13:09:40 2023 @@ -0,0 +1 @@ +6025b833f2c9e4ac49294a03482704dc380ca2c2571c6e5d292404becdcfc7e15a1f95b766b440f67701cfa2d88398316609f384f523b8ed2ab76b4c8c3475c5 apache-johnzon-2.0.0-src.tar.gz Added: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip == Binary file - no diff available. Propchange: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc == --- dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc (added) +++ dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.asc Tue Oct 24 13:09:40 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmU3u60ACgkQNYgHxStL +DiMgCxAAo3ByPUIyWLwxQCYxl57nW+mHTVBytANqyw+Mdoc8T9BSyvHX9yaOciPR +riM5LWXaGPpKKO+koUmW7KNkImTbNco1Mbl9FIvtSBSkB8xdWbAG9IE7tSPnVBA9 +/XsoX/pRSEYU3Fzxnofsy+/S169uOmeJ8Tfn7YddaXznFzh1aB1XtcCPRjzQT818 +A10fU0DyHEaUZ1s5z0vHw1XcYfimX1nDfki25pjOpw5xqnURLpnM9ZyETsT+1Ri3 +qC/nOTdm7eR6cHkYW+Bgj8y07Up0YxUwmwTB0HhiwnYwBRnGvBGKWlnjBLRHWdLh +3tZn5FqaXG3f0E0isRtWdKyNrwJPGR4UiCjtmT7desAy3sBOH5OHreyU5/lJMu78 +gQbJ4FqxwnX1CMDmlqJRUpO9x3LNKNIlICzvulEEhGLRUVUVH5TNsS3EZazmgdqa +izMsTEpAIESJbg/h9Pl0rsLx0rVz9l7xC5ba6MbI4qM9c+aPSwAdcAqz3CW43Ne5 +HB4lV8miygjWwGF3mn6kHFcbpLjA+x63aN1dbAEQ+7St98XcmIJ9nHZuXwpzpT8u +yOQh45VpGdyFFUBdE5+EMmKM69M5R6iwr9uJ3N482Uh2yatcA3Kh/9EwoJ558bY1 +KKDCX8sjs2qAiTB9Y5naVHgIpGKdxHcIN3lEtIdxGxC+2XEwnWo= +=/Jvu +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-2.0.0/apache-johnzon-2.0.0-src.zip.sha512 == (empty)
[johnzon] branch master updated: feat: revert source plugin because it fails and no time to spend on this now
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 ae40a27b feat: revert source plugin because it fails and no time to spend on this now ae40a27b is described below commit ae40a27b2f332430fcc5c0d311e6ebda2399ffc2 Author: Jean-Louis Monteiro AuthorDate: Tue Oct 24 14:38:18 2023 +0200 feat: revert source plugin because it fails and no time to spend on this now Signed-off-by: Jean-Louis Monteiro --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4a36d60c..36eec8cd 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.2.1 org.apache.maven.plugins @@ -391,7 +391,7 @@ generate-sources - jar-no-fork + jar
[johnzon] branch master updated: feat: we don't need the shade plugin anymore
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 a0a1738c feat: we don't need the shade plugin anymore a0a1738c is described below commit a0a1738cc936815619bfe4845ae402887398ffe5 Author: Jean-Louis Monteiro AuthorDate: Tue Oct 24 14:27:09 2023 +0200 feat: we don't need the shade plugin anymore Signed-off-by: Jean-Louis Monteiro --- johnzon-core/pom.xml| 4 johnzon-jaxrs/pom.xml | 4 johnzon-json-extras/pom.xml | 8 johnzon-jsonb/pom.xml | 4 johnzon-jsonlogic/pom.xml | 4 johnzon-jsonschema/pom.xml | 4 johnzon-mapper/pom.xml | 4 johnzon-websocket/pom.xml | 4 8 files changed, 36 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 00cf51c4..3fb3941f 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -46,10 +46,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 3ca4a654..af972123 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -74,10 +74,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 0a31375d..e47ca9ea 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -48,12 +48,4 @@ - - - -org.apache.maven.plugins -maven-shade-plugin - - - diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 64161114..3409e1e5 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -112,10 +112,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - org.apache.felix maven-bundle-plugin diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index e2a47521..779e79c2 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -49,10 +49,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index d4e65049..22735174 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -63,10 +63,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index a97e6868..067a2f97 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -85,10 +85,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index a86963ea..ae87122e 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -162,10 +162,6 @@ - -org.apache.maven.plugins -maven-shade-plugin - org.apache.maven.plugins maven-enforcer-plugin
[johnzon] branch master updated: feat: fix the source issue during release
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 d559ba9c feat: fix the source issue during release d559ba9c is described below commit d559ba9c50585c71495953c738e7392a971f57b8 Author: Jean-Louis Monteiro AuthorDate: Tue Oct 24 14:20:43 2023 +0200 feat: fix the source issue during release Signed-off-by: Jean-Louis Monteiro --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8179c7c4..4a36d60c 100644 --- a/pom.xml +++ b/pom.xml @@ -391,7 +391,7 @@ generate-sources - jar + jar-no-fork
[johnzon] branch master updated: feat: add support for JsonbTypeDeserializer with factories (JsonbCreator)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro 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 aef76ee8 feat: add support for JsonbTypeDeserializer with factories
(JsonbCreator)
aef76ee8 is described below
commit aef76ee8b6ab4f76e2ffc709cd9f61abc61c435c
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 16:39:44 2023 +0200
feat: add support for JsonbTypeDeserializer with factories (JsonbCreator)
Signed-off-by: Jean-Louis Monteiro
---
.../org/apache/johnzon/jsonb/JsonbAccessMode.java | 60 +-
1 file changed, 59 insertions(+), 1 deletion(-)
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 fb3f3fc7..a18b3481 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
@@ -264,7 +264,8 @@ public class JsonbAccessMode implements AccessMode,
Closeable, Cleanable)
johnzonConverter.value().newInstance();
+
+} else if (deserializer != null) {
+final Class value =
deserializer.value();
+final JohnzonAdapterFactory.Instance instance = newInstance(value);
+final ParameterizedType pt =
this.types.findParameterizedType(value, JsonbDeserializer.class);
+final Class mappedType =
this.types.findParamType(pt, JsonbDeserializer.class);
+toRelease.add(instance);
+final JsonBuilderFactory builderFactoryInstance =
builderFactory.get();
+final Type[] arguments =
this.types.findParameterizedType(value,
JsonbDeserializer.class).getActualTypeArguments();
+final boolean global = arguments.length == 1 &&
arguments[0] != null && arguments[0].equals(parameter.getType());
+objectConverters[i] = new ObjectConverter.Codec() {
+private final ConcurrentMap> impl =
+new ConcurrentHashMap<>();
+@Override
+public Object fromJson(final JsonValue value,
final Type targetType, final MappingParser parser) {
+final JsonbDeserializer jsonbDeserializer
= instance.getValue();
+if (global || targetType == mappedType) {
// fast test and matches most cases
+return mapItem(value, targetType,
parser, jsonbDeserializer);
+}
+
+BiFunction fn = impl.get(targetType);
+if (fn == null) {
+if (value.getValueType() ==
JsonValue.ValueType.ARRAY) {
+if
(ParameterizedType.class.isInstance(targetType)) {
+final ParameterizedType
parameterizedType = ParameterizedType.class.cast(targetType);
+final Class paramType =
JsonbAccessMode.this.types.findParamType(parameterizedType, Collection.class);
+if (paramType != null &&
(mappedType == null /*Object*/ || mappedType.isAssignableFrom(paramType))) {
+final Collector> collector =
+
Set.class.isAssignableFrom(
+
JsonbAccessMode.this.types.asClass(parameterizedType.getRawType())) ? toSet() :
toList();
+fn = (json, mp) ->
json.asJsonArray().stream()
+
.map(i -> mapItem(i, paramType, mp, jsonbDeserializer))
+
.collect(collector);
+}
+}
+}
+if (fn == null) {
+fn = (json, mp) -> mapItem(json,
targetType, mp, jsonbDeserializer);
+}
+impl.putIfAbsent(targetType, fn);
+}
+return fn.apply(value, parser);
+}
+
+private Obj
[johnzon] 01/03: feat: Add a test related to the challenge https://github.com/jakartaee/jsonb-api/issues/347
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 6aaded98fa8faa2d9b5bf69f3d672a76705066cc
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 15:15:59 2023 +0200
feat: Add a test related to the challenge
https://github.com/jakartaee/jsonb-api/issues/347
Signed-off-by: Jean-Louis Monteiro
---
.../jsonb/polymorphism/JsonbPolymorphismTest.java | 47 ++
1 file changed, 47 insertions(+)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
index e3ebaf76..87d83899 100644
---
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java
@@ -18,13 +18,22 @@
*/
package org.apache.johnzon.jsonb.polymorphism;
+import jakarta.json.bind.annotation.JsonbCreator;
+import jakarta.json.bind.annotation.JsonbDateFormat;
+import jakarta.json.bind.annotation.JsonbProperty;
import org.apache.johnzon.jsonb.test.JsonbRule;
+import org.hamcrest.CoreMatchers;
import org.junit.Rule;
import org.junit.Test;
import jakarta.json.bind.annotation.JsonbSubtype;
import jakarta.json.bind.annotation.JsonbTypeInfo;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
+
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -74,6 +83,23 @@ public class JsonbPolymorphismTest {
assertEquals(3, dog.dogAge);
}
+@Test
+public void testCreatorDeserialization() {
+SomeDateType deserialized =
jsonb.fromJson("{\"@dateType\":\"constructor\",\"localDate\":\"26-02-2021\"}",
+ SomeDateType.class);
+
+assertThat("Incorrectly deserialized according to the type
information. Expected was DateConstructor instance. "
+ + "Got instance of class " + deserialized.getClass(),
+ deserialized,
CoreMatchers.instanceOf(DateConstructor.class));
+
+final DateTimeFormatter formatter =
+
DateTimeFormatter.ofPattern("dd-MM-").withLocale(Locale.forLanguageTag("nl-NL"));
+assertThat("Date isn't the expected one",
+ ((DateConstructor) deserialized).getLocalDate(),
+ CoreMatchers.equalTo(LocalDate.parse("26-02-2021",
formatter)));
+
+}
+
@JsonbTypeInfo(key = "@animal", value = @JsonbSubtype(alias = "dog", type
= Dog.class))
public interface Animal {
}
@@ -89,4 +115,25 @@ public class JsonbPolymorphismTest {
public static class Labrador extends Dog {
public String labradorName;
}
+
+@JsonbTypeInfo(key = "@dateType", value = {
+@JsonbSubtype(alias = "constructor", type = DateConstructor.class)
+})
+public interface SomeDateType {
+
+}
+
+public static final class DateConstructor implements SomeDateType {
+
+private LocalDate localDate;
+
+@JsonbCreator
+public DateConstructor(@JsonbProperty("localDate")
@JsonbDateFormat(value = "dd-MM-", locale = "nl-NL") LocalDate localDate) {
+this.localDate = localDate;
+}
+
+public LocalDate getLocalDate() {
+return localDate;
+}
+}
}
[johnzon] 03/03: fix: exclude the test because we have created a challenge
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit e27449a2c1a6e264b36a5c36f798c931e344b7a0 Author: Jean-Louis Monteiro AuthorDate: Wed Oct 11 16:38:56 2023 +0200 fix: exclude the test because we have created a challenge Signed-off-by: Jean-Louis Monteiro --- tck/jsonb/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml index 914fc973..880acafd 100644 --- a/tck/jsonb/pom.xml +++ b/tck/jsonb/pom.xml @@ -97,6 +97,9 @@ **/SerializersCustomizationCDITest + + +**/AnnotationTypeInfoTest
[johnzon] branch master updated (09d6bf8c -> e27449a2)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 09d6bf8c feat: Fix Locale adapter using Java 7+ helper method from Locale new 6aaded98 feat: Add a test related to the challenge https://github.com/jakartaee/jsonb-api/issues/347 new 5e7c6ad9 feat: Move Local converter implementation and tests to IETF's BCP 47, with an hyphen (-) Do not use the toString format which is for debugging as expressed in the javadoc new e27449a2 fix: exclude the test because we have created a challenge The 3 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: .../jsonb/polymorphism/JsonbPolymorphismTest.java | 47 ++ .../johnzon/mapper/converter/LocaleConverter.java | 2 +- .../java/org/apache/johnzon/mapper/LocaleTest.java | 4 +- tck/jsonb/pom.xml | 3 ++ 4 files changed, 53 insertions(+), 3 deletions(-)
[johnzon] 02/03: feat: Move Local converter implementation and tests to IETF's BCP 47, with an hyphen (-) Do not use the toString format which is for debugging as expressed in the javadoc
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 5e7c6ad9d0fa166d1756d34699af9c6cec59818e
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 16:37:57 2023 +0200
feat: Move Local converter implementation and tests to IETF's BCP 47, with
an hyphen (-)
Do not use the toString format which is for debugging as expressed in the
javadoc
Signed-off-by: Jean-Louis Monteiro
---
.../java/org/apache/johnzon/mapper/converter/LocaleConverter.java | 2 +-
.../src/test/java/org/apache/johnzon/mapper/LocaleTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
index 565a2a42..66aa7fb4 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
@@ -45,7 +45,7 @@ public class LocaleConverter implements
TypeAwareAdapter {
@Override
public String from(final Locale instance) {
-return instance.toString();
+return instance.toLanguageTag();
}
@Override
diff --git
a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
index 3e3098ca..b52b85ee 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull;
public class LocaleTest {
@Test
public void roundTrip() {
-final String expected = "{\"locale\":\"fr_FR\"}";
+final String expected = "{\"locale\":\"fr-FR\"}";
final Mapper mapper = new MapperBuilder().setAccessMode(new
FieldAccessMode(false, false)).build();
{
final Locale locale = Locale.FRANCE;
@@ -40,7 +40,7 @@ public class LocaleTest {
{
final LocaleHolder holder = mapper.readObject(expected,
LocaleHolder.class);
assertNotNull(holder.locale);
-assertEquals("fr_FR", holder.locale.toString());
+assertEquals("fr-FR", holder.locale.toLanguageTag());
}
}
[johnzon] branch master updated: feat: Fix Locale adapter using Java 7+ helper method from Locale
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro 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 09d6bf8c feat: Fix Locale adapter using Java 7+ helper method from
Locale
09d6bf8c is described below
commit 09d6bf8cf72a16774de8c876893e0ed2cbaa54cc
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 15:15:26 2023 +0200
feat: Fix Locale adapter using Java 7+ helper method from Locale
Signed-off-by: Jean-Louis Monteiro
---
.../johnzon/mapper/converter/LocaleConverter.java | 32 ++
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
index 6dd330fa..565a2a42 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
@@ -53,35 +53,7 @@ public class LocaleConverter implements
TypeAwareAdapter {
if (locale == null) {
return null;
}
-final int len = locale.length();
-if (len != 2 && len != 5 && len < 7) {
-throw new IllegalArgumentException("Invalid locale format: " +
locale);
-}
-final char ch0 = locale.charAt(0);
-final char ch1 = locale.charAt(1);
-if (ch0 < 'a' || ch0 > 'z' || ch1 < 'a' || ch1 > 'z') {
-throw new IllegalArgumentException("Invalid locale format: " +
locale);
-}
-if (len == 2) {
-return new Locale(locale, "");
-}
-if (locale.charAt(2) != '_') {
-throw new IllegalArgumentException("Invalid locale format: " +
locale);
-}
-final char ch3 = locale.charAt(3);
-if (ch3 == '_') {
-return new Locale(locale.substring(0, 2), "", locale.substring(4));
-}
-final char ch4 = locale.charAt(4);
-if (ch3 < 'A' || ch3 > 'Z' || ch4 < 'A' || ch4 > 'Z') {
-throw new IllegalArgumentException("Invalid locale format: " +
locale);
-}
-if (len == 5) {
-return new Locale(locale.substring(0, 2), locale.substring(3, 5));
-}
-if (locale.charAt(5) != '_') {
-throw new IllegalArgumentException("Invalid locale format: " +
locale);
-}
-return new Locale(locale.substring(0, 2), locale.substring(3, 5),
locale.substring(6));
+
+return Locale.forLanguageTag(locale);
}
}
[johnzon] branch master updated: feat: char not properly handled as primitive to determine default value
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro 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 276658ed feat: char not properly handled as primitive to determine
default value
276658ed is described below
commit 276658ed3be019f9635a8f3ceef6846e68ebe6ad
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 12:59:10 2023 +0200
feat: char not properly handled as primitive to determine default value
Signed-off-by: Jean-Louis Monteiro
---
johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
index ac170a4b..77f172cc 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mappings.java
@@ -398,7 +398,9 @@ public class Mappings {
}
public static Object getPrimitiveDefault(final Type type) {
-if (type == long.class) {
+if (type == char.class) {
+return '\u';
+} else if (type == long.class) {
return 0L;
} else if (type == int.class) {
return 0;
[johnzon] 01/02: fix: typo
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 69792c97a7ba520706443e07d2cd443df85b3596
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 09:48:06 2023 +0200
fix: typo
Signed-off-by: Jean-Louis Monteiro
---
.../org/apache/johnzon/mapper/access/FieldAndMethodAccessMode.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAndMethodAccessMode.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAndMethodAccessMode.java
index 6d3ad42b..2080a797 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAndMethodAccessMode.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/FieldAndMethodAccessMode.java
@@ -177,7 +177,7 @@ public class FieldAndMethodAccessMode extends
BaseAccessMode {
@Override
public Map doFindWriters(final Class clazz) {
final Map fieldWriters =
this.fields.findWriters(clazz);
-final Map metodWriters =
this.methods.findWriters(clazz);
+final Map methodWriters =
this.methods.findWriters(clazz);
final Map writers = new HashMap();
@@ -186,7 +186,7 @@ public class FieldAndMethodAccessMode extends
BaseAccessMode {
final Method m = getMethod("set" +
Character.toUpperCase(key.charAt(0)) + (key.length() > 1 ? key.substring(1) :
""), clazz, toType(entry.getValue().getType()));
boolean skip = false;
if (m != null && (ignoreVisibilityFilter ||
Modifier.isPublic(m.getModifiers( {
-for (final Writer w : metodWriters.values()) {
+for (final Writer w : methodWriters.values()) {
if
(MethodAccessMode.MethodDecoratedType.class.cast(w).getMethod().equals(m)) {
if (w.getAnnotation(JohnzonProperty.class) != null) {
skip = true;
@@ -203,7 +203,7 @@ public class FieldAndMethodAccessMode extends
BaseAccessMode {
writers.put(entry.getKey(), entry.getValue());
}
-for (final Map.Entry entry : metodWriters.entrySet()) {
+for (final Map.Entry entry : methodWriters.entrySet())
{
final Method mr =
MethodAccessMode.MethodDecoratedType.class.cast(entry.getValue()).getMethod();
final String fieldName =
BeanUtil.decapitalize(mr.getName().startsWith("is") ? mr.getName().substring(2)
: mr.getName().substring(3));
final Field f = getField(fieldName, clazz);
[johnzon] 02/02: feat: field visibilty buggy for booleans and not compliant with specification
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 2553ab22f38a40e0f26f699ea8bb0e76ea4aa896
Author: Jean-Louis Monteiro
AuthorDate: Wed Oct 11 09:48:43 2023 +0200
feat: field visibilty buggy for booleans and not compliant with
specification
Signed-off-by: Jean-Louis Monteiro
---
.../jsonb/DefaultPropertyVisibilityStrategy.java | 15 ++-
.../DefaultPropertyVisibilityStrategyTest.java | 114 +
2 files changed, 124 insertions(+), 5 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategy.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategy.java
index 919a895c..67ea85c5 100644
---
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategy.java
+++
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategy.java
@@ -50,6 +50,11 @@ class DefaultPropertyVisibilityStrategy implements
jakarta.json.bind.config.Prop
return strategy == this ? isFieldVisible(field, root, useGetter) :
strategy.isVisible(field);
}
+/**
+ * If the field is not public then it's of course not visible. If the
field is public then we need to look at the
+ * accessors. If there is a private/protected/default accessor for it then
it overrides and the field is not visible
+ * But if there is no accessor for it, then it's visible.
+ */
private boolean isFieldVisible(final Field field, final Class root,
final boolean useGetter) {
if (!Modifier.isPublic(field.getModifiers())) {
return false;
@@ -57,16 +62,16 @@ class DefaultPropertyVisibilityStrategy implements
jakarta.json.bind.config.Prop
// 3.7.1. Scope and Field access strategy
// note: we should bind the class since a field of a parent class can
have a getter in a child
if (!useGetter) {
-return !hasMethod(root, BeanUtil.setterName(field.getName()));
+return !hasMethod(root, BeanUtil.setterName(field.getName()),
field.getType());
}
-final String capitalizedName = BeanUtil.capitalize(field.getName());
-return !hasMethod(root, "get" + capitalizedName) || hasMethod(root,
"is" + capitalizedName);
+return !hasMethod(root, BeanUtil.getterName(field.getName(),
field.getType()));
}
private boolean hasMethod(Class clazz, String methodName, Class...
paramTypes) {
try {
-clazz.getDeclaredMethod(methodName, paramTypes);
-return true;
+final Method declaredMethod = clazz.getDeclaredMethod(methodName,
paramTypes);
+return !Modifier.isPublic(declaredMethod.getModifiers());
+
} catch (NoSuchMethodException e) {
final Class superclass = clazz.getSuperclass();
if (superclass == Object.class) {
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategyTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategyTest.java
index 25e9b5f4..ac32834b 100644
---
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategyTest.java
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultPropertyVisibilityStrategyTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.johnzon.jsonb;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -57,6 +58,61 @@ public class DefaultPropertyVisibilityStrategyTest {
}
}
+@Test
+public void matchingPrivateAccessors() throws Exception {
+try (final Jsonb jsonb = JsonbBuilder.create()) {
+assertEquals("{}", jsonb.toJson(new
PublicFieldWithPrivateAccessors()));
+assertEquals("{}", jsonb.toJson(new
PublicBooleanFieldWithPrivateAccessors()));
+
+{
+final PublicFieldWithPrivateAccessors unmarshalledObject =
+jsonb.fromJson("{\"foo\":\"bad\"}",
PublicFieldWithPrivateAccessors.class);
+assertEquals("bar", unmarshalledObject.foo);
+}
+{
+final PublicBooleanFieldWithPrivateAccessors
unmarshalledObject =
+jsonb.fromJson("{\"foo\":\"false\"}",
PublicBooleanFieldWithPrivateAccessors.class);
+assertEquals(true, unmarshalledObject.foo);
+}
+}
+}
+
+@Test
+public void noMatchingPrivateAccessors() throws Exception {
+try (final Jsonb jsonb = JsonbBuilder.create()) {
+assertEquals("{\"foo\":\"bar\"}", jsonb.toJ
[johnzon] branch master updated (0d82bba5 -> 2553ab22)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 0d82bba5 disable challenged TCK test for now new 69792c97 fix: typo new 2553ab22 feat: field visibilty buggy for booleans and not compliant with specification 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: .../jsonb/DefaultPropertyVisibilityStrategy.java | 15 ++- .../DefaultPropertyVisibilityStrategyTest.java | 114 + .../mapper/access/FieldAndMethodAccessMode.java| 6 +- 3 files changed, 127 insertions(+), 8 deletions(-)
[johnzon] branch master updated (01ac65b5 -> f7c83d5a)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 01ac65b5 fix: move tck under a specific profile while we are still working on it, so we can merge the PR and keep working new 1595f51e Implement JsonParser#currentEvent() new 6d09e7e9 Implement JsonProvider#createValue(Number) new 9c1b209e Implement JsonConfig.KEY_STRATEGY config property new 9a4e77b7 Don't close underlying stream in JsonGenerator#close(), fixes jsonGeneratorStreamNotClosedTest new 911ea549 Clear attributes in JsonObjectBuilder#build(), fixes jsonObjectBuilderBuildTest new 128fecbd Revert renaming RejectDuplicateKeysMode and it's values new 116c7141 RejectDuplicateKeysMode: actually use default as default new f7c83d5a Merge pull request #110 from jungm/jsonp-2.1 The 1010 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/johnzon/core/JsonArrayBuilderImpl.java | 3 +- .../org/apache/johnzon/core/JsonGeneratorImpl.java | 2 +- .../apache/johnzon/core/JsonInMemoryParser.java| 5 ++ .../apache/johnzon/core/JsonObjectBuilderImpl.java | 4 +- .../org/apache/johnzon/core/JsonProviderImpl.java | 7 ++- .../apache/johnzon/core/JsonStreamParserImpl.java | 12 +++-- .../johnzon/core/RejectDuplicateKeysMode.java | 10 +++- .../johnzon/core/JsonInMemoryParserTest.java | 57 ++ .../johnzon/core/JsonObjectBuilderImplTest.java| 31 .../org/apache/johnzon/core/JsonProviderTest.java | 10 .../apache/johnzon/core/JsonReaderImplTest.java| 30 .../johnzon/core/JsonStreamParserImplTest.java | 31 12 files changed, 193 insertions(+), 9 deletions(-) create mode 100644 johnzon-core/src/test/java/org/apache/johnzon/core/JsonInMemoryParserTest.java
[johnzon] branch master updated (8afb7cf3 -> 01ac65b5)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from 8afb7cf3 fix: move tck under a specific profile while we are still working on it, so we can merge the PR and keep working add 01ac65b5 fix: move tck under a specific profile while we are still working on it, so we can merge the PR and keep working No new revisions were added by this update. Summary of changes: pom.xml | 1 - 1 file changed, 1 deletion(-)
[johnzon] branch master updated (b7fa3449 -> 8afb7cf3)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from b7fa3449 Merge pull request #98 from apache/jakartaee-10-tck add 8afb7cf3 fix: move tck under a specific profile while we are still working on it, so we can merge the PR and keep working No new revisions were added by this update. Summary of changes: pom.xml | 7 +++ 1 file changed, 7 insertions(+)
[johnzon] branch master updated (e59399f0 -> b7fa3449)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from e59399f0 Merge pull request #109 from SingingBush/chore/update_maven_plugins add f9c8cf69 Jakarta EE 10 TCK setup add 5cbc9dc9 Fix Nillable for fields and set the local for TCK to be independent from the platform running the suite add 32622331 don't serialize BigInteger/BigDecimal as strings in jsonb add dc6b2055 serialize BigInteger/BigDecimal as strings by default in jsonb add 2e50c9fc set system properties for TCKs add e90ad82f Merge pull request #103 from jungm/jsonb-bigintdecimal add 1339ef5e Workaround so TCKs detect when OWB isn't started add 4baa2681 fix package name add ab4ce2a5 Merge pull request #104 from jungm/jakartaee-10-tck-cdi add 0e644189 Fix NumberFormatCustomizationTest when running on jdk 13+ add 7751e40d Merge pull request #107 from jungm/jakartaee-10-tck-numberformat add f8b677df upgrade to OWB-4.0.0 add 93b1ad57 Fix pluggability (JSON-P) and SigTests TCK add 10fefa72 Merge pull request #111 from jungm/fix-pluggability-sigtests add b7fa3449 Merge pull request #98 from apache/jakartaee-10-tck No new revisions were added by this update. Summary of changes: johnzon-jsonb/pom.xml | 23 .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 10 ++ .../org/apache/johnzon/jsonb/JsonbAccessMode.java | 20 +-- .../org/apache/johnzon/jsonb/JsonbTypesTest.java | 59 +++- .../org/apache/johnzon/mapper/MapperBuilder.java | 10 ++ .../johnzon/mapper/map/LazyConverterMap.java | 28 ++-- pom.xml| 5 +- tck/jsonb/pom.xml | 113 .../johnzon/jsonb/tck/JohnzonOwbCDIProvider.java | 26 ++-- .../jakarta.enterprise.inject.spi.CDIProvider | 1 + tck/jsonp/pom.xml | 148 + tck/pom.xml| 82 12 files changed, 461 insertions(+), 64 deletions(-) create mode 100644 tck/jsonb/pom.xml copy johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/model/packageformat/FormatOnClassModel.java => tck/jsonb/src/test/java/org/apache/johnzon/jsonb/tck/JohnzonOwbCDIProvider.java (58%) create mode 100644 tck/jsonb/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.CDIProvider create mode 100644 tck/jsonp/pom.xml create mode 100644 tck/pom.xml
[johnzon] branch master updated: updating maven plugins
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 63ea017f updating maven plugins new e59399f0 Merge pull request #109 from SingingBush/chore/update_maven_plugins 63ea017f is described below commit 63ea017fc188aa942da984fa757478ae93aa09fa Author: singingbush AuthorDate: Sat Sep 2 10:48:29 2023 +0100 updating maven plugins --- pom.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 60ff841c..eaa8a78d 100644 --- a/pom.xml +++ b/pom.xml @@ -113,32 +113,32 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.0 org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 org.apache.maven.plugins maven-surefire-report-plugin - 3.0.0-M7 + 3.1.2 org.apache.maven.plugins @@ -148,7 +148,7 @@ org.apache.maven.plugins maven-release-plugin - 3.0.0-M6 + 3.0.1 org.apache.maven.plugins @@ -164,17 +164,17 @@ org.apache.maven.plugins maven-pmd-plugin - 3.19.0 + 3.21.0 org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.1 + 3.4.5 org.codehaus.mojo versions-maven-plugin - 2.14.2 + 2.16.0 org.codehaus.mojo
[johnzon] branch jakartaee-10-tck updated: Fix pluggability (JSON-P) and SigTests TCK
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee-10-tck
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/jakartaee-10-tck by this push:
new 93b1ad57 Fix pluggability (JSON-P) and SigTests TCK
new 10fefa72 Merge pull request #111 from jungm/fix-pluggability-sigtests
93b1ad57 is described below
commit 93b1ad578dc0293747e13b2e509ea671f88e7e91
Author: Markus Jung
AuthorDate: Tue Sep 26 13:34:40 2023 +0200
Fix pluggability (JSON-P) and SigTests TCK
---
tck/jsonb/pom.xml | 25 ++-
tck/jsonp/pom.xml | 74 +++
tck/pom.xml | 45 +
3 files changed, 106 insertions(+), 38 deletions(-)
diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml
index 80dd5ef2..d12bbfd0 100644
--- a/tck/jsonb/pom.xml
+++ b/tck/jsonb/pom.xml
@@ -77,13 +77,12 @@
-
-
-src/test/resources
-true
-
-
+
+org.apache.maven.plugins
+maven-dependency-plugin
+
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -94,16 +93,10 @@
jakarta.json.bind:jakarta.json.bind-tck
-
-ee.jakarta.tck.json.bind.**
-
-
+
-
${project.build.outputDirectory}
+${project.build.directory}/jimage
+
${project.build.directory}/signaturedirectory/jakarta.json.bind-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming
false
@@ -117,6 +110,4 @@
-
-
diff --git a/tck/jsonp/pom.xml b/tck/jsonp/pom.xml
index 88f9536f..8b5c0480 100644
--- a/tck/jsonp/pom.xml
+++ b/tck/jsonp/pom.xml
@@ -34,11 +34,6 @@
jakarta.json
jakarta.json-api
-
- org.apache.johnzon
- johnzon-core
- ${project.version}
-
jakarta.json
@@ -53,6 +48,12 @@
test
+
+ org.apache.johnzon
+ johnzon-core
+ ${project.version}
+
+
org.apache.openwebbeans
openwebbeans-se
@@ -85,29 +86,60 @@
+
+org.apache.maven.plugins
+maven-dependency-plugin
+
+
org.apache.maven.plugins
maven-surefire-plugin
-3.0.0-M7
+${surefire.version}
false
1
-
-jakarta.json:jakarta.json-tck-tests
-
jakarta.json:jakarta.json-tck-tests-pluggability
-
-
-ee.jakarta.tck.jsonp.**
-
-
-
-
${project.build.outputDirectory}
-
+
+
+
+
+tck-pluggability
+
+
+ test
+
+
+
+
jakarta.json:jakarta.json-tck-tests-pluggability
+
+
+
jakarta.json:jakarta.json-tck-tests
+
+
+
+
+
+tck
+
+
+ test
+
+
+
+
jakarta.json:jakarta.json-tck-tests
+
+
+${project.build.directory}/jimage
+
${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming
+
+
+
+
jakarta.json:jakarta.json-tck-tests-pluggability
+
+
+
+
diff --git a/tck/pom.xml b/tck/pom.xml
index 56e7bdf2..01aff41b 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -34,4 +34,49 @@
jsonp
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 3.2.0
+
+
+ copy
+ generate-test-resources
+
+copy
+
+
+
+
+
+jakarta.json
+jakarta.json-api
+${jakarta-jsonp-api.version}
+jar
+true
+
${project.build.directory}/signaturedirectory
+jakarta.json-api.jar
+
+
+
+jakarta.json.bind
+jakarta.json.bind-api
+${jakarta-jsonb-api.version}
+jar
+true
+
${project.build.directory}/signaturedirectory
+jakarta.json.bind-api.jar
+
+
+
+
+
+
+
+
+
+
[johnzon] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git commit ac4c36057bb04b9b25abf170051209da7f00cd8e Author: Jean-Louis Monteiro AuthorDate: Mon Jun 19 21:03:30 2023 +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-jsonp-strict/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 | 6 +++--- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 5b593099..ef1543eb 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 1b48e341..5e7ed731 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 49df0a0c..61db89d8 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 3e6b3140..1c64a1df 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index fe3fb554..e6f0a254 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index d14e3d6f..7ec92bb9 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index f38210cc..c33b751a 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 25e7b237..fd393445 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 2fc84628..94b80620 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 24540354..e3d593ff 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 4d742c8a..b9cc26a1 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 00d233fc..1a7b3af7 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.21 +1.2.22-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 15dc9e58..38f9afe6 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.21 + 1.2.22-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -38,7 +38,7 @@ UTF-8 UTF-8 -1687201285 +1687201409 1.8 1.8 @@ -584,7 +584,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.21 +HEAD
[johnzon] branch johnzon-1.2.x updated (d8d00d28 -> ac4c3605)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git from d8d00d28 fix: issue with cherry-pick conflicts resolution add 21966085 [maven-release-plugin] prepare release v1.2.21 new ac4c3605 [maven-release-plugin] prepare for next development iteration 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: 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-jsonp-strict/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 ++-- 13 files changed, 14 insertions(+), 14 deletions(-)
svn commit: r62694 - /release/johnzon/johnzon-1.2.21/
Author: jlmonteiro Date: Tue Jun 27 13:51:44 2023 New Revision: 62694 Log: vote passed for Apache Johnzon 1.2.21 Added: release/johnzon/johnzon-1.2.21/ release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz (with props) release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.asc release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.sha512 release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip (with props) release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.asc release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.sha512 release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-src.tar.gz (with props) release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-src.tar.gz.asc release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-src.tar.gz.sha512 release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-src.zip (with props) release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-src.zip.asc release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-src.zip.sha512 Added: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.asc == --- release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.asc (added) +++ release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.asc Tue Jun 27 13:51:44 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmSQqGAACgkQNYgHxStL +DiPe8BAAnK6L9H46vmNluEqkezuK/pugogokt1mvwKWZ8NLB6a2t5F/qcYHsF8Ms +zFRDYFH/0Xv8HCQXR5amdHm8NaPw7ID9jhj+m03vYRT3DtWfMwZqNeES7FIUGB0A +eq1OBsX9VuGAzrD98JuRigrX6+NhQ+xsq1QoQB7iOYXdmM42P4EjbgxuxwC3dpd0 +rYOIzhrSaur20YcVi8CwklxdjHpeUibQwi5HOoCkuD0IGUmr8UnkIeLDAP0Rudjb +SsxuOTOdUMJEugNoOR+kH+L4Py8yI01h5nOZXv7VHOhIPEkeTUp4mdMaFFUwyNIH +mPzFD6AkiiIoCs1+DyJSQW+ZONiBEPc7XYIz2Q9dce25+IK07S8ski6EbDjnop1E +kjnpwVdRU3g3Xktp3rgBMUQUef/x5G0IXr7hQKoz9brvoOYaQPtYUB07LhT/KltW +zwKLoyXWyI6Zztm2LBdSEILgW5AbZ1n5m/281sMFqohych4eke6reEsCE/sYUKbR +3tz0e+58SWCJH4WJ8XZIvYZ3GWK3f7d1D/gZ9GPwuSFxkhu8XkGHQ83mgaN4wXV0 +iy3lmwdSjQXx1T+BDF4mDnNcHep8MfH7T0wy2076G7kFunmBWxE+fRD2X76yGowJ +F1iovTRoxD7PYPzpT9Zcq3d4cNKRHcQLsyn5YpdDmmGix+6+JGI= +=IDxI +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.sha512 == --- release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.sha512 (added) +++ release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.tar.gz.sha512 Tue Jun 27 13:51:44 2023 @@ -0,0 +1 @@ +392b4aaa25d5b1b55e1e59b804eb648f655fef1b48642d5c43933cbf1f2aef608c42580b937dce4bfcc5bf92c9628b94413a10be222f7546c1f85c370554b7cc apache-johnzon-1.2.21-bin.tar.gz Added: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.asc == --- release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.asc (added) +++ release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.asc Tue Jun 27 13:51:44 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmSQqGAACgkQNYgHxStL +DiN+tBAAjhiN3sKBqL3/jts6iMRgm1UklDcNY+ILrC1ZpdF+/uFlVA+ruf1pDk01 +CbKcFKDd7s0z48ALTZi0gphtOw0m87+wjCzt4z09KqJYbsU9S5NXOmj8caVDID18 +5KOhTqu/3G4FA45Syh2Bf9NaLnIy8uetLvKSe5JSFQjLxx+IxlGDQZCVC8ONDodY +fOVVxz1DWWzSfVqadXnrlX8n7MSqIbonuLf4A42AFVEypDvK+rvDa4fDRGNi8ifM +0Q9d4z83KdG3b/x6wTjC+xcY5p4kO0qhHx9pBMK5BWWMV1ENGaxBQrPnIpcIUQcK +E3mJsVa5psZyeQ3iczkvsDlEUQaYvyV+3zffLilROm33KvX85KFox7fyNTwIHdO7 +Wo6b9Io96rvO/yl96epMTcTK8D/nF1A4mtbT+cfQjz8S9T+F6fbijjgLpQUiPzvA +TUYv0yod5HtUDOESl1BIcg0CTzLfRM/cLDql+Wjhky4ewvp6iyd3MZpr4hC/EIv2 +h4RHxGcERHeeHbUGloQ1Dnhxhd4DEvBCIDhmtMCuep4t7761jwPPrW+BWOJxkebH +4AjZHj/KuJRB73I8K601oUMPhuq6joddyc+ghDhzogBlHwhyZQ0oyFZtbm+srLIu +qPBCQUSq58pnT9rckEgFX761WzXyEDb4cZF7G5iCTc0/wXvlEME= +=X43w +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.sha512 == --- release/johnzon/johnzon-1.2.21/apache-johnzon-1.2.21-bin.zip.sha512 (added) +++ release/johnzon
svn commit: r62693 - in /dev/johnzon: apache-johnzon-1.2.21-src.tar.gz apache-johnzon-1.2.21-src.tar.gz.asc apache-johnzon-1.2.21-src.tar.gz.sha512
Author: jlmonteiro Date: Tue Jun 27 13:47:38 2023 New Revision: 62693 Log: vote passed for Apache Johnzon 1.2.21 Removed: dev/johnzon/apache-johnzon-1.2.21-src.tar.gz dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.asc dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.sha512
[johnzon] annotated tag v1.2.21 updated (21966085 -> 2f872d65)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to annotated tag v1.2.21 in repository https://gitbox.apache.org/repos/asf/johnzon.git *** WARNING: tag v1.2.21 was modified! *** from 21966085 (commit) to 2f872d65 (tag) tagging 2196608592aa973d29fd6c86360fe2d4366575df (commit) replaces v1.2.20 by Jean-Louis Monteiro on Mon Jun 19 21:03:29 2023 +0200 - Log - [maven-release-plugin] copy for tag v1.2.21 --- No new revisions were added by this update. Summary of changes:
svn commit: r62495 - in /dev/johnzon: apache-johnzon-1.2.19-src.zip apache-johnzon-1.2.19-src.zip.asc apache-johnzon-1.2.19-src.zip.sha512 apache-johnzon-1.2.21-src.tar.gz apache-johnzon-1.2.21-src.ta
Author: jlmonteiro Date: Mon Jun 19 19:15:15 2023 New Revision: 62495 Log: Apache Johnzon 1.2.21 up for VOTE Added: dev/johnzon/apache-johnzon-1.2.21-src.tar.gz (with props) dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.asc dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.sha512 Removed: dev/johnzon/apache-johnzon-1.2.19-src.zip dev/johnzon/apache-johnzon-1.2.19-src.zip.asc dev/johnzon/apache-johnzon-1.2.19-src.zip.sha512 Added: dev/johnzon/apache-johnzon-1.2.21-src.tar.gz == Binary file - no diff available. Propchange: dev/johnzon/apache-johnzon-1.2.21-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.asc == --- dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.asc (added) +++ dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.asc Mon Jun 19 19:15:15 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIyBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmSQqGAACgkQNYgHxStL +DiOqmQ/2KuD5f3d8mGVWO8oz8LWmhPUBmJS3RV08EtdTOd2jBwfu0y8NOrcuQmPw +k4kQBixWB/7DIcqBKalxTQxMrmRtB4IZfLJNFiAsywM8JEzxsLVMER5JqoSBNMu7 +56p2ooFjLg/k1uOPAykj3cibdunCN2DpAhLH6LIlRMLbO6vInHRKaLkeaULUJM5W +HxILmZWPwR/yhuTZIqsiRT8e0dKhb+UgL4DGxWu4jZfgOG0PCRf4mMZJwez82Uby +qzqvDa9owqDYNDuuUJPdehthZQCbEsQUlrQfFGrmAuRcoudaWbOLG09ZXoFfYHX5 ++mD9h8qxmzBLSlhjj6iiiEqCGO9QIwLznwo4dFEYVQgY4hwAx45GfgZWTNyQhpV3 +DrpOEcNWebif7z/j6dryQm+d8qzMZNbeZTBKCP1rS2aBhEh4Eztzo/D8sq/wt9tg +8fDcDFlAYLgco6Ils+3iS0e9WNwOO8Qj/Uzmow6XfyjTB6lwCiNG06rZziWF/nGS +htrnKxp9z2RbvrFKlk8kx/FrNIs6ccf2aSo/79a4MyJYZ2WDLeSRcvrAOenWAvCh +Gz3Ydh4lGy27urAT0axTMczxBqLzoIzZTImpY+ZuMu1nuAWW+cWZ9iOxLa/+wutE +/P2cjTBIjJzJ03NtKna0WLahvQ6GavsI5zxk6cCPnWF5ShFi1w== +=iKIX +-END PGP SIGNATURE- Added: dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.sha512 == --- dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.sha512 (added) +++ dev/johnzon/apache-johnzon-1.2.21-src.tar.gz.sha512 Mon Jun 19 19:15:15 2023 @@ -0,0 +1 @@ +89d1592bb061e5893e09de0f74bf9ba922cc065826234dc35fb1c259c971def58492a545cfd75cb1bba2428c4d7a9d1af83dc721f7106fd035b18c3adfb4c0ac apache-johnzon-1.2.21-src.tar.gz
[johnzon] branch jakartaee-10-tck updated: Fix NumberFormatCustomizationTest when running on jdk 13+
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee-10-tck
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/jakartaee-10-tck by this push:
new 0e644189 Fix NumberFormatCustomizationTest when running on jdk 13+
new 7751e40d Merge pull request #107 from
jungm/jakartaee-10-tck-numberformat
0e644189 is described below
commit 0e644189e7dc92fd5e7a01bf9736cb5ecd829a8d
Author: Markus Jung
AuthorDate: Sun Jun 11 20:53:35 2023 +0200
Fix NumberFormatCustomizationTest when running on jdk 13+
---
tck/jsonb/pom.xml | 4
1 file changed, 4 insertions(+)
diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml
index 1d7cf9d4..e39b7e83 100644
--- a/tck/jsonb/pom.xml
+++ b/tck/jsonb/pom.xml
@@ -138,8 +138,12 @@
${project.build.outputDirectory}
+
false
false
+
+
+COMPAT
-Duser.language=en -Duser.region=US
[johnzon] 09/11: fix: Update versions
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 83b7773a160274fb8368bd0edbd0c0557872eec4
Author: Jean-Louis Monteiro
AuthorDate: Mon May 22 11:05:42 2023 +0200
fix: Update versions
Signed-off-by: Jean-Louis Monteiro
---
johnzon-websocket/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index 98d7430f..4e365f31 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -29,8 +29,8 @@
Johnzon :: WebSocket
-8.5.9
-8.0.1
+8.5.57
+8.0.13
${project.parent.reporting.outputDirectory}
[johnzon] 10/11: fix: use the right import for this branch (cherry-pick issue)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git commit a2a1fe919ce266fdd39879eab9fa629e5347217c Author: Jean-Louis Monteiro AuthorDate: Mon May 22 11:06:09 2023 +0200 fix: use the right import for this branch (cherry-pick issue) Signed-off-by: Jean-Louis Monteiro --- .../src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java index bce61fe8..0c3e6ebe 100644 --- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java +++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java @@ -16,7 +16,7 @@ */ package org.apache.johnzon.mapper.util; -import jakarta.json.spi.JsonProvider; +import javax.json.spi.JsonProvider; import org.apache.johnzon.core.JsonProviderImpl; import java.lang.reflect.Method;
[johnzon] 03/11: feat(JOHNZON-397): allow to configure the scale limit for backward compatibility
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit c64e3cc4e0ff22a75cc12b0ea15791feecfd5f72
Author: Jean-Louis Monteiro
AuthorDate: Thu May 11 21:07:44 2023 +0200
feat(JOHNZON-397): allow to configure the scale limit for backward
compatibility
---
.../src/main/java/org/apache/johnzon/core/JsonNumberImpl.java| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
index 4609aceb..57db2ca1 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
@@ -26,6 +26,7 @@ import java.math.BigInteger;
final class JsonNumberImpl implements JsonNumber, Serializable {
private final BigDecimal value;
private transient Integer hashCode = null;
+private static final int MAX_BIG_DECIMAL_SCALE =
toInt(System.getProperty("johnzon.max-big-decimal-scale", "1000"));
JsonNumberImpl(final BigDecimal decimal) {
if (decimal == null) {
@@ -123,13 +124,17 @@ final class JsonNumberImpl implements JsonNumber,
Serializable {
private void checkBigDecimalScale() {
// should be fine enough. Maybe we should externalize so users can
pick something better if they need to
// it becomes their responsibility to fix the limit and may expose
them to a DoS attack
-final int limit = 1_000;
+final int limit = MAX_BIG_DECIMAL_SCALE;
final int absScale = Math.abs(value.scale());
if (absScale > limit) {
throw new ArithmeticException(String.format(
-"BigDecimal scale (%d) magnitude exceeds maximum allowed (%d)",
+"BigDecimal scale (%d) limit exceeds maximum allowed (%d)",
value.scale(), limit));
}
}
+
+private static Integer toInt(final Object v) {
+return !Integer.class.isInstance(v) ? Integer.parseInt(v.toString()) :
Integer.class.cast(v);
+}
}
[johnzon] 08/11: fix: remove unnecessary configuration for recent JVMs
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 347c565559185858b15dbd826adf485de626d831
Author: Jean-Louis Monteiro
AuthorDate: Mon May 22 11:05:35 2023 +0200
fix: remove unnecessary configuration for recent JVMs
Signed-off-by: Jean-Louis Monteiro
---
johnzon-websocket/src/test/resources/arquillian.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/johnzon-websocket/src/test/resources/arquillian.xml
b/johnzon-websocket/src/test/resources/arquillian.xml
index 6312b912..1f2d9d0a 100644
--- a/johnzon-websocket/src/test/resources/arquillian.xml
+++ b/johnzon-websocket/src/test/resources/arquillian.xml
@@ -32,7 +32,6 @@
true
target/apache-tomee-remote
target/arquillian-test-working-dir
- ${arquillian.jvm.args}
[johnzon] branch johnzon-1.2.x updated (89ee9a36 -> d8d00d28)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git from 89ee9a36 [maven-release-plugin] prepare for next development iteration new 9f6ad214 fix(JOHNZON-397): protection against very slow BigDecimal to BigInteger conversion at large scale new 16460579 fix(JOHNZON-397): Create configuration option to set the BigDecimal scale limit new c64e3cc4 feat(JOHNZON-397): allow to configure the scale limit for backward compatibility new 8e2b2815 feat(JOHNZON-397): make sure to pass the provider instance so we can configure the scale per provider new 34ad9a6b fix(JOHNZON-397): sets the maxBigDecimalScale if it's our JsonProvider impl new 94998a12 fix: checkstyle new 33b59817 fix: classloading issues because the test jar has too much in it new 347c5655 fix: remove unnecessary configuration for recent JVMs new 83b7773a fix: Update versions new a2a1fe91 fix: use the right import for this branch (cherry-pick issue) new d8d00d28 fix: issue with cherry-pick conflicts resolution The 11 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/CommentsJsonStreamParserImpl.java | 12 ++-- .../apache/johnzon/core/JohnzonJsonParserImpl.java | 15 +++-- .../apache/johnzon/core/JsonArrayBuilderImpl.java | 25 .../johnzon/core/JsonBuilderFactoryImpl.java | 16 ++--- .../apache/johnzon/core/JsonInMemoryParser.java| 8 ++- .../apache/johnzon/core/JsonMergePatchDiff.java| 9 ++- .../apache/johnzon/core/JsonMergePatchImpl.java| 9 ++- .../org/apache/johnzon/core/JsonNumberImpl.java| 8 ++- .../apache/johnzon/core/JsonObjectBuilderImpl.java | 19 +++--- .../apache/johnzon/core/JsonParserFactoryImpl.java | 20 --- .../org/apache/johnzon/core/JsonProviderImpl.java | 47 +++ .../apache/johnzon/core/JsonReaderFactoryImpl.java | 14 +++-- .../org/apache/johnzon/core/JsonReaderImpl.java| 26 .../apache/johnzon/core/JsonStreamParserImpl.java | 15 ++--- .../org/apache/johnzon/core/JsonNumberTest.java| 56 -- .../johnzon/core/JsonParserStreamingTest.java | 3 +- .../org/apache/johnzon/core/JsonParserTest.java| 6 +- .../johnzon/core/JsonStreamParserImplTest.java | 8 +-- .../org/apache/johnzon/core/SerializationTest.java | 3 +- .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 15 +++-- .../org/apache/johnzon/mapper/MapperBuilder.java | 13 +++- .../org/apache/johnzon/mapper/MapperConfig.java| 11 +++- .../johnzon/mapper/util/JsonProviderUtil.java | 69 ++ .../apache/johnzon/mapper/MapperConfigTest.java| 2 +- .../test/java/org/superbiz/ExtendMappingTest.java | 4 +- johnzon-websocket/pom.xml | 4 +- .../org/apache/johnzon/websocket/JsrCodecTest.java | 9 +-- .../apache/johnzon/websocket/MapperCodecTest.java | 22 +++ .../src/test/resources/arquillian.xml | 1 - 29 files changed, 328 insertions(+), 141 deletions(-) create mode 100644 johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
[johnzon] 04/11: feat(JOHNZON-397): make sure to pass the provider instance so we can configure the scale per provider
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 8e2b28157314b2b264be039371be24f1ca372cbb
Author: Jean-Louis Monteiro
AuthorDate: Sat May 13 09:54:19 2023 +0200
feat(JOHNZON-397): make sure to pass the provider instance so we can
configure the scale per provider
---
.../johnzon/core/CommentsJsonStreamParserImpl.java | 12 ++---
.../apache/johnzon/core/JohnzonJsonParserImpl.java | 15 --
.../apache/johnzon/core/JsonArrayBuilderImpl.java | 25 +-
.../johnzon/core/JsonBuilderFactoryImpl.java | 16 +++---
.../apache/johnzon/core/JsonInMemoryParser.java| 8 ++-
.../apache/johnzon/core/JsonMergePatchDiff.java| 9 ++--
.../apache/johnzon/core/JsonMergePatchImpl.java| 9 ++--
.../org/apache/johnzon/core/JsonNumberImpl.java| 26 +++---
.../apache/johnzon/core/JsonObjectBuilderImpl.java | 19 +---
.../apache/johnzon/core/JsonParserFactoryImpl.java | 20
.../org/apache/johnzon/core/JsonProviderImpl.java | 57 +-
.../apache/johnzon/core/JsonReaderFactoryImpl.java | 14 +++---
.../org/apache/johnzon/core/JsonReaderImpl.java| 26 +-
.../apache/johnzon/core/JsonStreamParserImpl.java | 15 +++---
.../org/apache/johnzon/core/JsonNumberTest.java| 6 +--
.../johnzon/core/JsonParserStreamingTest.java | 3 +-
.../org/apache/johnzon/core/JsonParserTest.java| 6 +--
.../johnzon/core/JsonStreamParserImplTest.java | 8 +--
.../org/apache/johnzon/core/SerializationTest.java | 3 +-
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 12 ++---
.../apache/johnzon/mapper/MapperConfigTest.java| 2 +-
.../test/java/org/superbiz/ExtendMappingTest.java | 4 +-
22 files changed, 171 insertions(+), 144 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
index f9d298e6..fb199bda 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
@@ -27,8 +27,8 @@ public class CommentsJsonStreamParserImpl extends
JsonStreamParserImpl {
final int maxStringLength,
final
BufferStrategy.BufferProvider bufferProvider,
final
BufferStrategy.BufferProvider valueBuffer,
-final boolean autoAdjust) {
-super(inputStream, maxStringLength, bufferProvider, valueBuffer,
autoAdjust);
+final boolean autoAdjust, final
JsonProviderImpl provider) {
+super(inputStream, maxStringLength, bufferProvider, valueBuffer,
autoAdjust, provider);
}
public CommentsJsonStreamParserImpl(final InputStream inputStream,
@@ -36,16 +36,16 @@ public class CommentsJsonStreamParserImpl extends
JsonStreamParserImpl {
final int maxStringLength,
final
BufferStrategy.BufferProvider bufferProvider,
final
BufferStrategy.BufferProvider valueBuffer,
-final boolean autoAdjust) {
-super(inputStream, encoding, maxStringLength, bufferProvider,
valueBuffer, autoAdjust);
+final boolean autoAdjust, final
JsonProviderImpl provider) {
+super(inputStream, encoding, maxStringLength, bufferProvider,
valueBuffer, autoAdjust, provider);
}
public CommentsJsonStreamParserImpl(final Reader reader,
final int maxStringLength,
final
BufferStrategy.BufferProvider bufferProvider,
final
BufferStrategy.BufferProvider valueBuffer,
-final boolean autoAdjust) {
-super(reader, maxStringLength, bufferProvider, valueBuffer,
autoAdjust);
+final boolean autoAdjust, final
JsonProviderImpl provider) {
+super(reader, maxStringLength, bufferProvider, valueBuffer,
autoAdjust, provider);
}
@Override
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
index 61cb7080..16d26400 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
@@ -50,6 +50,13 @@ public abstract class JohnzonJsonParserImpl implements
JohnzonJsonParser {
private boolean manualNext = false
[johnzon] 06/11: fix: checkstyle
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 94998a129931e1a2afdab1c981fa1b0f0c4111db
Author: Jean-Louis Monteiro
AuthorDate: Tue May 16 11:01:22 2023 +0200
fix: checkstyle
Signed-off-by: Jean-Louis Monteiro
---
.../main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
index 45f05712..bce61fe8 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
@@ -55,7 +55,9 @@ public final class JsonProviderUtil {
* @param value the max big decimal scale to set on the provider
*/
public static void setMaxBigDecimalScale(final JsonProvider provider,
final int value) {
-if
(!"org.apache.johnzon.core.JsonProviderImpl".equals(provider.getClass().getName()))
return;
+if
(!"org.apache.johnzon.core.JsonProviderImpl".equals(provider.getClass().getName()))
{
+return;
+}
try {
SET_MAX_BIG_DECIMAL_SCALE.invoke(provider, value);
[johnzon] 07/11: fix: classloading issues because the test jar has too much in it
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 33b59817dea27053ca3d5cff5e2bd3d970775314
Author: Jean-Louis Monteiro
AuthorDate: Mon May 22 11:04:47 2023 +0200
fix: classloading issues because the test jar has too much in it
Signed-off-by: Jean-Louis Monteiro
---
.../org/apache/johnzon/websocket/JsrCodecTest.java | 9 +++--
.../apache/johnzon/websocket/MapperCodecTest.java | 22 +-
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git
a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
index 11d77902..567e5abb 100644
---
a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
+++
b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.johnzon.websocket;
-import org.apache.johnzon.core.JsonProviderImpl;
import org.apache.johnzon.websocket.endpoint.JsrClientEndpointImpl;
import org.apache.johnzon.websocket.endpoint.JsrServerEndpointImpl;
import org.apache.johnzon.websocket.endpoint.Message;
@@ -37,16 +36,15 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.net.URI;
-import java.net.URL;
import javax.json.Json;
import javax.json.JsonObject;
import javax.websocket.CloseReason;
import javax.websocket.ContainerProvider;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
+import java.net.URI;
+import java.net.URL;
-import static org.apache.openejb.loader.JarLocation.jarLocation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -59,8 +57,7 @@ public class JsrCodecTest {
.addAsLibraries(
ShrinkWrap.create(JavaArchive.class,
"johnzon-websocket.jar")
.addClasses(FactoryLocator.class,
JsrDecoder.class, JsrEncoder.class, JsrObjectDecoder.class,
JsrObjectEncoder.class)
-.addPackages(true,
JsonProviderImpl.class.getPackage()))
-.addAsLibrary(jarLocation(Json.class));
+ );
}
@ArquillianResource
diff --git
a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
index 2dcc2090..e042cc81 100644
---
a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
+++
b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.johnzon.websocket;
-import org.apache.johnzon.core.JsonProviderImpl;
-import org.apache.johnzon.mapper.Mapper;
import org.apache.johnzon.mapper.MapperBuilder;
import org.apache.johnzon.websocket.endpoint.ClientEndpointImpl;
import org.apache.johnzon.websocket.endpoint.Message;
@@ -40,15 +38,13 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.net.URI;
-import java.net.URL;
-import javax.json.Json;
import javax.websocket.CloseReason;
import javax.websocket.ContainerProvider;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
+import java.net.URI;
+import java.net.URL;
-import static org.apache.openejb.loader.JarLocation.jarLocation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -57,13 +53,13 @@ public class MapperCodecTest {
@Deployment(testable = false)
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class, "codec.war")
-.addClasses(ServerEndpointImpl.class, ServerReport.class,
Message.class)
-.addAsLibrary(
-ShrinkWrap.create(JavaArchive.class,
"johnzon-websocket.jar")
-.addClasses(MapperLocator.class,
MapperLocatorDelegate.class, IgnoreIfMissing.class, JohnzonTextDecoder.class,
JohnzonTextEncoder.class)
-.addPackages(true,
JsonProviderImpl.class.getPackage())
-.addPackages(true, Mapper.class.getPackage()))
-.addAsLibrary(jarLocation(Json.class));
+ .addClasses(ServerEndpointImpl.class,
ServerReport.class, Message.class)
+ .addAsLibrary(
+ ShrinkWrap.create(JavaArchive.class,
"johnzon-websocket.jar")
+ .addClasses(MapperLocator.class,
MapperLocatorDelegate.class,
+ IgnoreIf
[johnzon] 11/11: fix: issue with cherry-pick conflicts resolution
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit d8d00d28a57a4ab1f6bd4b00b2d3d482f3cd9ac9
Author: Jean-Louis Monteiro
AuthorDate: Mon May 22 11:06:29 2023 +0200
fix: issue with cherry-pick conflicts resolution
Signed-off-by: Jean-Louis Monteiro
---
.../java/org/apache/johnzon/core/JsonProviderImpl.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
index 55101a32..d6b86921 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
@@ -18,6 +18,8 @@
*/
package org.apache.johnzon.core;
+import org.apache.johnzon.core.spi.JsonPointerFactory;
+
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
@@ -27,7 +29,9 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collection;
import java.util.Map;
+import java.util.ServiceLoader;
import java.util.function.Supplier;
+import java.util.stream.StreamSupport;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
@@ -52,6 +56,8 @@ import javax.json.stream.JsonGeneratorFactory;
import javax.json.stream.JsonParser;
import javax.json.stream.JsonParserFactory;
+import static java.util.Comparator.comparing;
+
public class JsonProviderImpl extends JsonProvider implements Serializable {
private final Supplier>
bufferProvider = new Cached<>(() ->
BufferStrategyFactory.valueOf(System.getProperty(AbstractJsonFactory.BUFFER_STRATEGY,
"QUEUE"))
@@ -64,7 +70,13 @@ public class JsonProviderImpl extends JsonProvider
implements Serializable {
private final Supplier builderFactory = new
Cached<>(() ->
new JsonBuilderFactoryImpl(null, bufferProvider.get(),
RejectDuplicateKeysMode.DEFAULT, this));
private int maxBigDecimalScale =
Integer.getInteger("johnzon.max-big-decimal-scale", 1_000);
+private final JsonPointerFactory jsonPointerFactory;
+public JsonProviderImpl() {
+jsonPointerFactory =
StreamSupport.stream(ServiceLoader.load(JsonPointerFactory.class).spliterator(),
false)
+
.min(comparing(JsonPointerFactory::ordinal))
+
.orElseGet(DefaultJsonPointerFactory::new);
+}
@Override
public JsonParser createParser(final InputStream in) {
return parserFactory.createParser(in);
@@ -204,7 +216,7 @@ public class JsonProviderImpl extends JsonProvider
implements Serializable {
@Override
public JsonPointer createPointer(String path) {
-return new JsonPointerImpl(this, path);
+return jsonPointerFactory.createPointer(this, path);
}
@Override
[johnzon] 02/11: fix(JOHNZON-397): Create configuration option to set the BigDecimal scale limit
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 164605799273a56d7ffcefc12d49e0913952d734
Author: Jean-Louis Monteiro
AuthorDate: Thu May 11 11:12:44 2023 +0200
fix(JOHNZON-397): Create configuration option to set the BigDecimal scale
limit
Signed-off-by: Jean-Louis Monteiro
---
.../src/main/java/org/apache/johnzon/core/JsonNumberImpl.java | 6 +++---
.../src/test/java/org/apache/johnzon/core/JsonNumberTest.java | 2 +-
.../main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java| 9 -
.../main/java/org/apache/johnzon/mapper/MapperBuilder.java| 8 +++-
.../src/main/java/org/apache/johnzon/mapper/MapperConfig.java | 11 +--
5 files changed, 28 insertions(+), 8 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
index e5891cf3..4609aceb 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
@@ -69,13 +69,13 @@ final class JsonNumberImpl implements JsonNumber,
Serializable {
@Override
public BigInteger bigIntegerValue() {
-checkBigIntegerScale();
+checkBigDecimalScale();
return value.toBigInteger();
}
@Override
public BigInteger bigIntegerValueExact() {
-checkBigIntegerScale();
+checkBigDecimalScale();
return value.toBigIntegerExact();
}
@@ -120,7 +120,7 @@ final class JsonNumberImpl implements JsonNumber,
Serializable {
}
}
-private void checkBigIntegerScale() {
+private void checkBigDecimalScale() {
// should be fine enough. Maybe we should externalize so users can
pick something better if they need to
// it becomes their responsibility to fix the limit and may expose
them to a DoS attack
final int limit = 1_000;
diff --git
a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
index 57bbd560..f3b6 100644
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
@@ -100,7 +100,7 @@ public class JsonNumberTest {
long start = System.nanoTime();
for (int i = 1; i < 100; i++) {
// if it takes a second in any machine, that's already too much
-// depends on the allowed scale in
JsonNumberImpl#checkBigIntegerScale
+// depends on the allowed scale in
JsonNumberImpl#checkBigDecimalScale
if (TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start)
> (30 * i)) {
fail("took too long: " +
TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start) + " s" +
" to compute " + i + " conversions toBigInteger");
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index 400dfcfa..46f99177 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -108,7 +108,10 @@ public class JohnzonBuilder implements JsonbBuilder {
// todo: global spec toggle to disable all these ones at once?
builder.setUseBigDecimalForObjectNumbers(
-
config.getProperty("johnzon.use-big-decimal-for-object").map(this::toBool).orElse(true));
+
config.getProperty("johnzon.use-big-decimal-for-object").map(this::toBool).orElse(true));
+builder.setMaxBigDecimalScale(
+
config.getProperty("johnzon.max-big-decimal-scale").map(this::toInt).orElse(1000));
+
builder.setSupportEnumContainerDeserialization( //
https://github.com/eclipse-ee4j/jakartaee-tck/issues/103
toBool(System.getProperty("johnzon.support-enum-container-deserialization",
config.getProperty("johnzon.support-enum-container-deserialization")
.map(String::valueOf).orElse("true";
@@ -361,6 +364,10 @@ public class JohnzonBuilder implements JsonbBuilder {
return !Boolean.class.isInstance(v) ?
Boolean.parseBoolean(v.toString()) : Boolean.class.cast(v);
}
+private Integer toInt(final Object v) {
+return !Integer.class.isInstance(v) ? Integer.parseInt(v.toString()) :
Integer.class.cast(v);
+}
+
private AccessMode toAccessMode(final Object s) {
if (String.class.isInstance(s)) {
try {
diff --git
a/johnzon-mapper/src/main/j
[johnzon] 01/11: fix(JOHNZON-397): protection against very slow BigDecimal to BigInteger conversion at large scale
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 9f6ad2146a1a85cf9c5899ba6de9d3a624999f38
Author: Jean-Louis Monteiro
AuthorDate: Wed May 10 23:19:41 2023 +0200
fix(JOHNZON-397): protection against very slow BigDecimal to BigInteger
conversion at large scale
Signed-off-by: Jean-Louis Monteiro
---
.../org/apache/johnzon/core/JsonNumberImpl.java| 15 ++
.../org/apache/johnzon/core/JsonNumberTest.java| 56 +++---
2 files changed, 65 insertions(+), 6 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
index 4a1f5232..e5891cf3 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonNumberImpl.java
@@ -69,11 +69,13 @@ final class JsonNumberImpl implements JsonNumber,
Serializable {
@Override
public BigInteger bigIntegerValue() {
+checkBigIntegerScale();
return value.toBigInteger();
}
@Override
public BigInteger bigIntegerValueExact() {
+checkBigIntegerScale();
return value.toBigIntegerExact();
}
@@ -117,4 +119,17 @@ final class JsonNumberImpl implements JsonNumber,
Serializable {
throw new ArithmeticException("Not an int/long, use other value
readers");
}
}
+
+private void checkBigIntegerScale() {
+// should be fine enough. Maybe we should externalize so users can
pick something better if they need to
+// it becomes their responsibility to fix the limit and may expose
them to a DoS attack
+final int limit = 1_000;
+final int absScale = Math.abs(value.scale());
+
+if (absScale > limit) {
+throw new ArithmeticException(String.format(
+"BigDecimal scale (%d) magnitude exceeds maximum allowed (%d)",
+value.scale(), limit));
+}
+}
}
diff --git
a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
index 2a2a12dc..57bbd560 100644
--- a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
+++ b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonNumberTest.java
@@ -26,7 +26,9 @@ import javax.json.JsonArray;
import javax.json.JsonNumber;
import java.io.StringReader;
import java.io.StringWriter;
+import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
@@ -62,20 +64,62 @@ public class JsonNumberTest {
@Test(expected=ArithmeticException.class)
public void testBigIntegerExact() {
-
JsonArray array = Json.createArrayBuilder().add(100.0200).build();
array.getJsonNumber(0).bigIntegerValueExact();
-
-
}
-
+
@Test
public void testBigInteger() {
-
JsonArray array = Json.createArrayBuilder().add(100.0200).build();
Assert.assertEquals(new BigInteger("100"),
array.getJsonNumber(0).bigIntegerValue());
+}
+
+@Test
+public void testSlowBigIntegerConversion() {
+JsonArray array = Json.createArrayBuilder()
+ .add(new BigDecimal("10e1000"))
+ .add(Double.MAX_VALUE)
+ .build();
+
+{ // for Double
+long start = System.nanoTime();
+for (int i = 1; i < 5; i++) {
+// if it takes a few seconds in any machine, that's already
too much
+if (TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start)
> (3 * i)) {
+fail("took too long: " +
TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start) + " s" +
+ " to compute " + i + " conversions toBigInteger");
+}
+
+array.getJsonNumber(1).bigIntegerValue();
+}
+long end = System.nanoTime();
+System.out.println("took: " + TimeUnit.NANOSECONDS.toMillis(end -
start) + " ms");
+}
+
+{ // for Number
+long start = System.nanoTime();
+for (int i = 1; i < 100; i++) {
+// if it takes a second in any machine, that's already too much
+// depends on the allowed scale in
JsonNumberImpl#checkBigIntegerScale
+if (TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - start)
> (30 * i)) {
+fail("took too long: " +
TimeUnit.NANOSE
[johnzon] 05/11: fix(JOHNZON-397): sets the maxBigDecimalScale if it's our JsonProvider impl
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 34ad9a6b296ae7b4667c3cf0037998e451499ea4
Author: Jean-Louis Monteiro
AuthorDate: Tue May 16 10:43:53 2023 +0200
fix(JOHNZON-397): sets the maxBigDecimalScale if it's our JsonProvider impl
Signed-off-by: Jean-Louis Monteiro
---
.../org/apache/johnzon/mapper/MapperBuilder.java | 5 +-
.../johnzon/mapper/util/JsonProviderUtil.java | 67 ++
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
index 013742cb..d58a4409 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
@@ -23,6 +23,7 @@ import static java.util.Collections.emptyMap;
import static java.util.Locale.ROOT;
// import org.apache.johnzon.core.JsonParserFactoryImpl; // don't depend on
core in mapper
+import org.apache.johnzon.mapper.util.JsonProviderUtil;
import org.apache.johnzon.mapper.access.AccessMode;
import org.apache.johnzon.mapper.access.BaseAccessMode;
import org.apache.johnzon.mapper.access.FieldAccessMode;
@@ -123,6 +124,7 @@ public class MapperBuilder {
provider = this.provider;
} else {
provider = JsonProvider.provider();
+JsonProviderUtil.setMaxBigDecimalScale(provider,
maxBigDecimalScale);
this.provider = provider;
}
final Map config = new HashMap();
@@ -141,7 +143,7 @@ public class MapperBuilder {
}
if (readerFactory == null) {
-config.remove(JsonGenerator.PRETTY_PRINTING); // doesnt mean
anything anymore for reader
+config.remove(JsonGenerator.PRETTY_PRINTING); // doesn't mean
anything anymore for reader
if (supportsComments) {
config.put("org.apache.johnzon.supports-comments", "true");
}
@@ -158,6 +160,7 @@ public class MapperBuilder {
}
} else if (this.provider == null) {
this.provider = JsonProvider.provider();
+JsonProviderUtil.setMaxBigDecimalScale(provider,
maxBigDecimalScale);
}
if (builderFactory == null) {
builderFactory = provider.createBuilderFactory(emptyMap());
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
new file mode 100644
index ..45f05712
--- /dev/null
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
@@ -0,0 +1,67 @@
+/*
+ * 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.mapper.util;
+
+import jakarta.json.spi.JsonProvider;
+import org.apache.johnzon.core.JsonProviderImpl;
+
+import java.lang.reflect.Method;
+
+/**
+ * ClassLoader related utils to avoid direct access to our JSON provider from
the mapper
+ */
+public final class JsonProviderUtil {
+
+private final static Method SET_MAX_BIG_DECIMAL_SCALE;
+
+static {
+try {
+SET_MAX_BIG_DECIMAL_SCALE =
+
JsonProviderImpl.class.getDeclaredMethod("setMaxBigDecimalScale", Integer.TYPE);
+SET_MAX_BIG_DECIMAL_SCALE.setAccessible(true);
+} catch (final NoSuchMethodException e) {
+throw new RuntimeException(e);
+}
+}
+
+private JsonProviderUtil() {
+// private utility class ct
+}
+
+/**
+ * Sets the max big decimal scale property on the given provider instance.
+ *
+ * This method is intentionally not receiving the property name, so we
know exactly what will be passed in and what
+ * the method is supposed to set on the provider.
+ *
+ * If the provider is not an instance of our JohnzonProviderImpl
(org.apache.johnzon.co
[johnzon] branch master updated: fix: typo in Johnzon name
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 b2827e59 fix: typo in Johnzon name b2827e59 is described below commit b2827e596fbe005f935b368a82f5990fdb04a5e0 Author: Jean-Louis Monteiro AuthorDate: Mon May 22 09:21:25 2023 +0200 fix: typo in Johnzon name Signed-off-by: Jean-Louis Monteiro --- src/site/markdown/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 324684d8..0cc87b82 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -369,13 +369,13 @@ You can use some optimization to map a `JsonObject` to a POJO using Johnzon `Jso
[johnzon] branch master updated: feat: improve error message for debugging
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro 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 a6d46679 feat: improve error message for debugging
a6d46679 is described below
commit a6d46679c5f1840e2c390f37ec243d1d79afbfbf
Author: Jean-Louis Monteiro
AuthorDate: Wed May 17 14:34:31 2023 +0200
feat: improve error message for debugging
---
.../main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java | 9 ++---
.../java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java | 9 +
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
index ed0b0eaf..56383f51 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonObjectBuilderImpl.java
@@ -182,9 +182,12 @@ class JsonObjectBuilderImpl implements JsonObjectBuilder,
Serializable {
return this;
}
-private void putValue(final String name, final JsonValue value){
-if(name == null || value == null) {
-throw new NullPointerException("name or value/builder must not be
null");
+private void putValue(final String name, final JsonValue value) {
+if(name == null) {
+throw new NullPointerException("name must not be null");
+}
+if(value == null) {
+throw new NullPointerException("value/builder must not be null for
name: " + name);
}
rejectDuplicateKeysMode.put().put(attributeMap, name, value);
}
diff --git
a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
index 99aa39f3..c57f94f5 100644
---
a/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
+++
b/johnzon-core/src/test/java/org/apache/johnzon/core/JsonObjectBuilderImplTest.java
@@ -133,6 +133,15 @@ public class JsonObjectBuilderImplTest {
builder.add("a", (Integer) null);
}
+@Test
+public void testNullCheckValueExceptionMessage() {
+final JsonObjectBuilder builder = Json.createObjectBuilder();
+try {
+builder.add("name", (JsonValue) null);
+} catch (final NullPointerException e) {
+assertEquals("value/builder must not be null for name: name",
e.getMessage());
+}
+}
@Test(expected = NullPointerException.class)
public void testNullCheckName() {
final JsonObjectBuilder builder = Json.createObjectBuilder();
[johnzon] branch master updated (aad59d60 -> c0ec8c4b)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from aad59d60 fix: CVE-2022-45868 new 046faf57 fix(JOHNZON-397): protection against very slow BigDecimal to BigInteger conversion at large scale new 1f15b27f fix(JOHNZON-397): Create configuration option to set the BigDecimal scale limit new 05569d38 feat(JOHNZON-397): allow to configure the scale limit for backward compatibility new db7ecfce feat(JOHNZON-397): make sure to pass the provider instance so we can configure the scale per provider new 6e29ba98 fix(JOHNZON-397): sets the maxBigDecimalScale if it's our JsonProvider impl new 7b0359f5 fix: checkstyle new c0ec8c4b Merge pull request #105 from jeanouii/JOHNZON-397_toBigIntegerProtection The 978 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/CommentsJsonStreamParserImpl.java | 12 ++-- .../apache/johnzon/core/JohnzonJsonParserImpl.java | 15 +++-- .../apache/johnzon/core/JsonArrayBuilderImpl.java | 25 .../johnzon/core/JsonBuilderFactoryImpl.java | 16 ++--- .../apache/johnzon/core/JsonInMemoryParser.java| 8 ++- .../apache/johnzon/core/JsonMergePatchDiff.java| 9 ++- .../apache/johnzon/core/JsonMergePatchImpl.java| 9 ++- .../org/apache/johnzon/core/JsonNumberImpl.java| 8 ++- .../apache/johnzon/core/JsonObjectBuilderImpl.java | 19 +++--- .../apache/johnzon/core/JsonParserFactoryImpl.java | 20 --- .../org/apache/johnzon/core/JsonProviderImpl.java | 42 + .../apache/johnzon/core/JsonReaderFactoryImpl.java | 14 +++-- .../org/apache/johnzon/core/JsonReaderImpl.java| 26 .../apache/johnzon/core/JsonStreamParserImpl.java | 15 ++--- .../org/apache/johnzon/core/JsonNumberTest.java| 56 -- .../johnzon/core/JsonParserStreamingTest.java | 3 +- .../org/apache/johnzon/core/JsonParserTest.java| 6 +- .../johnzon/core/JsonStreamParserImplTest.java | 8 +-- .../org/apache/johnzon/core/SerializationTest.java | 3 +- .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 15 +++-- .../org/apache/johnzon/mapper/MapperBuilder.java | 13 +++- .../org/apache/johnzon/mapper/MapperConfig.java| 11 +++- .../johnzon/mapper/util/JsonProviderUtil.java | 69 ++ .../apache/johnzon/mapper/MapperConfigTest.java| 2 +- .../test/java/org/superbiz/ExtendMappingTest.java | 2 +- 25 files changed, 311 insertions(+), 115 deletions(-) create mode 100644 johnzon-mapper/src/main/java/org/apache/johnzon/mapper/util/JsonProviderUtil.java
[johnzon] branch jakartaee-10-tck updated (e90ad82f -> ab4ce2a5)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch jakartaee-10-tck in repository https://gitbox.apache.org/repos/asf/johnzon.git from e90ad82f Merge pull request #103 from jungm/jsonb-bigintdecimal new 1339ef5e Workaround so TCKs detect when OWB isn't started new 4baa2681 fix package name new ab4ce2a5 Merge pull request #104 from jungm/jakartaee-10-tck-cdi The 976 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/jsonb/tck/JohnzonOwbCDIProvider.java | 26 +- .../jakarta.enterprise.inject.spi.CDIProvider | 1 + 2 files changed, 11 insertions(+), 16 deletions(-) copy johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/model/packageformat/FormatOnClassModel.java => tck/jsonb/src/test/java/org/apache/johnzon/jsonb/tck/JohnzonOwbCDIProvider.java (58%) create mode 100644 tck/jsonb/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.CDIProvider
[johnzon] branch master updated: fix: CVE-2022-45868
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 aad59d60 fix: CVE-2022-45868 aad59d60 is described below commit aad59d6071a63c7ad189d750171633460f26bcbb Author: Jean-Louis Monteiro AuthorDate: Tue May 9 15:49:37 2023 +0200 fix: CVE-2022-45868 --- johnzon-mapper/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index c4666137..d808dcad 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -61,7 +61,7 @@ com.h2database h2 - 2.1.210 + 2.1.214 test
[johnzon] branch jakartaee-10-tck updated (5cbc9dc9 -> e90ad82f)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch jakartaee-10-tck in repository https://gitbox.apache.org/repos/asf/johnzon.git from 5cbc9dc9 Fix Nillable for fields and set the local for TCK to be independent from the platform running the suite new 32622331 don't serialize BigInteger/BigDecimal as strings in jsonb new dc6b2055 serialize BigInteger/BigDecimal as strings by default in jsonb new 2e50c9fc set system properties for TCKs new e90ad82f Merge pull request #103 from jungm/jsonb-bigintdecimal The 973 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: .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 10 .../org/apache/johnzon/jsonb/JsonbTypesTest.java | 59 +++--- .../org/apache/johnzon/mapper/MapperBuilder.java | 10 .../johnzon/mapper/map/LazyConverterMap.java | 28 ++ pom.xml| 2 +- tck/jsonb/pom.xml | 3 ++ 6 files changed, 96 insertions(+), 16 deletions(-)
[johnzon] branch master updated: Update Doxia dependencies so it works with latest Maven Site plugin
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 fc25caaf Update Doxia dependencies so it works with latest Maven Site plugin fc25caaf is described below commit fc25caaf14f439ccfd51c23a951eaf2580a82f81 Author: Jean-Louis Monteiro AuthorDate: Tue May 9 15:46:56 2023 +0200 Update Doxia dependencies so it works with latest Maven Site plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ddd642ba..60ff841c 100644 --- a/pom.xml +++ b/pom.xml @@ -280,12 +280,12 @@ org.apache.maven.doxia doxia-core -1.7 +1.10 org.apache.maven.doxia doxia-module-markdown -1.7 +1.11.1
svn commit: r1909701 [3/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Modified: johnzon/site/publish/dependency-convergence.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/dependency-convergence.html?rev=1909701=1909700=1909701=diff == --- johnzon/site/publish/dependency-convergence.html (original) +++ johnzon/site/publish/dependency-convergence.html Tue May 9 13:46:22 2023 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Reactor Dependency Convergence @@ -94,7 +94,7 @@ Project Information -CI Management +CI Management Dependencies @@ -108,11 +108,11 @@ About -Issue Management +Issue Management -Licenses +Licenses -Mailing Lists +Mailing Lists Project Modules @@ -120,11 +120,11 @@ Plugins -Team +Source Code Management -Source Code Management +Summary -Summary +Team @@ -132,11 +132,13 @@ Project Reports -JavaDocs +CPD -Surefire Report +PMD + +Javadoc -Cobertura Test Coverage +Surefire Report Checkstyle @@ -213,10 +215,10 @@ - Last Published: 2022-08-22 + Last Published: 2023-05-09 | - Version: 1.2.20-SNAPSHOT + Version: 2.0.0-SNAPSHOT @@ -306,7 +308,7 @@ - + CI Management @@ -353,21 +355,21 @@ - + Issue Management - + Licenses - + Mailing Lists @@ -395,27 +397,27 @@ - + -Team +Source Code Management - + -Source Code Management +Summary - + -Summary +Team - + @@ -479,225 +481,750 @@ - + Reactor Dependency Convergence Legend: - + At least one dependency has a differing version of the dependency or has SNAPSHOT dependencies. Statistics: Number of modules: -13 +12 Number of dependencies (NOD): -171 +250 Number of unique artifacts (NOA): -196 +314 Number of version-conflicting artifacts (NOC): -10 +39 Number of SNAPSHOT artifacts (NOS): 0 Convergence (NOD/NOA): -87 % +79 % Ready for release (100% convergence and no SNAPSHOTS): -ErrorYou do not have 100%
svn commit: r1909701 [8/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
nfig.java + + +Rule +Violation +Priority +Line + +https://pmd.github.io/pmd-6.49.0/pmd_rules_java_codestyle.html#unnecessarymodifier;>UnnecessaryModifier +Unnecessary modifiers 'public static final' on field 'CONFIG_PID': the field is declared in an annotation type +3 +33 +Johnzon :: Support for OSGI Jaxrs Whiteboard - org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java + + +Rule +Violation +Priority +Line + +https://pmd.github.io/pmd-6.49.0/pmd_rules_java_codestyle.html#unnecessaryfullyqualifiedname;>UnnecessaryFullyQualifiedName +Unnecessary use of fully qualified name 'org.apache.johnzon.osgi.cdi.CdiExtensionFactory' due to existing same package import 'org.apache.johnzon.osgi.cdi.*' +4 +45 +Johnzon :: Support for OSGI Jaxrs Whiteboard - org/apache/johnzon/osgi/cdi/package-info.java + + +Rule +Violation +Priority +Line + +https://pmd.github.io/pmd-6.49.0/pmd_rules_java_codestyle.html#toomanystaticimports;>TooManyStaticImports +Too many static imports may lead to messy code +3 +2041 +Johnzon :: WebSocket - org/apache/johnzon/websocket/jsr/JsrObjectDecoder.java + + +Rule +Violation +Priority +Line + +https://pmd.github.io/pmd-6.49.0/pmd_rules_java_bestpractices.html#unusedprivatefield;>UnusedPrivateField +Avoid unused private fields such as 'factory'. +3 +28 +Johnzon :: WebSocket - org/apache/johnzon/websocket/jsr/JsrStructureDecoder.java + + +Rule +Violation +Priority +Line + +https://pmd.github.io/pmd-6.49.0/pmd_rules_java_bestpractices.html#unusedprivatefield;>UnusedPrivateField +Avoid unused private fields such as 'factory'. +3 +28 +Processing Errors + + +Filename +Problem + +Johnzon :: Core - org/apache/johnzon/core/BufferStrategyFactory.java +PMDException: Error while parsing /Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java + +net.sourceforge.pmd.PMDException: Error while parsing /Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-core/src/main/java/org/apache/johnzon/core/BufferStrategyFactory.java + at net.sourceforge.pmd.SourceCodeProcessor.processSourceCodeWithoutCache(SourceCodeProcessor.java:124) + at net.sourceforge.pmd.SourceCodeProcessor.processSourceCode(SourceCodeProcessor.java:100) + at net.sourceforge.pmd.SourceCodeProcessor.processSourceCode(SourceCodeProcessor.java:62) + at net.sourceforge.pmd.processor.PmdRunnable.call(PmdRunnable.java:89) + at net.sourceforge.pmd.processor.PmdRunnable.call(PmdRunnable.java:30) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:834) +Caused by: net.sourceforge.pmd.lang.java.ast.ParseException: Line 31, Column 77: Cannot use method references when running in JDK inferior to 1.8 mode! + at net.sourceforge.pmd.lang.java.ast.JavaParser.throwParseException(JavaParser.java:30) + at net.sourceforge.pmd.lang.java.ast.JavaParser.checkForBadMethodReferenceUsage(JavaParser.java:118) + at net.sourceforge.pmd.lang.java.ast.JavaParser.MethodReference(JavaParser.java:4717) + at net.sourceforge.pmd.lang.java.ast.JavaParser.MemberSelector(JavaParser.java:4683) + at net.sourceforge.pmd.lang.java.ast.JavaParser.PrimarySuffix(JavaParser.java:5134) + at net.sourceforge.pmd.lang.java.ast.JavaParser.PrimaryExpression(JavaParser.java:4641) + at net.sourceforge.pmd.lang.java.ast.JavaParser.PostfixExpression(JavaParser.java:4455) + at net.sourceforge.pmd.lang.java.ast.JavaParser.UnaryExpressionNotPlusMinus(JavaParser.java:4353) + at net.sourceforge.pmd.lang.java.ast.JavaParser.UnaryExpression(JavaParser.java:4230) + at net.sourceforge.pmd.lang.java.ast.JavaParser.MultiplicativeExpression(JavaParser.java:4145) + at net.sourceforge.pmd.lang.java.ast.JavaParser.AdditiveExpression(JavaParser.java:4092) + at net.sourceforge.pmd.lang.java.ast.JavaParser.ShiftExpression(JavaParser.java:4035) + at net.sourceforge.pmd.lang.java.ast.JavaParser.RelationalExpression(JavaParser.java:3974) + at net.sourceforge.pmd.lang.java.ast.JavaParser.InstanceOfExpression(JavaParser.java:3874) + at net.sourceforge.pmd.lang.java.ast.JavaParser.EqualityExpression(JavaParser.java:3584) + at net.sourceforge.pmd.lang.java.ast.JavaParser.AndExpression(JavaParser.java:3544) + at net.sourceforge.pmd.lang.java.ast.JavaParser.ExclusiveOrExpression(JavaParser.java:3504) + at net.sourceforge.pmd.lang.java.ast.JavaParser.InclusiveOrExpression(JavaPar
svn commit: r1909701 [5/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Modified: johnzon/site/publish/index.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/index.html?rev=1909701=1909700=1909701=diff == --- johnzon/site/publish/index.html (original) +++ johnzon/site/publish/index.html Tue May 9 13:46:22 2023 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Apache Johnzon @@ -94,7 +94,7 @@ Project Information -CI Management +CI Management Dependencies @@ -108,11 +108,11 @@ About -Issue Management +Issue Management -Licenses +Licenses -Mailing Lists +Mailing Lists Project Modules @@ -120,11 +120,11 @@ Plugins -Team +Source Code Management -Source Code Management +Summary -Summary +Team @@ -132,11 +132,13 @@ Project Reports -JavaDocs +CPD -Surefire Report +PMD + +Javadoc -Cobertura Test Coverage +Surefire Report Checkstyle @@ -213,10 +215,10 @@ - Last Published: 2022-08-22 + Last Published: 2023-05-09 | - Version: 1.2.20-SNAPSHOT + Version: 2.0.0-SNAPSHOT @@ -304,7 +306,7 @@ - + CI Management @@ -351,21 +353,21 @@ - + Issue Management - + Licenses - + Mailing Lists @@ -393,27 +395,27 @@ - + -Team +Source Code Management - + -Source Code Management +Summary - + -Summary +Team - + @@ -494,18 +496,18 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --->Apache Johnzon -Apache Johnzon is a project providing an implementation of JsonProcessing (aka JSR-353) and a set of useful extension for this specification like an Object mapper, some JAX-RS providers and a WebSocket module provides a basic integration with Java WebSocket API (JSR-356). - +--> +Apache Johnzon +Apache Johnzon is a project providing an implementation of JsonProcessing (aka JSR-353) and a set of useful extension +for this specification like an Object mapper, some JAX-RS providers and a
svn commit: r1909701 [9/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
+Distribution Management + + + + + + +About + + + + + + +Issue Management + + + + + + +Licenses + + + + + + +Mailing Lists + + + + + + +Project Modules + + + + + + +Plugin Management + + + + + + +Plugins + + + + + + +Source Code Management + + + + + + +Summary + + + + +Team + + + + + + + + +Project Reports + + Security + + + + + +Report vulnerability + + ASF + + + + http://www.apache.org/foundation/how-it-works.html; class="externalLink" title="How Apache Works"> + +How Apache Works + + + + + http://www.apache.org/foundation/; class="externalLink" title="Foundation"> + +Foundation + + + + + http://www.apache.org/foundation/sponsorship.html; class="externalLink" title="Sponsoring Apache"> + +Sponsoring Apache + + + + + http://www.apache.org/foundation/thanks.html; class="externalLink" title="Thanks"> + +Thanks + + + + + + + + + + + + http://maven.apache.org/; title="Built by Maven" class="poweredBy"> + + + + + + + + + + +Project Team +A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions. +The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated. +Members +The following is a list of developers with commit privileges that have directly contributed to the project in one way or another. + + +Image +Id +Name +Email +Roles + +https://www.gravatar.com/avatar/69cba8fe866d6fa5cab1f001eae7cd14?d=mms=60; alt="" /> +jmclean +Justin Mclean +mailto:jmclean AT apache.org">jmclean AT apache.org +Mentor + +https://www.gravatar.com/avatar/a1efc4e0c2b99e0e61d8472419ea1bcc?d=mms=60; alt="" /> +grobmeier +Christian Grobmeier +mailto:grobmeier AT apache.org">grobmeier AT apache.org +- + +https://www.gravatar.com/avatar/16efdbd7a08c98658caf9d1aba7f2c3d?d=mms=60; alt="" /> +dkulp +Daniel Kulp +mailto:dkulp AT apache.org">dkulp AT apache.org +Mentor + +https://www.gravatar.com/avatar/c3ef61edda56f280571e691eacb3be95?d=mms=60; alt="" /> +rmannibucau +Romain Manni-Bucau +mailto:rmannibucau AT apache.org">rmannibucau AT apache.org +PMC + +https://www.gravatar.com/avatar/8a67544f497bc5e0d8cd345841844c67?d=mms=60; alt="" /> +jlmonteiro +Jean-Louis Monteiro +mailto:jlmonteiro AT apache.org">jlmonteiro AT apache.org +PMC + +https://www.gravatar.com/avatar/5addda66a07702e0a84087e049bf1f81?d=mms=60; alt="" /> +struberg +Mark Struberg +mailto:struberg AT apache.org">struberg AT apache.org +PMC + +https://www.gravatar.com/avatar/a70
svn commit: r1909701 [2/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Added: johnzon/site/publish/cpd.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/cpd.html?rev=1909701=auto
==
--- johnzon/site/publish/cpd.html (added)
+++ johnzon/site/publish/cpd.html Tue May 9 13:46:22 2023
@@ -0,0 +1,1436 @@
+
+
+http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
+
+
+
+
+
+Apache Johnzon CPD Results
+
+
+
+
+
+
+
+
+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
Date();a=s.createElement(o),
+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-3211522-15', 'apache.org');
+ga('send', 'pageview');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Apache Johnzon
+
+
+
+
+
+User Guide
+
+
+Home
+
+
+Download
+
+
+Javadoc
+
+
+Source Code
+
+
+Changelog
+
+
+Mailing Lists
+
+
+
+
+Old
Releases
+
+
+Johnzon 0.7-incubating
+
+
+Johnzon 0.2-incubating
+
+
+Johnzon 0.1-incubating
+
+
+
+
+Project
Documentation
+
+
+
+ Project Information
+
+CI Management
+
+Dependencies
+
+Dependency
Convergence
+
+Dependency Information
+
+Dependency
Management
+
+Distribution Management
+
+About
+
+Issue Management
+
+Licenses
+
+Mailing Lists
+
+Project Modules
+
+Plugin Management
+
+Plugins
+
+Source Code Management
+
+Summary
+
+Team
+
+
+
+
+
+ Project Reports
+
+CPD
+
+PMD
+
+Javadoc
+
+Surefire Report
+
+Checkstyle
+
+Dependency Updates Report
+
+Plugin Updates
Report
+
+Property
Updates Report
+
+Tag List
+
+Change Log
+
+File Activity
+
+Developer Activity
+
+JIRA Report
+
+
+
+
+
+
+Security
+
+
+Report vulnerability
+
+
+
+
+ASF
+
+
+http://www.apache.org/foundation/how-it-works.html; title="How Apache
Works">How Apache Works
+
+
+http://www.apache.org/foundation/;
title="Foundation">Foundation
+
+
+http://www.apache.org/foundation/sponsorship.html; title="Sponsoring
Apache">Sponsoring Apache
+
+
+http://www.apache.org/foundation/thanks.html;
svn commit: r1909701 [6/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Added: johnzon/site/publish/licenses.html
URL:
http://svn.apache.org/viewvc/johnzon/site/publish/licenses.html?rev=1909701=auto
==
--- johnzon/site/publish/licenses.html (added)
+++ johnzon/site/publish/licenses.html Tue May 9 13:46:22 2023
@@ -0,0 +1,516 @@
+
+
+http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
+
+
+
+
+
+Apache Johnzon Project Licenses
+
+
+
+
+
+
+
+
+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
Date();a=s.createElement(o),
+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-3211522-15', 'apache.org');
+ga('send', 'pageview');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Apache Johnzon
+
+
+
+
+
+User Guide
+
+
+Home
+
+
+Download
+
+
+Javadoc
+
+
+Source Code
+
+
+Changelog
+
+
+Mailing Lists
+
+
+
+
+Old
Releases
+
+
+Johnzon 0.7-incubating
+
+
+Johnzon 0.2-incubating
+
+
+Johnzon 0.1-incubating
+
+
+
+
+Project
Documentation
+
+
+
+ Project Information
+
+CI Management
+
+Dependencies
+
+Dependency
Convergence
+
+Dependency Information
+
+Dependency
Management
+
+Distribution Management
+
+About
+
+Issue Management
+
+Licenses
+
+Mailing Lists
+
+Project Modules
+
+Plugin Management
+
+Plugins
+
+Source Code Management
+
+Summary
+
+Team
+
+
+
+
+
+ Project Reports
+
+CPD
+
+PMD
+
+Javadoc
+
+Surefire Report
+
+Checkstyle
+
+Dependency Updates Report
+
+Plugin Updates
Report
+
+Property
Updates Report
+
+Tag List
+
+Change Log
+
+File Activity
+
+Developer Activity
+
+JIRA Report
+
+
+
+
+
+
+Security
+
+
+Report vulnerability
+
+
+
+
+ASF
+
+
+http://www.apache.org/foundation/how-it-works.html; title="How Apache
Works">How Apache Works
+
+
+http://www.apache.org/foundation/;
title="Foundation">Foundation
+
+
+http://www.apache.org/foundation/sponsorship.html; title="Sponsoring
Apache">Sponsoring Apache
+
+
+
svn commit: r1909701 [1/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Author: jlmonteiro Date: Tue May 9 13:46:22 2023 New Revision: 1909701 URL: http://svn.apache.org/viewvc?rev=1909701=rev Log: Site checkin for project Apache Johnzon Added: johnzon/site/publish/apidocs/javadoc.sh johnzon/site/publish/apidocs/options johnzon/site/publish/apidocs/packages johnzon/site/publish/ci-management.html johnzon/site/publish/cpd.html johnzon/site/publish/issue-management.html johnzon/site/publish/licenses.html johnzon/site/publish/mailing-lists.html johnzon/site/publish/pmd.html johnzon/site/publish/scm.html johnzon/site/publish/summary.html johnzon/site/publish/team.html Removed: johnzon/site/publish/apidocs/allclasses-frame.html johnzon/site/publish/apidocs/allclasses-noframe.html johnzon/site/publish/apidocs/constant-values.html johnzon/site/publish/apidocs/deprecated-list.html johnzon/site/publish/apidocs/help-doc.html johnzon/site/publish/apidocs/index-all.html johnzon/site/publish/apidocs/index.html johnzon/site/publish/apidocs/org/ johnzon/site/publish/apidocs/overview-frame.html johnzon/site/publish/apidocs/overview-summary.html johnzon/site/publish/apidocs/overview-tree.html johnzon/site/publish/apidocs/package-list johnzon/site/publish/apidocs/script.js johnzon/site/publish/apidocs/serialized-form.html johnzon/site/publish/apidocs/stylesheet.css johnzon/site/publish/changelog.html johnzon/site/publish/checkstyle.html johnzon/site/publish/checkstyle.rss johnzon/site/publish/cobertura/ johnzon/site/publish/dependency-updates-report.html johnzon/site/publish/dev-activity.html johnzon/site/publish/file-activity.html johnzon/site/publish/integration.html johnzon/site/publish/issue-tracking.html johnzon/site/publish/jira-report.html johnzon/site/publish/johnzon-jsonb-extras/ johnzon/site/publish/johnzon-jsonp-strict/ johnzon/site/publish/license.html johnzon/site/publish/mail-lists.html johnzon/site/publish/plugin-updates-report.html johnzon/site/publish/project-info.html johnzon/site/publish/project-reports.html johnzon/site/publish/project-summary.html johnzon/site/publish/property-updates-report.html johnzon/site/publish/source-repository.html johnzon/site/publish/surefire-report.html johnzon/site/publish/taglist.html johnzon/site/publish/team-list.html Modified: johnzon/site/publish/dependencies.html johnzon/site/publish/dependency-convergence.html johnzon/site/publish/dependency-info.html johnzon/site/publish/dependency-management.html johnzon/site/publish/distribution-management.html johnzon/site/publish/download.html johnzon/site/publish/index.html johnzon/site/publish/modules.html johnzon/site/publish/plugin-management.html johnzon/site/publish/plugins.html johnzon/site/publish/privacy-policy.html johnzon/site/publish/security.html Added: johnzon/site/publish/apidocs/javadoc.sh URL: http://svn.apache.org/viewvc/johnzon/site/publish/apidocs/javadoc.sh?rev=1909701=auto == --- johnzon/site/publish/apidocs/javadoc.sh (added) +++ johnzon/site/publish/apidocs/javadoc.sh Tue May 9 13:46:22 2023 @@ -0,0 +1 @@ +/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home/bin/javadoc @options @packages \ No newline at end of file Added: johnzon/site/publish/apidocs/options URL: http://svn.apache.org/viewvc/johnzon/site/publish/apidocs/options?rev=1909701=auto == --- johnzon/site/publish/apidocs/options (added) +++ johnzon/site/publish/apidocs/options Tue May 9 13:46:22 2023 @@ -0,0 +1,27 @@ +-classpath +'/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-core/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-mapper/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-jaxrs/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-distribution/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-maven-plugin/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-websocket/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-jsonb/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-json-extras/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-jsonschema/target/classes:/Users/jlmonteiro/devs/jeanouii/apache/johnzon/johnzon-jsonlogic/target/classes:/Users/jlmonteiro/.m2/repository/jakarta/json/jakarta.json-api/2.1.1/jakarta.json-api-2.1.1.jar:/Users/jlmonteiro/.m2/repository/junit/junit/4.13.2/junit-4.13.2.jar:/Users/jlmonteiro/.m2/repository/org/h amcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/Users/jlmonteiro/.m2/repository/jakarta/persistence/jakarta.persistence-api/3.1.0/jakarta.persistence-api-3.1.0.jar:/Users/jlmonteiro/.m2
svn commit: r1909701 [4/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Modified: johnzon/site/publish/dependency-info.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/dependency-info.html?rev=1909701=1909700=1909701=diff == --- johnzon/site/publish/dependency-info.html (original) +++ johnzon/site/publish/dependency-info.html Tue May 9 13:46:22 2023 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Dependency Information @@ -94,7 +94,7 @@ Project Information -CI Management +CI Management Dependencies @@ -108,11 +108,11 @@ About -Issue Management +Issue Management -Licenses +Licenses -Mailing Lists +Mailing Lists Project Modules @@ -120,11 +120,11 @@ Plugins -Team +Source Code Management -Source Code Management +Summary -Summary +Team @@ -132,11 +132,13 @@ Project Reports -JavaDocs +CPD -Surefire Report +PMD + +Javadoc -Cobertura Test Coverage +Surefire Report Checkstyle @@ -213,10 +215,10 @@ - Last Published: 2022-08-22 + Last Published: 2023-05-09 | - Version: 1.2.20-SNAPSHOT + Version: 2.0.0-SNAPSHOT @@ -306,7 +308,7 @@ - + CI Management @@ -353,21 +355,21 @@ - + Issue Management - + Licenses - + Mailing Lists @@ -395,27 +397,27 @@ - + -Team +Source Code Management - + -Source Code Management +Summary - + -Summary +Team - + @@ -479,38 +481,31 @@ - -Dependency Information - + +Dependency Information Apache Maven dependency groupIdorg.apache.johnzon/groupId artifactIdjohnzon/artifactId - version1.2.20-SNAPSHOT/version + version2.0.0-SNAPSHOT/version typepom/type -/dependency - +/dependency Apache Buildr -'org.apache.johnzon:johnzon:pom:1.2.20-SNAPSHOT' - +'org.apache.johnzon:johnzon:pom:2.0.0-SNAPSHOT' Apache Ivy -dependency org=org.apache.johnzon name=johnzon rev=1.2.20-SNAPSHOT +dependency org=org.apache.johnzon name=johnzon rev=2.0.0-SNAPSHOT artifact name=johnzon
svn commit: r1909701 [7/9] - in /johnzon/site/publish: ./ apidocs/ apidocs/org/ cobertura/ johnzon-jsonb-extras/ johnzon-jsonp-strict/
Modified: johnzon/site/publish/plugins.html URL: http://svn.apache.org/viewvc/johnzon/site/publish/plugins.html?rev=1909701=1909700=1909701=diff == --- johnzon/site/publish/plugins.html (original) +++ johnzon/site/publish/plugins.html Tue May 9 13:46:22 2023 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Apache Johnzon Project Plugins @@ -94,7 +94,7 @@ Project Information -CI Management +CI Management Dependencies @@ -108,11 +108,11 @@ About -Issue Management +Issue Management -Licenses +Licenses -Mailing Lists +Mailing Lists Project Modules @@ -120,11 +120,11 @@ Plugins -Team +Source Code Management -Source Code Management +Summary -Summary +Team @@ -132,11 +132,13 @@ Project Reports -JavaDocs +CPD -Surefire Report +PMD + +Javadoc -Cobertura Test Coverage +Surefire Report Checkstyle @@ -213,10 +215,10 @@ - Last Published: 2022-08-22 + Last Published: 2023-05-09 | - Version: 1.2.20-SNAPSHOT + Version: 2.0.0-SNAPSHOT @@ -306,7 +308,7 @@ - + CI Management @@ -355,21 +357,21 @@ - + Issue Management - + Licenses - + Mailing Lists @@ -395,27 +397,27 @@ - + -Team +Source Code Management - + -Source Code Management +Summary - + -Summary +Team - + @@ -479,7 +481,7 @@ - + Project Build Plugins @@ -487,78 +489,73 @@ ArtifactId Version -org.apache.felix +org.apache.felix http://felix.apache.org/components/bundle-plugin/;>maven-bundle-plugin -5.1.4 +5.1.8 -org.apache.maven.plugins -http://maven.apache.org/plugins/maven-checkstyle-plugin/;>maven-checkstyle-plugin -2.17 +org.apache.maven.plugins +https://maven.apache.org/plugins/maven-checkstyle-plugin/;>maven-checkstyle-plugin +3.0.0 -org.apache.maven.plugins +org.apache.maven.plugins https://maven.apache.org/plugins/maven-clean-plugin/;>maven-clean-plugin -3.1.0 +3.2.0
[johnzon] branch master updated: Update the website with latest releases
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 ea0fa2b8 Update the website with latest releases ea0fa2b8 is described below commit ea0fa2b8224850c99c43cd5c26408751b4ce9a4f Author: Jean-Louis Monteiro AuthorDate: Tue May 9 15:40:04 2023 +0200 Update the website with latest releases --- src/site/markdown/download.md | 34 +++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index 17882448..aaf449ed 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -34,6 +34,17 @@ Read more about [how we sign Apache Releases](http://www.apache.org/info/verific -- +## Johnzon-2.0.x + +Apache Johnzon 2.0.x implements the JSON-P 2.1 and JSON-B 3.0 specifications which on a level of JavaEE 10. This version is not backward compatible due to the namespace change from `javax` to `jakarta`. +Apache Johnzon does not implement Jakarta EE 9 per se, because there was no change in terms of APIs except the namespace change. +So we decided to use Apache Johnzon 1.2.x bellow and publish a Jakarta compatible version using bytecode transformation. All artifacts can be used with the classifier `jakarta`. + + Source + +This version is currently only available as snapshot. +We are still actively working on passing the TCK but so far most of the implementation is ready. + ## Johnzon-1.2.x Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications which on a level of JavaEE 8. @@ -41,9 +52,9 @@ Apache Johnzon 1.2.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi 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.16-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.16/johnzon-1.2.16-source-release.zip) -* [johnzon-1.2.16-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.sha512) -* [johnzon-1.2.16-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.16/johnzon-1.2.16-source-release.zip.asc) +* [johnzon-1.2.20-source-release.zip](https://www.apache.org/dyn/closer.lua/1.2.20/johnzon-1.2.20-source-release.zip) +* [johnzon-1.2.20-source-release.zip.sha512](https://www.apache.org/dist/johnzon/1.2.20/johnzon-1.2.20-source-release.zip.sha512) +* [johnzon-1.2.20-source-release.zip.asc](https://www.apache.org/dist/johnzon/1.2.20/johnzon-1.2.20-source-release.zip.asc) ## Johnzon-1.0.x @@ -69,6 +80,23 @@ Should you want to build any of the above binaries, this source bundle is the ri ### Maven Dependencies + APIs for Johnzon-2.0.x (Jakarta EE 10) + +Since Java EE got open sourced to become Jakarta EE, the APIs can be used without license restrictions, so we moved away from our Apache APIs. + + +jakarta.json +jakarta.json-api +2.1.1 +provided + + +jakarta.json.bind +jakarta.json.bind-api +3.0 +provided + + APIs for Johnzon-1.1.x (JavaEE 8)
[johnzon] branch jakartaee-10-tck updated (f72f21f9 -> 5cbc9dc9)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch jakartaee-10-tck in repository https://gitbox.apache.org/repos/asf/johnzon.git omit f72f21f9 Fix Nillable for fields and set the local for TCK to be independent from the platform running the suite omit 0d7b1e70 Jakarta EE 10 TCK setup add 157cedb5 JOHNZON-305 : Java Modules (#99) add 9080e292 Implement JSON-B 3 Polymorphism (#100) add fcdd26e2 minor fixes in reflection usage for JSON-B polymorphism (no functional change except complete meta support) add f9c8cf69 Jakarta EE 10 TCK setup add 5cbc9dc9 Fix Nillable for fields and set the local for TCK to be independent from the platform running the suite 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 (f72f21f9) \ N -- N -- N refs/heads/jakartaee-10-tck (5cbc9dc9) 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: johnzon-core/pom.xml | 1 + johnzon-distribution/pom.xml | 10 +- johnzon-jaxrs/pom.xml | 9 + johnzon-jsonb/pom.xml | 1 + .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 9 +- .../org/apache/johnzon/jsonb/JsonbMappings.java| 74 .../polymorphism/JsonbPolymorphismHandler.java | 208 + .../polymorphism/JsonbPolymorphismTypeInfo.java| 30 ++- .../jsonb/polymorphism/JsonbPolymorphismTest.java | 92 + .../JsonbPolymorphismValidationTest.java | 143 ++ johnzon-jsonlogic/pom.xml | 9 + johnzon-jsonschema/pom.xml | 9 + johnzon-mapper/pom.xml | 1 + .../java/org/apache/johnzon/mapper/Mapper.java | 2 +- .../org/apache/johnzon/mapper/MapperBuilder.java | 10 +- .../org/apache/johnzon/mapper/MapperConfig.java| 13 +- .../johnzon/mapper/MappingGeneratorImpl.java | 29 +-- .../apache/johnzon/mapper/MappingParserImpl.java | 14 +- .../java/org/apache/johnzon/mapper/Mappings.java | 24 ++- .../org/apache/johnzon/mapper/access/Meta.java | 2 +- .../test/java/org/superbiz/ExtendMappingTest.java | 4 +- johnzon-websocket/pom.xml | 27 ++- pom.xml| 9 +- src/site/markdown/index.md | 4 +- 24 files changed, 672 insertions(+), 62 deletions(-) create mode 100644 johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbMappings.java create mode 100644 johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismHandler.java copy johnzon-jaxrs/src/main/java/org/apache/johnzon/jaxrs/IgnorableTypes.java => johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTypeInfo.java (55%) create mode 100644 johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismTest.java create mode 100644 johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/polymorphism/JsonbPolymorphismValidationTest.java
svn commit: r61385 - /release/johnzon/johnzon-1.2.20/
Author: jlmonteiro Date: Thu Apr 20 10:21:53 2023 New Revision: 61385 Log: Vote passed for Apache Johnzon 1.2.20 Added: release/johnzon/johnzon-1.2.20/ release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz (with props) release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip (with props) release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.tar.gz (with props) release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.tar.gz.asc release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.tar.gz.sha512 release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.zip (with props) release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.zip.asc release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.zip.sha512 Added: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc == --- release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc (added) +++ release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc Thu Apr 20 10:21:53 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmQPa+4ACgkQNYgHxStL +DiPEiQ/6Ar7ZQhvk3s/Z37Gh/9iEk7zIz9e70Chat1HEq05C7twmVbwG+611LDkC +4ZaBHP2/4M6SVPtchvdlB57KORDMd1eqY8B9rbRqmpa4ppe4NhxqEv+7KWRT7gqA +r6iATgJECVtst0Lk8sjgPsXjsVY2G899F8L/v92BHhQ5iIrA/BHkhf4X6TC/uIfy +8pgsmEeDxGyHssysMZFkEVlel04q5EaHlHPlAMfZN3bWdPwe1CxIZIT5RbgquEcp +TZUvjxPxusBFRFsSgYqBXlIfg72Evpt5y/G4beWHFWV7FfNMwzKgMmiGa0jyE+4N +Oau1XJT0RF0XLusItXAMnPdVcVBpGj/Q5z7oZuxNscufYg6+J7JsqOFwSqfiKz/D +KAvuQT0U2tiQq9hDDzrlmTK3HP0xjzDsR5WzGviEczVabxTvSEhbQxgDLVNv2JTO +tCR6JS4cwnea6koxAam21oopUYDJoTQNVxddfykAR0fbZ/5iTgepksaGR5oaDkYO +ch9vqJ9Ou8+DY16cFtWnFKrMPinNQUfqzgVG6JPShqYZM0I7nvyaWTJllHXel3aR +huD+bvqPBnuDEmhB5zs2ncZLpm1UahZLC70+bKPVo6AhAwAwX9gZH4xjIwstG7MD +7MoxMJQADRDTX+MbrEUQhHRwbnNZ/Vz2W8q7UzliSTrKltNzVm4= +=PXK4 +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 == --- release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 (added) +++ release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 Thu Apr 20 10:21:53 2023 @@ -0,0 +1 @@ +202e6465307d156ffca3e28331902681bb5fc2885462cc894de680c2cfb1b6b88f911fa5358bf3081a5e4ac6da1746d3975779c064af8767113b0cb385cbf079 apache-johnzon-1.2.20-bin.tar.gz Added: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc == --- release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc (added) +++ release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc Thu Apr 20 10:21:53 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmQPa+4ACgkQNYgHxStL +DiNXtQ//aiUUQQF0mLD8n0XHJuMhkLAR088OdJ2XOQ/ulm8h0GSEaFyvDq2get6v +qgTMf4cx+FxTqQhk2wtLWTzlh6gDIbNzDcJR48JED85jeq9d9QGG/GwKg6c3o3/r +a663/MwiRv3ZRSdkrypH2r3WWLTLP10TkQWDGmx/9RLPycterytznaYT+cfi3Rr+ +RCHOVSRhrqhx23cSk8ann4o/kHF5n7OSAvFm4OUn9nAINPoj+q5t/gIpYD5y+xXU +xlHXjcW0ym4tC6T7FhIEoQFIHC4evt01ak5hwlguIvzux5tdyUQYF3DZ8QTf2TMF +Kkmyikp6lytyab3qQvvvmmuRLk1MQgZlqLI29o6JTxVk0eKJvuxC8aBzdjXfT/wc +EdJh1tg34TdyWfk+7t7KVh4CJlZ6n7kmcV13f8tMnYCOI72bmDMnL3ibGWFZbAwz ++lk9V8ugWb6Uv+AoRkJt/bt8ScPdSnE627oiOlG3iMeZJnSMtmjdeT5wZs04srAT +E4HPQor3bJAwspUmrSlwQYrxZij1D14tlvUTI/mVuqH8p99il96V3VeCEM74upu7 +yWoj0CkDwSm2dzfXrCjjAiBFodvAU0ty5l0E9xjsYttLZZ4gLl5FjXwGVal6NJtU +EPOkHh/u5z4iKQRKZfn07VzOzhkjFgatWNZXTkG6+zXc1YOptzM= +=kCLN +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 == --- release/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 (added) +++ release/johnzon
svn commit: r61386 - /dev/johnzon/johnzon-1.2.20/
Author: jlmonteiro Date: Thu Apr 20 10:22:05 2023 New Revision: 61386 Log: Vote passed for Apache Johnzon 1.2.20 Removed: dev/johnzon/johnzon-1.2.20/
[johnzon] branch johnzon-1.2.x updated (b25243b2 -> 89ee9a36)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git from b25243b2 [JOHNZON-390] ensure jsonb creator/constructor parameters respect naming strategy add 685eaf37 [maven-release-plugin] prepare release v1.2.20 new 89ee9a36 [maven-release-plugin] prepare for next development iteration 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: 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-jsonp-strict/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 ++-- 13 files changed, 14 insertions(+), 14 deletions(-)
[johnzon] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 89ee9a36d99f27f946d5487bcc3094e67bc4ad0b Author: Jean-Louis Monteiro AuthorDate: Mon Mar 13 18:12:08 2023 +0100 [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-jsonp-strict/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 | 6 +++--- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 7ff153b3..a6bbfd1f 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 1c2fa02e..7e70522a 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 7bcb2ab4..783af8a0 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index beaa8578..0822688c 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index af1938bb..16376e82 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index 965cf87b..1f8a4eae 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index ae2af230..7943a576 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 2bea5fb5..40ed39f5 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 15cdb1d7..358d5691 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 1e6fae18..cec27684 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 6e9f2c56..811460d1 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 7f288a4c..98d7430f 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.20 +1.2.21-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 23b37e88..fbcf4d58 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.20 + 1.2.21-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -38,7 +38,7 @@ UTF-8 UTF-8 -1678727417 +1678727528 1.8 1.8 @@ -584,7 +584,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.20 +HEAD
[johnzon] annotated tag v1.2.20 updated (685eaf37 -> 47509c12)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to annotated tag v1.2.20 in repository https://gitbox.apache.org/repos/asf/johnzon.git *** WARNING: tag v1.2.20 was modified! *** from 685eaf37 (commit) to 47509c12 (tag) tagging 685eaf37013629b338dd688ed07fe808a1533432 (commit) replaces v1.2.19 by Jean-Louis Monteiro on Mon Mar 13 18:12:08 2023 +0100 - Log - [maven-release-plugin] copy for tag v1.2.20 --- No new revisions were added by this update. Summary of changes:
svn commit: r60569 - /dev/johnzon/johnzon-1.2.20/
Author: jlmonteiro Date: Mon Mar 13 18:48:16 2023 New Revision: 60569 Log: Apache Johnzon 1.2.20 ready for vote Added: dev/johnzon/johnzon-1.2.20/ dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz (with props) dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip (with props) dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.tar.gz (with props) dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.tar.gz.asc dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.tar.gz.sha512 dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.zip (with props) dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.zip.asc dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-src.zip.sha512 Added: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz == Binary file - no diff available. Propchange: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc == --- dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc (added) +++ dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.asc Mon Mar 13 18:48:16 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmQPa+4ACgkQNYgHxStL +DiPEiQ/6Ar7ZQhvk3s/Z37Gh/9iEk7zIz9e70Chat1HEq05C7twmVbwG+611LDkC +4ZaBHP2/4M6SVPtchvdlB57KORDMd1eqY8B9rbRqmpa4ppe4NhxqEv+7KWRT7gqA +r6iATgJECVtst0Lk8sjgPsXjsVY2G899F8L/v92BHhQ5iIrA/BHkhf4X6TC/uIfy +8pgsmEeDxGyHssysMZFkEVlel04q5EaHlHPlAMfZN3bWdPwe1CxIZIT5RbgquEcp +TZUvjxPxusBFRFsSgYqBXlIfg72Evpt5y/G4beWHFWV7FfNMwzKgMmiGa0jyE+4N +Oau1XJT0RF0XLusItXAMnPdVcVBpGj/Q5z7oZuxNscufYg6+J7JsqOFwSqfiKz/D +KAvuQT0U2tiQq9hDDzrlmTK3HP0xjzDsR5WzGviEczVabxTvSEhbQxgDLVNv2JTO +tCR6JS4cwnea6koxAam21oopUYDJoTQNVxddfykAR0fbZ/5iTgepksaGR5oaDkYO +ch9vqJ9Ou8+DY16cFtWnFKrMPinNQUfqzgVG6JPShqYZM0I7nvyaWTJllHXel3aR +huD+bvqPBnuDEmhB5zs2ncZLpm1UahZLC70+bKPVo6AhAwAwX9gZH4xjIwstG7MD +7MoxMJQADRDTX+MbrEUQhHRwbnNZ/Vz2W8q7UzliSTrKltNzVm4= +=PXK4 +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 == --- dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 (added) +++ dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.tar.gz.sha512 Mon Mar 13 18:48:16 2023 @@ -0,0 +1 @@ +202e6465307d156ffca3e28331902681bb5fc2885462cc894de680c2cfb1b6b88f911fa5358bf3081a5e4ac6da1746d3975779c064af8767113b0cb385cbf079 apache-johnzon-1.2.20-bin.tar.gz Added: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip == Binary file - no diff available. Propchange: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc == --- dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc (added) +++ dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.asc Mon Mar 13 18:48:16 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmQPa+4ACgkQNYgHxStL +DiNXtQ//aiUUQQF0mLD8n0XHJuMhkLAR088OdJ2XOQ/ulm8h0GSEaFyvDq2get6v +qgTMf4cx+FxTqQhk2wtLWTzlh6gDIbNzDcJR48JED85jeq9d9QGG/GwKg6c3o3/r +a663/MwiRv3ZRSdkrypH2r3WWLTLP10TkQWDGmx/9RLPycterytznaYT+cfi3Rr+ +RCHOVSRhrqhx23cSk8ann4o/kHF5n7OSAvFm4OUn9nAINPoj+q5t/gIpYD5y+xXU +xlHXjcW0ym4tC6T7FhIEoQFIHC4evt01ak5hwlguIvzux5tdyUQYF3DZ8QTf2TMF +Kkmyikp6lytyab3qQvvvmmuRLk1MQgZlqLI29o6JTxVk0eKJvuxC8aBzdjXfT/wc +EdJh1tg34TdyWfk+7t7KVh4CJlZ6n7kmcV13f8tMnYCOI72bmDMnL3ibGWFZbAwz ++lk9V8ugWb6Uv+AoRkJt/bt8ScPdSnE627oiOlG3iMeZJnSMtmjdeT5wZs04srAT +E4HPQor3bJAwspUmrSlwQYrxZij1D14tlvUTI/mVuqH8p99il96V3VeCEM74upu7 +yWoj0CkDwSm2dzfXrCjjAiBFodvAU0ty5l0E9xjsYttLZZ4gLl5FjXwGVal6NJtU +EPOkHh/u5z4iKQRKZfn07VzOzhkjFgatWNZXTkG6+zXc1YOptzM= +=kCLN +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 == --- dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 (added) +++ dev/johnzon/johnzon-1.2.20/apache-johnzon-1.2.20-bin.zip.sha512 Mon Mar 13 18:48:16 2023 @@ -0,0 +1
[johnzon] branch jakartaee-10-tck updated (0d7b1e70 -> f72f21f9)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch jakartaee-10-tck in repository https://gitbox.apache.org/repos/asf/johnzon.git from 0d7b1e70 Jakarta EE 10 TCK setup add f72f21f9 Fix Nillable for fields and set the local for TCK to be independent from the platform running the suite No new revisions were added by this update. Summary of changes: .../org/apache/johnzon/jsonb/JsonbAccessMode.java| 20 tck/jsonb/pom.xml| 1 + 2 files changed, 13 insertions(+), 8 deletions(-)
[johnzon] 01/01: Jakarta EE 10 TCK setup
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee-10-tck
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 0d7b1e70ad0e8e2a1dc7f28ad3168f166c576b4e
Author: Jean-Louis Monteiro
AuthorDate: Fri Jan 13 00:03:38 2023 +0100
Jakarta EE 10 TCK setup
Signed-off-by: Jean-Louis Monteiro
---
pom.xml | 1 +
tck/jsonb/pom.xml | 147 +
tck/jsonp/pom.xml | 149 ++
tck/pom.xml | 37 ++
4 files changed, 334 insertions(+)
diff --git a/pom.xml b/pom.xml
index 521f2d10..056fd0ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
johnzon-jsonschema
johnzon-osgi
johnzon-jsonlogic
+tck
diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml
new file mode 100644
index ..51225231
--- /dev/null
+++ b/tck/jsonb/pom.xml
@@ -0,0 +1,147 @@
+
+
+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;>
+
+tck
+org.apache.johnzon
+2.0.0-SNAPSHOT
+
+ 4.0.0
+
+ jsonb
+ Johnzon :: TCK :: JSON-B
+ jar
+
+
+
+ jakarta.json.bind
+ jakarta.json.bind-api
+
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+ 4.0.1
+
+
+ org.apache.johnzon
+ johnzon-jsonb
+ ${project.version}
+
+
+
+ jakarta.json.bind
+ jakarta.json.bind-tck
+ 3.0.0
+ test
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-se
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-impl
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-spi
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+
+ org.netbeans.tools
+ sigtest-maven-plugin
+ 1.6
+ test
+
+
+
+
+
+
+src/test/resources
+true
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+${surefire.version}
+
+ false
+ 1
+
+jakarta.json.bind:jakarta.json.bind-tck
+
+
+ee.jakarta.tck.json.bind.**
+
+
+
+
${project.build.outputDirectory}
+
+
+
+
+
+
+
+
diff --git a/tck/jsonp/pom.xml b/tck/jsonp/pom.xml
new file mode 100644
index ..46fb7db0
--- /dev/null
+++ b/tck/jsonp/pom.xml
@@ -0,0 +1,149 @@
+
+
+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;>
+
+tck
+org.apache.johnzon
+2.0.0-SNAPSHOT
+
+ 4.0.0
+
+ jsonp
+ Johnzon :: TCK :: JSON-P
+ jar
+
+
+
+ jakarta.json
+ jakarta.json-api
+
+
+ org.apache.johnzon
+ johnzon-core
+ ${project.version}
+
+
+
+ jakarta.json
+ jakarta.json-tck-tests
+ 2.1.1
+ test
+
+
+ jakarta.json
+ jakarta.json-tck-tests-pluggability
+ 2.1.1
+ test
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-se
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-impl
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-spi
+ 2.0.27
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+
+ org.netbeans.tools
+ sigtest-maven-plugin
+ 1.6
+ test
+
+
+
+
+
+
+src/test/resources
+true
+
+
+
+
+org.apache.maven.plugins
+maven-surefire-plugin
+3.0.0-M7
+
+ false
+ 1
+
+jakarta.json:jakarta.json-tck-tests
+
jakarta.json:jakarta.j
[johnzon] branch jakartaee-10-tck created (now 0d7b1e70)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch jakartaee-10-tck in repository https://gitbox.apache.org/repos/asf/johnzon.git at 0d7b1e70 Jakarta EE 10 TCK setup This branch includes the following new commits: new 0d7b1e70 Jakarta EE 10 TCK setup 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: JOHNZON-394 Make Johnzon JSON Pointer compatible by default
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro 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 d8357f8c JOHNZON-394 Make Johnzon JSON Pointer compatible by default
d8357f8c is described below
commit d8357f8c8b28b3ac563350f21c4fe472aee2b476
Author: Jean-Louis Monteiro
AuthorDate: Wed Jan 11 13:55:41 2023 +0100
JOHNZON-394 Make Johnzon JSON Pointer compatible by default
Signed-off-by: Jean-Louis Monteiro
---
.../johnzon/core/DefaultJsonPointerFactory.java| 38 ---
.../org/apache/johnzon/core/JsonPointerImpl.java | 12 +---
.../org/apache/johnzon/core/JsonProviderImpl.java | 16 +
.../johnzon/core/spi/JsonPointerFactory.java | 36 ---
.../org/apache/johnzon/core/JsonPointerTest.java | 13
.../core}/StrictJsonPointerFactoryTest.java| 11 ++--
johnzon-jsonp-strict/pom.xml | 73 --
.../jsonp/strict/StrictJsonPointerFactory.java | 51 ---
.../org.apache.johnzon.core.spi.JsonPointerFactory | 1 -
pom.xml| 1 -
10 files changed, 9 insertions(+), 243 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/DefaultJsonPointerFactory.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/DefaultJsonPointerFactory.java
deleted file mode 100644
index e2991345..
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/DefaultJsonPointerFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.core;
-
-import org.apache.johnzon.core.spi.JsonPointerFactory;
-
-import jakarta.json.JsonPointer;
-import jakarta.json.spi.JsonProvider;
-
-/**
- * This is not a standard factory but allows Johnzon to support an extended
version of JSon Pointer.
- * By default, we support an extended usage of /- when used with
replace/remove/get. But in the johnzon-jsonp-strict
- * module, it's overridden so we can pass the JSONP TCK in standalone
environments or TomEE or else.
- */
-public class DefaultJsonPointerFactory implements JsonPointerFactory {
-
-@Override
-public JsonPointer createPointer(final JsonProvider provider, final String
path) {
-return new JsonPointerImpl(provider, path);
-}
-
-}
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 b55ec8dc..57912d0b 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
@@ -476,7 +476,7 @@ public class JsonPointerImpl implements JsonPointer {
return jsonArray.size();
} else if (!addOperation && referenceToken.equals("-")) {
-final int arrayIndex = jsonArray.size() - minusShift();
+final int arrayIndex = jsonArray.size();
validateArraySize(referenceToken, jsonArray, arrayIndex,
jsonArray.size());
return arrayIndex;
}
@@ -493,16 +493,6 @@ public class JsonPointerImpl implements JsonPointer {
}
}
-/**
- * This method can be overridden in sub classes.
- * It's main goal is to support patch operation using "-" to replace,
remove last element which is forbidden in JsonPointer
- *
- * @return the shift to apply on minus. For backward compatibility it's 1.
We can have a strict JSONP compliancy with the dedicated module.
- */
-protected int minusShift() {
-return 1;
-}
-
private void validateJsonPointer(JsonValue target, int size) throws
NullPointerException, JsonException {
if (target == null) {
throw new NullPointerException("target must not be null");
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
index 317dbbf5..dc664fe1 10064
[johnzon] branch master updated (b25243b2 -> 9f85ab84)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git from b25243b2 [JOHNZON-390] ensure jsonb creator/constructor parameters respect naming strategy add 7338430e First javax to jakarta migration in code and dependencies add ff608b46 We don't need java 8 anymore add b1e4731e Some small other transitions to jakarta namespace add 61467e82 import ordering issue after javax to jakarta switch add 0c407f66 Some more fixes to move to jakarta namespace add 00c1654f Last fixes for the jakarta namespace new 9f85ab84 Merge pull request #97 from apache/javax-to-jakarta 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: .github/workflows/maven.yml| 2 +- johnzon-core/pom.xml | 4 +- .../johnzon/core/DefaultJsonPointerFactory.java| 4 +- .../java/org/apache/johnzon/core/DiffBase.java | 6 +- .../org/apache/johnzon/core/JohnzonJsonParser.java | 10 +- .../apache/johnzon/core/JohnzonJsonParserImpl.java | 6 +- .../apache/johnzon/core/JsonArrayBuilderImpl.java | 10 +- .../org/apache/johnzon/core/JsonArrayImpl.java | 12 +-- .../johnzon/core/JsonBuilderFactoryImpl.java | 10 +- .../java/org/apache/johnzon/core/JsonChars.java| 2 +- .../org/apache/johnzon/core/JsonDoubleImpl.java| 2 +- .../johnzon/core/JsonGeneratorFactoryImpl.java | 4 +- .../org/apache/johnzon/core/JsonGeneratorImpl.java | 16 ++-- .../apache/johnzon/core/JsonInMemoryParser.java| 14 +-- .../org/apache/johnzon/core/JsonLocationImpl.java | 2 +- .../java/org/apache/johnzon/core/JsonLongImpl.java | 2 +- .../apache/johnzon/core/JsonMergePatchDiff.java| 8 +- .../apache/johnzon/core/JsonMergePatchImpl.java| 8 +- .../org/apache/johnzon/core/JsonNumberImpl.java| 2 +- .../apache/johnzon/core/JsonObjectBuilderImpl.java | 10 +- .../org/apache/johnzon/core/JsonObjectImpl.java| 12 +-- .../apache/johnzon/core/JsonParserFactoryImpl.java | 8 +- .../apache/johnzon/core/JsonPatchBuilderImpl.java | 12 +-- .../org/apache/johnzon/core/JsonPatchDiff.java | 14 +-- .../org/apache/johnzon/core/JsonPatchImpl.java | 20 ++-- .../org/apache/johnzon/core/JsonPointerImpl.java | 18 ++-- .../org/apache/johnzon/core/JsonProviderImpl.java | 48 +- .../apache/johnzon/core/JsonReaderFactoryImpl.java | 6 +- .../org/apache/johnzon/core/JsonReaderImpl.java| 20 ++-- .../apache/johnzon/core/JsonStreamParserImpl.java | 6 +- .../org/apache/johnzon/core/JsonStringImpl.java| 2 +- .../apache/johnzon/core/JsonWriterFactoryImpl.java | 6 +- .../org/apache/johnzon/core/JsonWriterImpl.java| 12 +-- .../core/RFC4627AwareInputStreamReader.java| 2 +- .../johnzon/core/RejectDuplicateKeysMode.java | 4 +- .../org/apache/johnzon/core/SerializableValue.java | 6 +- .../main/java/org/apache/johnzon/core/Snippet.java | 12 +-- .../main/java/org/apache/johnzon/core/Strings.java | 2 +- .../johnzon/core/io/BoundedOutputStreamWriter.java | 2 +- .../johnzon/core/spi/JsonPointerFactory.java | 4 +- JsonProvider => jakarta.json.spi.JsonProvider} | 0 .../org/apache/johnzon/core/BrokenDefaultTest.java | 6 +- .../johnzon/core/BufferStrategyFactoryTest.java| 4 +- .../johnzon/core/JsonArrayBuilderImplTest.java | 10 +- .../org/apache/johnzon/core/JsonArrayImplTest.java | 6 +- .../johnzon/core/JsonBuilderFactoryTest.java | 6 +- .../org/apache/johnzon/core/JsonCollectorTest.java | 12 +-- .../johnzon/core/JsonGeneratorFactoryImplTest.java | 2 +- .../apache/johnzon/core/JsonGeneratorImplTest.java | 14 +-- .../johnzon/core/JsonMergeBatchDiffTest.java | 6 +- .../apache/johnzon/core/JsonMergeBatchTest.java| 12 +-- .../org/apache/johnzon/core/JsonNumberTest.java| 6 +- .../johnzon/core/JsonObjectBuilderImplTest.java| 10 +- .../apache/johnzon/core/JsonObjectImplTest.java| 10 +- .../johnzon/core/JsonParserStreamingTest.java | 10 +- .../org/apache/johnzon/core/JsonParserTest.java| 22 ++--- .../apache/johnzon/core/JsonPatchBuilderTest.java | 14 +-- .../org/apache/johnzon/core/JsonPatchDiffTest.java | 16 ++-- .../org/apache/johnzon/core/JsonPatchTest.java | 18 ++-- .../org/apache/johnzon/core/JsonPointerTest.java | 20 ++-- .../org/apache/johnzon/core/JsonProviderTest.java | 6 +- .../apache/johnzon/core/JsonReaderImplTest.java| 22 ++--- .../johnzon/core/JsonStreamParserImplTest.java | 2 +- .../apache/johnzon/core/JsonWriterImplTest.java| 10 +- .../java/org/apache/johnzon/core/LocationTest.java
[johnzon] 01/01: Merge pull request #97 from apache/javax-to-jakarta
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 9f85ab847905b8057575f5d2759cec601932d774 Merge: b25243b2 00c1654f Author: Jean-Louis Monteiro AuthorDate: Wed Jan 11 13:35:12 2023 +0100 Merge pull request #97 from apache/javax-to-jakarta JOHNZON-391 JOHNZON-392 JSON-P 2.1.1 and JSON-B 3.0.0 (jakarta namespace) .github/workflows/maven.yml| 2 +- johnzon-core/pom.xml | 4 +- .../johnzon/core/DefaultJsonPointerFactory.java| 4 +- .../java/org/apache/johnzon/core/DiffBase.java | 6 +- .../org/apache/johnzon/core/JohnzonJsonParser.java | 10 +- .../apache/johnzon/core/JohnzonJsonParserImpl.java | 6 +- .../apache/johnzon/core/JsonArrayBuilderImpl.java | 10 +- .../org/apache/johnzon/core/JsonArrayImpl.java | 12 +-- .../johnzon/core/JsonBuilderFactoryImpl.java | 10 +- .../java/org/apache/johnzon/core/JsonChars.java| 2 +- .../org/apache/johnzon/core/JsonDoubleImpl.java| 2 +- .../johnzon/core/JsonGeneratorFactoryImpl.java | 4 +- .../org/apache/johnzon/core/JsonGeneratorImpl.java | 16 ++-- .../apache/johnzon/core/JsonInMemoryParser.java| 14 +-- .../org/apache/johnzon/core/JsonLocationImpl.java | 2 +- .../java/org/apache/johnzon/core/JsonLongImpl.java | 2 +- .../apache/johnzon/core/JsonMergePatchDiff.java| 8 +- .../apache/johnzon/core/JsonMergePatchImpl.java| 8 +- .../org/apache/johnzon/core/JsonNumberImpl.java| 2 +- .../apache/johnzon/core/JsonObjectBuilderImpl.java | 10 +- .../org/apache/johnzon/core/JsonObjectImpl.java| 12 +-- .../apache/johnzon/core/JsonParserFactoryImpl.java | 8 +- .../apache/johnzon/core/JsonPatchBuilderImpl.java | 12 +-- .../org/apache/johnzon/core/JsonPatchDiff.java | 14 +-- .../org/apache/johnzon/core/JsonPatchImpl.java | 20 ++-- .../org/apache/johnzon/core/JsonPointerImpl.java | 18 ++-- .../org/apache/johnzon/core/JsonProviderImpl.java | 48 +- .../apache/johnzon/core/JsonReaderFactoryImpl.java | 6 +- .../org/apache/johnzon/core/JsonReaderImpl.java| 20 ++-- .../apache/johnzon/core/JsonStreamParserImpl.java | 6 +- .../org/apache/johnzon/core/JsonStringImpl.java| 2 +- .../apache/johnzon/core/JsonWriterFactoryImpl.java | 6 +- .../org/apache/johnzon/core/JsonWriterImpl.java| 12 +-- .../core/RFC4627AwareInputStreamReader.java| 2 +- .../johnzon/core/RejectDuplicateKeysMode.java | 4 +- .../org/apache/johnzon/core/SerializableValue.java | 6 +- .../main/java/org/apache/johnzon/core/Snippet.java | 12 +-- .../main/java/org/apache/johnzon/core/Strings.java | 2 +- .../johnzon/core/io/BoundedOutputStreamWriter.java | 2 +- .../johnzon/core/spi/JsonPointerFactory.java | 4 +- JsonProvider => jakarta.json.spi.JsonProvider} | 0 .../org/apache/johnzon/core/BrokenDefaultTest.java | 6 +- .../johnzon/core/BufferStrategyFactoryTest.java| 4 +- .../johnzon/core/JsonArrayBuilderImplTest.java | 10 +- .../org/apache/johnzon/core/JsonArrayImplTest.java | 6 +- .../johnzon/core/JsonBuilderFactoryTest.java | 6 +- .../org/apache/johnzon/core/JsonCollectorTest.java | 12 +-- .../johnzon/core/JsonGeneratorFactoryImplTest.java | 2 +- .../apache/johnzon/core/JsonGeneratorImplTest.java | 14 +-- .../johnzon/core/JsonMergeBatchDiffTest.java | 6 +- .../apache/johnzon/core/JsonMergeBatchTest.java| 12 +-- .../org/apache/johnzon/core/JsonNumberTest.java| 6 +- .../johnzon/core/JsonObjectBuilderImplTest.java| 10 +- .../apache/johnzon/core/JsonObjectImplTest.java| 10 +- .../johnzon/core/JsonParserStreamingTest.java | 10 +- .../org/apache/johnzon/core/JsonParserTest.java| 22 ++--- .../apache/johnzon/core/JsonPatchBuilderTest.java | 14 +-- .../org/apache/johnzon/core/JsonPatchDiffTest.java | 16 ++-- .../org/apache/johnzon/core/JsonPatchTest.java | 18 ++-- .../org/apache/johnzon/core/JsonPointerTest.java | 20 ++-- .../org/apache/johnzon/core/JsonProviderTest.java | 6 +- .../apache/johnzon/core/JsonReaderImplTest.java| 22 ++--- .../johnzon/core/JsonStreamParserImplTest.java | 2 +- .../apache/johnzon/core/JsonWriterImplTest.java| 10 +- .../java/org/apache/johnzon/core/LocationTest.java | 10 +- .../java/org/apache/johnzon/core/OverflowTest.java | 12 +-- .../org/apache/johnzon/core/SerializationTest.java | 10 +- .../java/org/apache/johnzon/core/SnippetTest.java | 12 +-- johnzon-distribution/pom.xml | 20 ++-- johnzon-distribution/src/assembly/bin.xml | 2 +- johnzon-jaxrs/pom.xml | 8 +- .../johnzon/jaxrs/ConfigurableJohnzonProvider.java | 16 ++-- .../org/apache/johnzon/jaxrs/DelegateProvider.java | 10 +- .../johnzon/ja
[johnzon] branch javax-to-jakarta updated (0c407f66 -> 00c1654f)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javax-to-jakarta in repository https://gitbox.apache.org/repos/asf/johnzon.git from 0c407f66 Some more fixes to move to jakarta namespace add 00c1654f Last fixes for the jakarta namespace No new revisions were added by this update. Summary of changes: .../src/test/resources/SomeValue.record.java | 2 +- johnzon-websocket/pom.xml | 2 +- .../org/apache/johnzon/websocket/JsrCodecTest.java | 6 ++ .../apache/johnzon/websocket/MapperCodecTest.java | 24 +++--- 4 files changed, 16 insertions(+), 18 deletions(-)
[johnzon] branch javax-to-jakarta updated (61467e82 -> 0c407f66)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javax-to-jakarta in repository https://gitbox.apache.org/repos/asf/johnzon.git from 61467e82 import ordering issue after javax to jakarta switch add 0c407f66 Some more fixes to move to jakarta namespace No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/johnzon/jaxrs/DelegateProvider.java | 2 +- .../org/apache/johnzon/jaxrs/jsonb/jaxrs/JsonbJaxrsProvider.java | 2 +- .../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java | 2 +- .../org/apache/johnzon/jsonschema/generator/SchemaProcessor.java | 5 - .../main/java/org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java | 2 +- src/site/markdown/index.md | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-)
[johnzon] branch javax-to-jakarta updated (7338430e -> 61467e82)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javax-to-jakarta in repository https://gitbox.apache.org/repos/asf/johnzon.git from 7338430e First javax to jakarta migration in code and dependencies add ff608b46 We don't need java 8 anymore add b1e4731e Some small other transitions to jakarta namespace add 61467e82 import ordering issue after javax to jakarta switch No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 2 +- .../johnzon/jsonschema/generator/PojoGeneratorTest.java | 2 +- .../org/apache/johnzon/osgi/cdi/RegisterCdiExtension.java | 2 +- johnzon-websocket/pom.xml | 15 ++- 4 files changed, 17 insertions(+), 4 deletions(-)
[johnzon] branch javax-to-jakarta created (now 7338430e)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch javax-to-jakarta in repository https://gitbox.apache.org/repos/asf/johnzon.git at 7338430e First javax to jakarta migration in code and dependencies This branch includes the following new commits: new 7338430e First javax to jakarta migration in code and dependencies 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 johnzon-1.2.x created (now b25243b2)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch johnzon-1.2.x in repository https://gitbox.apache.org/repos/asf/johnzon.git at b25243b2 [JOHNZON-390] ensure jsonb creator/constructor parameters respect naming strategy No new revisions were added by this update.
[johnzon] branch master updated: Add also a relocation for JAX-RS APIs
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 a1c53d9 Add also a relocation for JAX-RS APIs a1c53d9 is described below commit a1c53d99c3280cbfc35b369ac4ce138e12f1d5ff Author: Jean-Louis Monteiro AuthorDate: Tue Feb 22 12:23:16 2022 +0100 Add also a relocation for JAX-RS APIs Signed-off-by: Jean-Louis Monteiro --- pom.xml | 22 -- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 6d0cdbb..1675ae5 100644 --- a/pom.xml +++ b/pom.xml @@ -125,20 +125,26 @@ -javax.json -jakarta.json - - javax.annotation jakarta.annotation + + javax.annotation.processing.** + + + +javax.enterprise +jakarta.enterprise + + javax.enterprise.deploy.** + javax.inject jakarta.inject -javax.enterprise -jakarta.enterprise +javax.json +jakarta.json javax.servlet @@ -148,6 +154,10 @@ javax.websocket jakarta.websocket + +javax.ws.rs +jakarta.ws.rs +
[johnzon] branch master updated (0f3ee62 -> 996f41e)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git. from 0f3ee62 [maven-release-plugin] prepare for next development iteration add d860b27 [maven-release-plugin] prepare release v1.2.15 new 75181e8 [maven-release-plugin] prepare for next development iteration new 996f41e Merge remote-tracking branch 'origin/master' into master 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] 02/02: Merge remote-tracking branch 'origin/master' into master
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 996f41e236fb3fdfcf4ad837a4987e852cb592eb Merge: 75181e8 0f3ee62 Author: Jean-Louis Monteiro AuthorDate: Thu Feb 3 11:26:44 2022 +0100 Merge remote-tracking branch 'origin/master' into master johnzon-core/pom.xml | 3 +- .../org/apache/johnzon/core/JsonGeneratorImpl.java | 17 ++-- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml | 2 +- johnzon-json-extras/pom.xml| 3 +- johnzon-jsonb/pom.xml | 6 +- .../org/apache/johnzon/jsonb/JohnzonBuilder.java | 5 +- .../org/apache/johnzon/jsonb/JsonbAccessMode.java | 18 +++- .../java/org/apache/johnzon/jsonb/AdapterTest.java | 40 .../johnzon/jsonb/DynamicBufferResizingTest.java | 2 +- .../apache/johnzon/jsonb/SerializersMapTest.java | 106 + .../SerializersObjectWithEmbeddedListTest.java | 87 + .../org/apache/johnzon/jsonb/test/JsonbRule.java | 24 +++-- johnzon-jsonlogic/pom.xml | 4 +- johnzon-jsonp-strict/pom.xml | 4 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 3 +- .../johnzon/mapper/DynamicMappingGenerator.java| 1 + .../johnzon/mapper/MappingGeneratorImpl.java | 66 +++-- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 6 +- johnzon-websocket/pom.xml | 2 +- pom.xml| 2 +- 23 files changed, 328 insertions(+), 79 deletions(-)
[johnzon] 01/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/johnzon.git commit 75181e8f89545194ec8e6173b2bae33675682c57 Author: Jean-Louis Monteiro AuthorDate: Tue Oct 12 22:56:49 2021 +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-jsonp-strict/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 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 02684df..9d95c1c 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 1828feb..54b655f 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 2c67f55..3ea7e78 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 8031108..19ad0bf 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 8bdba20..64077db 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index a588c30..44ec61b 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index 7184e0c..df38380 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 1bcb7fe..add4c6a 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 01dde6c..f8ecffb 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index fef8328..1c854a4 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 402a084..43eff28 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 5105338..21b573c 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.15 +1.2.16-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 65e8496..b4d857c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.15 + 1.2.16-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -491,7 +491,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.15 +HEAD
svn commit: r50669 - in /dev/johnzon: KEYS johnzon-1.2.15-source-release.zip johnzon-1.2.15-source-release.zip.asc johnzon-1.2.15-source-release.zip.sha512
Author: jlmonteiro Date: Thu Oct 28 22:40:13 2021 New Revision: 50669 Log: Vote passed for Johnzon 1.2.15 so moved to dist release Removed: dev/johnzon/KEYS dev/johnzon/johnzon-1.2.15-source-release.zip dev/johnzon/johnzon-1.2.15-source-release.zip.asc dev/johnzon/johnzon-1.2.15-source-release.zip.sha512
svn commit: r50668 - in /release/johnzon/johnzon-1.2.15: ./ johnzon-1.2.15-source-release.zip johnzon-1.2.15-source-release.zip.asc johnzon-1.2.15-source-release.zip.sha512
Author: jlmonteiro Date: Thu Oct 28 22:39:49 2021 New Revision: 50668 Log: Release Apache Johnzon 1.2.15 Added: release/johnzon/johnzon-1.2.15/ release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip (with props) release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.asc release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.sha512 Added: release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.asc == --- release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.asc (added) +++ release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.asc Thu Oct 28 22:39:49 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmFl9tYACgkQNYgHxStL +DiMlOBAAkh93ccW1XlFT3ZF5gwYzlo0zQrq3aO9ooTTHtnyg/S58CHF9gjVrfT1n +I/ODYm9Ch+8iyohxhzn/eWKzIioW13m+j/dQMmAQUFxvLk9XZJhgGyHxysYZDQQ/ +o306ysYfvVCeM/zdeczJRaZ/2/WE18UJIpEg8ah9dTOsd+ARPEgZheqCbeLmhfxc +FyPxopC7ghqYMjIStV7RwADfDdzF/XM14ywWX6aLDlPtVFqM38rEMboqv7SS88hF +7pv6UXt0D8If/GN/zcJK4nSPO+Vo055vQ4nkUxfbD3rI4OIg0sj8JPhmrBpXCexX +m22b5qEBTczKEpzqI0aWcxQDEpAiEPmo0P+BXpZLv6KdM83lBJAL3duIsal1lWpi +6dnh0FqtFuMj+TXJtKRLrmdjwQEaXWFtgBT1EU37DxluQOEEoPH50hq6FB5f3qp7 +yHUVmrYxRtGk1E9Idsf+yOMLHi5k7hFAKVXDUkiQ1DAaSMoEUUbY/8S4l9C8KQnC +wIntHR8kdElxAxi4q3Sy4sg5yfeDkBvkAhBhe936/UMKCOFsLerarF0rQFUlIDWQ +q0ZGt4Eh66HsFVEwxN3LX7C/6K4zSPqtkF8vixRFkCRGVzJS2sqe4Fz5V12f4tPS +gELclMrpoRkTw7P6AQzuyu5ra6jAN+f/H0zEWnOVMki12pm2HdU= +=O3yt +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.sha512 == --- release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.sha512 (added) +++ release/johnzon/johnzon-1.2.15/johnzon-1.2.15-source-release.zip.sha512 Thu Oct 28 22:39:49 2021 @@ -0,0 +1,2 @@ +cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e apache-johnzon-1.2.15-bin.zip +08c0064fdd3d03b3341ef261cc5841bdbde8fd92e8c6e9220e78f4cefcce4934a7e80893a4795c05a670b7b622664695ccdc46419f17438d03acc8aa78e83970 johnzon-1.2.15-source-release.zip
svn commit: r50380 - in /dev/johnzon: johnzon-1.2.15-source-release.zip johnzon-1.2.15-source-release.zip.asc johnzon-1.2.15-source-release.zip.sha512
Author: jlmonteiro Date: Tue Oct 12 21:11:23 2021 New Revision: 50380 Log: Apache Johnzon 1.2.15 under vote Added: dev/johnzon/johnzon-1.2.15-source-release.zip (with props) dev/johnzon/johnzon-1.2.15-source-release.zip.asc dev/johnzon/johnzon-1.2.15-source-release.zip.sha512 Added: dev/johnzon/johnzon-1.2.15-source-release.zip == Binary file - no diff available. Propchange: dev/johnzon/johnzon-1.2.15-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-1.2.15-source-release.zip.asc == --- dev/johnzon/johnzon-1.2.15-source-release.zip.asc (added) +++ dev/johnzon/johnzon-1.2.15-source-release.zip.asc Tue Oct 12 21:11:23 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAmFl9tYACgkQNYgHxStL +DiMlOBAAkh93ccW1XlFT3ZF5gwYzlo0zQrq3aO9ooTTHtnyg/S58CHF9gjVrfT1n +I/ODYm9Ch+8iyohxhzn/eWKzIioW13m+j/dQMmAQUFxvLk9XZJhgGyHxysYZDQQ/ +o306ysYfvVCeM/zdeczJRaZ/2/WE18UJIpEg8ah9dTOsd+ARPEgZheqCbeLmhfxc +FyPxopC7ghqYMjIStV7RwADfDdzF/XM14ywWX6aLDlPtVFqM38rEMboqv7SS88hF +7pv6UXt0D8If/GN/zcJK4nSPO+Vo055vQ4nkUxfbD3rI4OIg0sj8JPhmrBpXCexX +m22b5qEBTczKEpzqI0aWcxQDEpAiEPmo0P+BXpZLv6KdM83lBJAL3duIsal1lWpi +6dnh0FqtFuMj+TXJtKRLrmdjwQEaXWFtgBT1EU37DxluQOEEoPH50hq6FB5f3qp7 +yHUVmrYxRtGk1E9Idsf+yOMLHi5k7hFAKVXDUkiQ1DAaSMoEUUbY/8S4l9C8KQnC +wIntHR8kdElxAxi4q3Sy4sg5yfeDkBvkAhBhe936/UMKCOFsLerarF0rQFUlIDWQ +q0ZGt4Eh66HsFVEwxN3LX7C/6K4zSPqtkF8vixRFkCRGVzJS2sqe4Fz5V12f4tPS +gELclMrpoRkTw7P6AQzuyu5ra6jAN+f/H0zEWnOVMki12pm2HdU= +=O3yt +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-1.2.15-source-release.zip.sha512 == --- dev/johnzon/johnzon-1.2.15-source-release.zip.sha512 (added) +++ dev/johnzon/johnzon-1.2.15-source-release.zip.sha512 Tue Oct 12 21:11:23 2021 @@ -0,0 +1,2 @@ +cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e apache-johnzon-1.2.15-bin.zip +08c0064fdd3d03b3341ef261cc5841bdbde8fd92e8c6e9220e78f4cefcce4934a7e80893a4795c05a670b7b622664695ccdc46419f17438d03acc8aa78e83970 johnzon-1.2.15-source-release.zip
[johnzon] annotated tag v1.2.15 updated (d860b27 -> 1d00c6b)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to annotated tag v1.2.15 in repository https://gitbox.apache.org/repos/asf/johnzon.git. *** WARNING: tag v1.2.15 was modified! *** from d860b27 (commit) to 1d00c6b (tag) tagging d860b273585db57a56b20473034d6b36c206e54c (commit) replaces v1.2.14 by Jean-Louis Monteiro on Tue Oct 12 22:56:49 2021 +0200 - Log - [maven-release-plugin] copy for tag v1.2.15 --- No new revisions were added by this update. Summary of changes:
[johnzon] branch master updated: Checkstyle
This is an automated email from the ASF dual-hosted git repository. jlmonteiro 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 d7daa44 Checkstyle d7daa44 is described below commit d7daa4428f95674a65818ac9d878f8a229f5f879 Author: Jean-Louis Monteiro AuthorDate: Tue Sep 21 11:24:48 2021 +0200 Checkstyle Signed-off-by: Jean-Louis Monteiro --- johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java index 8656416..5d85a40 100644 --- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java +++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java @@ -30,7 +30,6 @@ import javax.json.bind.config.BinaryDataStrategy; import javax.json.bind.spi.JsonbProvider; import java.io.ByteArrayInputStream; -import java.io.InputStream; import java.io.StringReader; import java.lang.reflect.Type; import java.nio.charset.StandardCharsets;
[johnzon] branch master updated: JOHNZON-351 support collection raw classes cast to Type in JSON-B Improve tests and case coverage
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro 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 64e7727 JOHNZON-351 support collection raw classes cast to Type in
JSON-B Improve tests and case coverage
64e7727 is described below
commit 64e7727fee45344659028f6e8a814486086f03b7
Author: Jean-Louis Monteiro
AuthorDate: Tue Sep 21 11:20:10 2021 +0200
JOHNZON-351 support collection raw classes cast to Type in JSON-B
Improve tests and case coverage
Signed-off-by: Jean-Louis Monteiro
---
.../java/org/apache/johnzon/jsonb/JohnzonJsonb.java | 4 ++--
.../java/org/apache/johnzon/jsonb/JsonbReadTest.java | 20
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
index bd9e9bc..69c4816 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
@@ -197,7 +197,7 @@ public class JohnzonJsonb implements Jsonb, AutoCloseable,
JsonbExtension {
} else if (JsonArray.class == runtimeType) {
return (T) delegate.readJsonArray(reader);
} else if (isCollection(runtimeType)) {
-return (T) delegate.readCollection(reader,
ParameterizedType.class.cast(runtimeType));
+return (T) delegate.readCollection(reader,
toCollectionType(runtimeType));
}
final Type mappingType = unwrapPrimitiveOptional(runtimeType);
final Object object = delegate.readObject(reader, mappingType);
@@ -240,7 +240,7 @@ public class JohnzonJsonb implements Jsonb, AutoCloseable,
JsonbExtension {
} else if (JsonArray.class == runtimeType) {
return (T) delegate.readJsonArray(stream);
} else if (isCollection(runtimeType)) {
-return (T) delegate.readCollection(stream,
ParameterizedType.class.cast(runtimeType));
+return (T) delegate.readCollection(stream,
toCollectionType(runtimeType));
}
final Type mappingType = unwrapPrimitiveOptional(runtimeType);
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
index 3ac7a48..8656416 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbReadTest.java
@@ -30,6 +30,7 @@ import javax.json.bind.config.BinaryDataStrategy;
import javax.json.bind.spi.JsonbProvider;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.StringReader;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
@@ -53,6 +54,25 @@ public class JsonbReadTest {
}
@Test
+public void simpleArrayMappingReader() throws Exception {
+final List expectedResult = asList("Test String");
+try (final Jsonb jsonb = JsonbBuilder.create()) {
+final Object unmarshalledObject = jsonb.fromJson(new
StringReader("[ \"Test String\" ]"), (Type) List.class);
+assertEquals(expectedResult, unmarshalledObject);
+}
+}
+
+@Test
+public void simpleArrayMappingInputStream() throws Exception {
+final List expectedResult = asList("Test String");
+try (final Jsonb jsonb = JsonbBuilder.create()) {
+final Object unmarshalledObject = jsonb.fromJson(new
ByteArrayInputStream("[ \"Test String\" ]".getBytes(
+StandardCharsets.UTF_8)), (Type) List.class);
+assertEquals(expectedResult, unmarshalledObject);
+}
+}
+
+@Test
public void boolFromString() {
assertTrue(JsonbProvider.provider().create().build().fromJson("true",
Boolean.class));
}
svn commit: r45056 - in /release/johnzon: KEYS johnzon-1.2.8/ johnzon-1.2.9/ johnzon-1.2.9/johnzon-1.2.9-source-release.zip johnzon-1.2.9/johnzon-1.2.9-source-release.zip.asc johnzon-1.2.9/johnzon-1.2
Author: jlmonteiro Date: Wed Dec 23 09:26:45 2020 New Revision: 45056 Log: Add Apache Johnzon 1.2.9 after vote passes Added: release/johnzon/johnzon-1.2.9/ release/johnzon/johnzon-1.2.9/johnzon-1.2.9-source-release.zip (with props) release/johnzon/johnzon-1.2.9/johnzon-1.2.9-source-release.zip.asc release/johnzon/johnzon-1.2.9/johnzon-1.2.9-source-release.zip.sha512 Removed: release/johnzon/johnzon-1.2.8/ Modified: release/johnzon/KEYS Modified: release/johnzon/KEYS == --- release/johnzon/KEYS (original) +++ release/johnzon/KEYS Wed Dec 23 09:26:45 2020 @@ -597,39 +597,100 @@ wSJ6Jng2POYtAQC5jGmB/Lt2D4Gfp0E6kjWj2U8u mfoA5aIoZWJRK1AzuuJ3BKl8ViTAgrhazZ1B+9w= =s6vt -END PGP PUBLIC KEY BLOCK- -pub 1024D/D297D428 2009-05-20 - Key fingerprint = DBCC D103 B8B2 4F86 FFAA B025 C8BB 472C D297 D428 -uid Jonathan Gallimore -sub 2048g/0F3DA4DA 2009-05-20 + +pub rsa2048 2017-08-27 [SC] + CF80A055A2AD28E9EFBF942A73129F58DE61ECBD +uid [ inconnue] Romain Manni-Bucau +sig 373129F58DE61ECBD 2017-08-27 Romain Manni-Bucau +sub rsa2048 2017-08-27 [E] +sig 73129F58DE61ECBD 2017-08-27 Romain Manni-Bucau -BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v2.0.19 (FreeBSD) -mQGiBEoT8mgRBAC8H3KDGS1w9WcDIpqmhXIhwg36BRei5ZX9FMA6ug9HDM3jPBq4 -Wy8XZIxULP4qZBIqrJFt3spRn/4b0ztXdYs9kv0t97ZZRUBbQfCkr1OjlJvU3H+7 -7UVBUiacFAe00rmLUqTYP08GR0kq3LMSDwEvNr0VpD24seZsGstx0C+dfwCg/4n9 -FufqWkI4geVT0rXSq9TDweUD/1+f8t2tHv/iyR+tX/BV6r8Pa4bW7SE0cURMJbka -ADBQ8AShX5lE5rXRrQG2XR9T6RhGDp6or1huauSeVB52e5uKoEDR5fww1TyuqDkg -NzUV2MZwQxt8FcRxQJD33lbe3clc/PrafjaqZZnfElnQp81DRDOzy2Ebd5+2kCVU -S6LbA/9D7MzR0duNmVR++57WOFIB2KwuhkcW48IaJU9gMgPDF8oTkA9Fbj7ple73 -2kNC8LDFOomXpZIjS2UmrkuOk+l7GgjcAiDABmhoyl4GOw4TUnMaC3LhSEVBcwl2 -6N8s8WY6y87l43hx+bpyjgk1Obs/nb5he9XcvTqHkddRGDYTbLQqSm9uYXRoYW4g -R2FsbGltb3JlIDxqZ2FsbGltb3JlQGFwYWNoZS5vcmc+iGAEExECACAFAkoT8mgC -GyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDIu0cs0pfUKF/RAJ9QWDS7RHC7 -B7MwJmZPj/GBVuJkggCeKrQ9axAhYN25NAHD+G0vkDbblVq5Ag0EShPyaBAIAMQg -tqWZIK1ccjg99jj/WshnwjSuxiDvWcFNOFZZKnPjXEJqFrfM5xttynVvb5rXNBjF -4/WVfGI9YQ2YU3pVwTleBk2yGPWX00G/K9PBRJwlXY/ziopY0kmJbRBSm8w04Ev5 -NlNpm/J71LXrKU9sxVJ8QE+k/QputXN0vKycqQgQof1xB9hknjtvVT61eamCDbct -9cpe1kUTDjkrD54nkj0kUeT393FUzbutoPpK6+CZIWiEjDWlhz3a+dFu54Lnhjio -Go1HSys5G8mzOLd4eD0VyZaz6ZJt71UcYiE7aOEw/TruuoHxML5AfG3nD4Lx/G+B -KpeQe+HGYdDdI0T/kQcAAwcH/AtHppWfy/re2S1qBtJKcZthq3jSQMizp8VFa472 -g8uzScll57z+Ov5v+9HGu+s2pwl4XohA1ewCeFEs+7k/z4JLGxT0avZ0Pkf8tOYE -VsMIOB6EpX2P/G+0htaeJ4N9jEz4i4DwFI7JRqVv0PG/gbRyzTGOmRjG9Ulnfk6o -yyIE+S3JC5Xrs3DXKiJNGZb6HaKULlyQt9vFJTBkBmVymiQ5QRqk7V51aLQf42XP -K6PKyMBcEqhwZMSC3mh57f5Hz2Fsjp8p4/zMgOMhqIfONABj6yHpnMDsitnJweYC -90mYOwFs6LlUZtl2BcdJ0fAfx5LCyJslyz719JzirlJCrU2ISQQYEQIACQUCShPy -aAIbDAAKCRDIu0cs0pfUKKwiAKCaBf/wkc0y75BR0xoHX81wCwo+gwCgxJV9cUa8 -g20gVwf1rJjXEXOHqPU= -=MAlp +mQENBFmiqUEBCAC41XpjWs8SyzUiEASzxplqdXp9RQKV7mHwS8G6sSWTTFS2dPiA +3HTELw9O280MiVtud+QPmgS8i3bHn82KwWtGKfv0WOt2e1PEUHDt3JJaAAtYNlgk +QY+3I2p2s7Hvq4UAkRsVH7UaSuzZE7b1d8P8un21InepAc46T0jnPOsYL0/Lrcn8 +TNvp9R15OIKnEyIuD9S7kHN9BYZRYhJemhdPLyniGAXuUd/c/kew1AgfsrmptDXZ +7+aTz+rOqArIpl9oSj15alALZskwm+SNLJjyXNfFs3ttAApA8HIHdtOkjIDzIWcG +9esjn/yFE81tzw0/9WWfZDKWKP2iO77MFnojABEBAAG0K1JvbWFpbiBNYW5uaS1C +dWNhdSA8cm1hbm5pYnVjYXVAYXBhY2hlLm9yZz6JATcEEwEIACEFAlmiqUECGwMF +CwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQcxKfWN5h7L30Zwf9HukDTCpOnRCu +6y4fM52RhLQewjkNEMs0zhJhCJdAprrgwKVNNgn0iph1KXkoa0WM+O1b3ePXrxxN +4UVf9g35bcvdFyPtj8P/tUxEADSmJLCqhKY2Fzd5YiNJpZDJY9Bo6QUDM5TOCKX/ +Zp+t/lk45C44KX+BgiJeDZwL5jBGQ8HK3W6EKiGC6H2MOlDCVssITWOSDhc5NXHz +hhaFPFNCcFZr3f54pLQX2byVfh1Mjrb3psbvffBWT0/m8/ZTxxOD4xoH6e0kO3+S +/yLLzCstDdyrfWY00bP24VsfmQ4FXzAN3SraXcZ/+NFtZvAxUPQm2Qy79YJY7Lj8 +1tJFtZJrE7kBDQRZoqlBAQgAwYlrLpxfUTFtZ7ixLop9fwWmyOMnrPKnEz6sCDNr +Y3AlUcoLpYSYsgWGvNUNJFlb1nKZWye0OVeT9aPmT7+3CLJ55CsiExuraVd5RvMj +i0Vp7A3571fhn+5RMh7gzsM3sFgKTx3bUL1udQSyXKjZf14jkRW0jL5h9qqlxLWr +LKrEqpHGzI48ULhD5CU21Y1YnTr0T2S/mSlFiymXBn6AoTt/Gtoi/0jAWQ736IA+ +1U83FYAj3ZpKQy7ahP3blhaJO+R35zpuPpN4AfdbcVyKJVo95P6oX8DImQ47M8gX +UvK4rxLK5fcdsUiwhhv2kWCWMiKkHFjHdV93xn52leUXmwARAQABiQEfBBgBCAAJ +BQJZoqlBAhsMAAoJEHMSn1jeYey9JsIH/1w9uzfZwmnwB5+Kd8yN98OEIJqt6HVv +XpW0rqUWxyEno+6DT1w+MAWZAPrW4tcZAN5lNSZBYTUONsr1yaFyGrKoFnNbdjvs +P+HB5seUL9ehtc7lKQkEdll+PUnRWGEl26YM3LbonwXF4jYkCLNb8a/Qm0obH//p +QcI8f3gd7piqCirHasshT3wx/G1U1wN/GnfDJy3W0Vkirim235sqB9njPEBhEB7V +yOuUgeVYvXUqHMPsAePqNmfEEqQKe5a/65RRrb44daSdcd3WpQpZQHEfUwyvh+qw +ghWVGoR1rDVkJkLLhxOh0GVvwvGWA7g6gUGV37nCv+sGXqRpvF9KtVE= +=jMUk -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2020-09-14 [SC] + 3948829384B269D333CC5B98358807C52B4B0E23 +uid [ ultime ] Jean-Louis Monteiro (CODE SIGNING KEY) +sig 3358807C52B4B0E23 2020-09-14 Jean-Louis Monteiro (CODE SIGNING KEY) +sub rsa4096 2020-09-14 [E] +sig 358807C52B4B0E23 2020-09-14 Jean-Louis Monteiro (CODE SIGNING
svn commit: r44979 - in /dev/johnzon: johnzon-1.2.9-source-release.zip johnzon-1.2.9-source-release.zip.asc johnzon-1.2.9-source-release.zip.sha512
Author: jlmonteiro Date: Tue Dec 15 14:52:25 2020 New Revision: 44979 Log: Apache Johnzon 1.2.9 Added: dev/johnzon/johnzon-1.2.9-source-release.zip (with props) dev/johnzon/johnzon-1.2.9-source-release.zip.asc dev/johnzon/johnzon-1.2.9-source-release.zip.sha512 Added: dev/johnzon/johnzon-1.2.9-source-release.zip == Binary file - no diff available. Propchange: dev/johnzon/johnzon-1.2.9-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/johnzon-1.2.9-source-release.zip.asc == --- dev/johnzon/johnzon-1.2.9-source-release.zip.asc (added) +++ dev/johnzon/johnzon-1.2.9-source-release.zip.asc Tue Dec 15 14:52:25 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEOUiCk4SyadMzzFuYNYgHxStLDiMFAl/Ytq4ACgkQNYgHxStL +DiN7ZA/+NpMbMT/+MkHoyIYsr7yCZ1SXTaKrDk4E9qrdUBj83qL6PPQavm4Rcssx +YVb4+nYdkea5UhrnfTSwloK/v1Vaq2my5mj/IXLYqioJhM64GR5986k3s3okeMyg +QieZ8/LSOlP4TLwSPxkldUjAAOFrbRPkhQwl9xwt1KQVYOqcTN05osaq7zZC1C1k +7K6ep8WRshMZDIHRMEvmnMcyuMDKF+cGVLnRhzcZIpZR5w4ZArR5I0kS7Pe1R6Sq +qs3IrEbUEqXKOzDZYSvxnQ3DiA/4avcMBWhpAEIOjWD7Y19xfZyczxy74a1iBgB8 +RpR91jNABfmqR8Ryx8teWGkxo1ivUYB4LKePwKfTSyi0QQBwtv02Y7hVs2H352mp +KmgKtn4Iue+6RFlOXFWRp1+7VdzWJRsXWUAAzPQ6Tid9X+087Rf7AhXgQyY+Y3m+ +CVrYnR+KabJYFA450g5hnce69rZQSq5mltSuqxA5/10IAUw0YZJ6YopGcxVuY9L5 +NNGWIctM295XSCR9c2AgnJq6vuroXnInicQ4ZTfBfk7TKi0gV+cbJhsntwiFd5s8 +D5gKD4adzMHBwqygPWOBuXZSUfn8WhzjG0rKJDALv6YjlK++PUluxgmy/DGBSn+p +CQJq6paY9L2wINUj7tHylnjuOHLC5Mye71GV0b5kBvnIzmKQfis= +=gxNE +-END PGP SIGNATURE- Added: dev/johnzon/johnzon-1.2.9-source-release.zip.sha512 == --- dev/johnzon/johnzon-1.2.9-source-release.zip.sha512 (added) +++ dev/johnzon/johnzon-1.2.9-source-release.zip.sha512 Tue Dec 15 14:52:25 2020 @@ -0,0 +1 @@ +fcf6fd6b0a2d58a0a8158a632d3308a18b61dc229dd4581591eac6ff7b425bb634e1ad5d187a4df4b455fccf7d65360a636433ff4831959aa9eafcd3c5ce01e4 johnzon-1.2.9-source-release.zip
svn commit: r44978 - /dev/johnzon/KEYS
Author: jlmonteiro Date: Tue Dec 15 14:50:46 2020 New Revision: 44978 Log: Apache Johnzon 1.2.9 Modified: dev/johnzon/KEYS Modified: dev/johnzon/KEYS == --- dev/johnzon/KEYS (original) +++ dev/johnzon/KEYS Tue Dec 15 14:50:46 2020 @@ -598,38 +598,99 @@ mfoA5aIoZWJRK1AzuuJ3BKl8ViTAgrhazZ1B+9w= =s6vt -END PGP PUBLIC KEY BLOCK- -pub 1024D/D297D428 2009-05-20 - Key fingerprint = DBCC D103 B8B2 4F86 FFAA B025 C8BB 472C D297 D428 -uid Jonathan Gallimore -sub 2048g/0F3DA4DA 2009-05-20 +pub rsa2048 2017-08-27 [SC] + CF80A055A2AD28E9EFBF942A73129F58DE61ECBD +uid [ inconnue] Romain Manni-Bucau +sig 373129F58DE61ECBD 2017-08-27 Romain Manni-Bucau +sub rsa2048 2017-08-27 [E] +sig 73129F58DE61ECBD 2017-08-27 Romain Manni-Bucau -BEGIN PGP PUBLIC KEY BLOCK- -Version: GnuPG v2.0.19 (FreeBSD) -mQGiBEoT8mgRBAC8H3KDGS1w9WcDIpqmhXIhwg36BRei5ZX9FMA6ug9HDM3jPBq4 -Wy8XZIxULP4qZBIqrJFt3spRn/4b0ztXdYs9kv0t97ZZRUBbQfCkr1OjlJvU3H+7 -7UVBUiacFAe00rmLUqTYP08GR0kq3LMSDwEvNr0VpD24seZsGstx0C+dfwCg/4n9 -FufqWkI4geVT0rXSq9TDweUD/1+f8t2tHv/iyR+tX/BV6r8Pa4bW7SE0cURMJbka -ADBQ8AShX5lE5rXRrQG2XR9T6RhGDp6or1huauSeVB52e5uKoEDR5fww1TyuqDkg -NzUV2MZwQxt8FcRxQJD33lbe3clc/PrafjaqZZnfElnQp81DRDOzy2Ebd5+2kCVU -S6LbA/9D7MzR0duNmVR++57WOFIB2KwuhkcW48IaJU9gMgPDF8oTkA9Fbj7ple73 -2kNC8LDFOomXpZIjS2UmrkuOk+l7GgjcAiDABmhoyl4GOw4TUnMaC3LhSEVBcwl2 -6N8s8WY6y87l43hx+bpyjgk1Obs/nb5he9XcvTqHkddRGDYTbLQqSm9uYXRoYW4g -R2FsbGltb3JlIDxqZ2FsbGltb3JlQGFwYWNoZS5vcmc+iGAEExECACAFAkoT8mgC -GyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDIu0cs0pfUKF/RAJ9QWDS7RHC7 -B7MwJmZPj/GBVuJkggCeKrQ9axAhYN25NAHD+G0vkDbblVq5Ag0EShPyaBAIAMQg -tqWZIK1ccjg99jj/WshnwjSuxiDvWcFNOFZZKnPjXEJqFrfM5xttynVvb5rXNBjF -4/WVfGI9YQ2YU3pVwTleBk2yGPWX00G/K9PBRJwlXY/ziopY0kmJbRBSm8w04Ev5 -NlNpm/J71LXrKU9sxVJ8QE+k/QputXN0vKycqQgQof1xB9hknjtvVT61eamCDbct -9cpe1kUTDjkrD54nkj0kUeT393FUzbutoPpK6+CZIWiEjDWlhz3a+dFu54Lnhjio -Go1HSys5G8mzOLd4eD0VyZaz6ZJt71UcYiE7aOEw/TruuoHxML5AfG3nD4Lx/G+B -KpeQe+HGYdDdI0T/kQcAAwcH/AtHppWfy/re2S1qBtJKcZthq3jSQMizp8VFa472 -g8uzScll57z+Ov5v+9HGu+s2pwl4XohA1ewCeFEs+7k/z4JLGxT0avZ0Pkf8tOYE -VsMIOB6EpX2P/G+0htaeJ4N9jEz4i4DwFI7JRqVv0PG/gbRyzTGOmRjG9Ulnfk6o -yyIE+S3JC5Xrs3DXKiJNGZb6HaKULlyQt9vFJTBkBmVymiQ5QRqk7V51aLQf42XP -K6PKyMBcEqhwZMSC3mh57f5Hz2Fsjp8p4/zMgOMhqIfONABj6yHpnMDsitnJweYC -90mYOwFs6LlUZtl2BcdJ0fAfx5LCyJslyz719JzirlJCrU2ISQQYEQIACQUCShPy -aAIbDAAKCRDIu0cs0pfUKKwiAKCaBf/wkc0y75BR0xoHX81wCwo+gwCgxJV9cUa8 -g20gVwf1rJjXEXOHqPU= -=MAlp +mQENBFmiqUEBCAC41XpjWs8SyzUiEASzxplqdXp9RQKV7mHwS8G6sSWTTFS2dPiA +3HTELw9O280MiVtud+QPmgS8i3bHn82KwWtGKfv0WOt2e1PEUHDt3JJaAAtYNlgk +QY+3I2p2s7Hvq4UAkRsVH7UaSuzZE7b1d8P8un21InepAc46T0jnPOsYL0/Lrcn8 +TNvp9R15OIKnEyIuD9S7kHN9BYZRYhJemhdPLyniGAXuUd/c/kew1AgfsrmptDXZ +7+aTz+rOqArIpl9oSj15alALZskwm+SNLJjyXNfFs3ttAApA8HIHdtOkjIDzIWcG +9esjn/yFE81tzw0/9WWfZDKWKP2iO77MFnojABEBAAG0K1JvbWFpbiBNYW5uaS1C +dWNhdSA8cm1hbm5pYnVjYXVAYXBhY2hlLm9yZz6JATcEEwEIACEFAlmiqUECGwMF +CwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQcxKfWN5h7L30Zwf9HukDTCpOnRCu +6y4fM52RhLQewjkNEMs0zhJhCJdAprrgwKVNNgn0iph1KXkoa0WM+O1b3ePXrxxN +4UVf9g35bcvdFyPtj8P/tUxEADSmJLCqhKY2Fzd5YiNJpZDJY9Bo6QUDM5TOCKX/ +Zp+t/lk45C44KX+BgiJeDZwL5jBGQ8HK3W6EKiGC6H2MOlDCVssITWOSDhc5NXHz +hhaFPFNCcFZr3f54pLQX2byVfh1Mjrb3psbvffBWT0/m8/ZTxxOD4xoH6e0kO3+S +/yLLzCstDdyrfWY00bP24VsfmQ4FXzAN3SraXcZ/+NFtZvAxUPQm2Qy79YJY7Lj8 +1tJFtZJrE7kBDQRZoqlBAQgAwYlrLpxfUTFtZ7ixLop9fwWmyOMnrPKnEz6sCDNr +Y3AlUcoLpYSYsgWGvNUNJFlb1nKZWye0OVeT9aPmT7+3CLJ55CsiExuraVd5RvMj +i0Vp7A3571fhn+5RMh7gzsM3sFgKTx3bUL1udQSyXKjZf14jkRW0jL5h9qqlxLWr +LKrEqpHGzI48ULhD5CU21Y1YnTr0T2S/mSlFiymXBn6AoTt/Gtoi/0jAWQ736IA+ +1U83FYAj3ZpKQy7ahP3blhaJO+R35zpuPpN4AfdbcVyKJVo95P6oX8DImQ47M8gX +UvK4rxLK5fcdsUiwhhv2kWCWMiKkHFjHdV93xn52leUXmwARAQABiQEfBBgBCAAJ +BQJZoqlBAhsMAAoJEHMSn1jeYey9JsIH/1w9uzfZwmnwB5+Kd8yN98OEIJqt6HVv +XpW0rqUWxyEno+6DT1w+MAWZAPrW4tcZAN5lNSZBYTUONsr1yaFyGrKoFnNbdjvs +P+HB5seUL9ehtc7lKQkEdll+PUnRWGEl26YM3LbonwXF4jYkCLNb8a/Qm0obH//p +QcI8f3gd7piqCirHasshT3wx/G1U1wN/GnfDJy3W0Vkirim235sqB9njPEBhEB7V +yOuUgeVYvXUqHMPsAePqNmfEEqQKe5a/65RRrb44daSdcd3WpQpZQHEfUwyvh+qw +ghWVGoR1rDVkJkLLhxOh0GVvwvGWA7g6gUGV37nCv+sGXqRpvF9KtVE= +=jMUk +-END PGP PUBLIC KEY BLOCK- + +pub rsa4096 2020-09-14 [SC] + 3948829384B269D333CC5B98358807C52B4B0E23 +uid [ ultime ] Jean-Louis Monteiro (CODE SIGNING KEY) +sig 3358807C52B4B0E23 2020-09-14 Jean-Louis Monteiro (CODE SIGNING KEY) +sub rsa4096 2020-09-14 [E] +sig 358807C52B4B0E23 2020-09-14 Jean-Louis Monteiro (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBF9fSUEBEADaTDjB55wHoxltSX2aImEXl9gIbkMOGTOHXezXhCf7idepPty9 +wIyQ+JBER/q/ue45ci6rwylCmyNJyHJvClkxumtfsGNzf1ocWcf/VcjX2xoCoAcD +7Dk71H+OAphA4qMAZkF66uSftibch0WBp8aUNViW3Dhx0YZ7wps9wUweBWUXozRm +6E9Cmm0BKLT9/lTXI5EJqebDwHf7BMNxIcvb0dmqT5NSbjUtMSRJ8BFbcGwRqN6o +rc7jWNl843NIzldUUZCjnQd77LNGB6cgkM3aAcJST3R9ylNr0bxKz0XUgSJwqY4u
[johnzon] annotated tag v1.2.9 updated (6cc6721 -> a471180)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to annotated tag v1.2.9 in repository https://gitbox.apache.org/repos/asf/johnzon.git. *** WARNING: tag v1.2.9 was modified! *** from 6cc6721 (commit) to a471180 (tag) tagging 6cc672117856ec8605837be27b87e95514376523 (commit) replaces v1.2.8 by Jean-Louis Monteiro on Tue Dec 15 14:12:50 2020 +0100 - Log - [maven-release-plugin] copy for tag v1.2.9 --- No new revisions were added by this update. Summary of changes:
