This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch SLING-11104 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit ec8cd12d4644735af37f7050e4d52cb7051f471c Author: Dan Klco <[email protected]> AuthorDate: Thu Feb 3 16:33:54 2022 -0500 SLING-11104 - creating POC of using JSON logging to console (new bundles in whiteboard) --- feature/pom.xml | 2 +- feature/src/main/features/boot.json | 20 ++++++++++++++++++-- .../src/main/features/models-jacksonexporter.json | 6 +++--- feature/src/main/features/webconsole.json | 4 ---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/feature/pom.xml b/feature/pom.xml index f35b698..50b5cc9 100644 --- a/feature/pom.xml +++ b/feature/pom.xml @@ -50,7 +50,7 @@ <framework> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>6.0.3</version> + <version>7.0.3</version> </framework> <aggregates> <aggregate> diff --git a/feature/src/main/features/boot.json b/feature/src/main/features/boot.json index c10fa04..625ae59 100644 --- a/feature/src/main/features/boot.json +++ b/feature/src/main/features/boot.json @@ -61,11 +61,15 @@ "start-order":"1" }, { - "id":"org.apache.sling:org.apache.sling.commons.log:5.4.0", + "id":"ch.qos.logback:logback-core:1.2.10", "start-order":"1" }, { - "id":"org.apache.sling:org.apache.sling.commons.logservice:1.1.0", + "id":"ch.qos.logback:logback-classic:1.2.10", + "start-order":"1" + }, + { + "id":"net.logstash.logback:logstash-logback-encoder:7.0.1", "start-order":"1" }, { @@ -73,10 +77,22 @@ "start-order":"1" }, { + "id":"org.apache.felix:org.apache.felix.logback:1.0.2", + "start-order": "1" + }, + { + "id": "org.apache.sling:org.apache.sling.commons.log.logback.configurator:1.0.0-SNAPSHOT", + "start-order": "1" + }, + { "id":"org.apache.sling:org.apache.sling.commons.osgi:2.4.2", "start-order":"1" }, { + "id": "org.apache.sling:org.apache.sling.commons.log.json:1.0.0-SNAPSHOT", + "start-order": "1" + }, + { "id":"org.apache.sling:org.apache.sling.installer.core:3.12.0", "start-order":"1" }, diff --git a/feature/src/main/features/models-jacksonexporter.json b/feature/src/main/features/models-jacksonexporter.json index 7228c25..4e4578b 100644 --- a/feature/src/main/features/models-jacksonexporter.json +++ b/feature/src/main/features/models-jacksonexporter.json @@ -2,15 +2,15 @@ "bundles":[ { "id":"com.fasterxml.jackson.core:jackson-annotations:${jackson-version}", - "start-order":"20" + "start-order":"1" }, { "id":"com.fasterxml.jackson.core:jackson-core:${jackson-version}", - "start-order":"20" + "start-order":"1" }, { "id":"com.fasterxml.jackson.core:jackson-databind:${jackson-version}", - "start-order":"20" + "start-order":"1" }, { "id":"org.apache.sling:org.apache.sling.models.jacksonexporter:1.1.2", diff --git a/feature/src/main/features/webconsole.json b/feature/src/main/features/webconsole.json index af4a9b8..af1bd45 100644 --- a/feature/src/main/features/webconsole.json +++ b/feature/src/main/features/webconsole.json @@ -25,10 +25,6 @@ "start-order":"5" }, { - "id":"org.apache.sling:org.apache.sling.commons.log.webconsole:1.0.0", - "start-order":"5" - }, - { "id":"org.apache.sling:org.apache.sling.extensions.webconsolebranding:1.0.2", "start-order":"5" },
