You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/04/03 06:20:29 UTC

[camel-spring-boot] 01/01: Merge pull request #39 from apache/automatic-periodic-sync

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 553e4ad250a3268ba758e4767c3d35ffc49536d6
Merge: a045163 09d21d2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Apr 3 08:20:18 2020 +0200

    Merge pull request #39 from apache/automatic-periodic-sync
    
    [Github Actions] Periodic Sync Camel Spring Boot Master Branch

 .../catalog/dataformats/json-fastjson.json         |  1 +
 .../springboot/catalog/dataformats/json-gson.json  |  1 +
 .../catalog/dataformats/json-jackson.json          |  2 ++
 .../catalog/dataformats/json-johnzon.json          |  3 ++-
 .../src/main/docs/fastjson-starter.adoc            |  3 ++-
 .../FastjsonDataFormatConfiguration.java           | 12 ++++++++++
 .../src/main/docs/gson-starter.adoc                |  3 ++-
 .../springboot/GsonDataFormatConfiguration.java    | 12 ++++++++++
 .../src/main/docs/jackson-starter.adoc             |  4 +++-
 .../springboot/JacksonDataFormatConfiguration.java | 26 ++++++++++++++++++++++
 .../src/main/docs/johnzon-starter.adoc             |  3 ++-
 .../springboot/JohnzonDataFormatConfiguration.java | 12 ++++++++++
 docs/modules/ROOT/pages/fastjson-starter.adoc      |  3 ++-
 docs/modules/ROOT/pages/gson-starter.adoc          |  3 ++-
 docs/modules/ROOT/pages/jackson-starter.adoc       |  4 +++-
 docs/modules/ROOT/pages/johnzon-starter.adoc       |  3 ++-
 16 files changed, 86 insertions(+), 9 deletions(-)