You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2021/09/09 19:32:41 UTC
[sling-org-apache-sling-karaf-configs] branch master updated
(a3273db -> 2242d1d)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git.
from a3273db SLING-10792 Update to Sling (Bundle) Parent 45
new c9c7321 fix json configuration format
new 2242d1d remove unnecessary data types
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:
...ernal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json | 2 +-
...apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json | 8 +++++---
...mapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
[sling-org-apache-sling-karaf-configs] 01/02: fix json
configuration format
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git
commit c9c73215e290744ab6c878eaa22413de9a83f620
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 9 21:14:59 2021 +0200
fix json configuration format
---
...apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json b/src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json
index a89e493..65d57d2 100644
--- a/src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json
+++ b/src/main/resources/cms/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling-cms.json
@@ -1,3 +1,5 @@
-references=[\
- "classpath:cms/sling-cms.txt"\
-]
+{
+ "references": [
+ "classpath:cms/sling-cms.txt"
+ ]
+}
[sling-org-apache-sling-karaf-configs] 02/02: remove unnecessary
data types
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git
commit 2242d1d36515d1e862d765bf17cc9afe926f36cc
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 9 21:18:19 2021 +0200
remove unnecessary data types
---
...se.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json | 2 +-
...ceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json b/src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json
index 82d9db7..7a36680 100644
--- a/src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json
+++ b/src/main/resources/cms/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole.json
@@ -1,5 +1,5 @@
{
- "whitelist.bundles:String[]": [
+ "whitelist.bundles": [
"org.apache.sling.serviceuser.webconsole"
],
"whitelist.name": "org.apache.sling.serviceuser.webconsole"
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json
index a66e627..a3c08d1 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig.json
@@ -1,5 +1,5 @@
{
- "user.mapping:String[]": [
+ "user.mapping": [
"org.apache.sling.caconfig.impl=[sling-readall]"
]
}