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 2020/11/01 11:55:47 UTC
[sling-org-apache-sling-karaf-configs] branch master updated:
SLING-8990 Switch configurations to OSGi R7 configuration format
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
The following commit(s) were added to refs/heads/master by this push:
new 3b3f31e SLING-8990 Switch configurations to OSGi R7 configuration format
3b3f31e is described below
commit 3b3f31e5de01e3d077a8c5fb67ebf443732e791b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 31 14:32:43 2020 +0100
SLING-8990 Switch configurations to OSGi R7 configuration format
use tilde as separator for factory configurations
---
pom.xml | 136 ++++++++++-----------
....Configuration.factory~GuestLoginModule.config} | 0
...s.Configuration.factory~LoginModuleImpl.config} | 0
....Configuration.factory~TokenLoginModule.config} | 0
...nAdminWhitelist.fragment~composum_nodes.config} | 0
...AdminWhitelist.fragment~sling_discovery.config} | 0
....LoginAdminWhitelist.fragment~sling_jcr.config} | 0
...cr.repoinit.RepositoryInitializer~sling.config} | 0
...it.RepositoryInitializer~sling_caconfig.config} | 0
...poinit.RepositoryInitializer~sling_clam.config} | 0
...t.RepositoryInitializer~sling_discovery.config} | 0
...oinit.RepositoryInitializer~sling_event.config} | 0
...poinit.RepositoryInitializer~sling_i18n.config} | 0
...positoryInitializer~sling_installer_jcr.config} | 0
...nit.RepositoryInitializer~sling_mapping.config} | 0
...nit.RepositoryInitializer~sling_readall.config} | 0
...t.RepositoryInitializer~sling_scripting.config} | 0
....RepositoryInitializer~sling_validation.config} | 0
...epoinit.RepositoryInitializer~sling_xss.config} | 0
...ceUserMapperImpl.amended~sling_caconfig.config} | 0
...erviceUserMapperImpl.amended~sling_clam.config} | 0
...eUserMapperImpl.amended~sling_discovery.config} | 0
...rviceUserMapperImpl.amended~sling_event.config} | 0
...erviceUserMapperImpl.amended~sling_i18n.config} | 0
...rMapperImpl.amended~sling_installer_jcr.config} | 0
...erMapperImpl.amended~sling_jcr_resource.config} | 0
...perImpl.amended~sling_resource_presence.config} | 0
...pperImpl.amended~sling_resourceresolver.config} | 0
...ceUserMapperImpl.amended~sling_rewriter.config} | 0
...eUserMapperImpl.amended~sling_scripting.config} | 0
...rMapperImpl.amended~sling_scripting_htl.config} | 0
...rImpl.amended~sling_scripting_thymeleaf.config} | 0
...ceUserMapperImpl.amended~sling_servlets.config} | 0
...UserMapperImpl.amended~sling_validation.config} | 0
...ServiceUserMapperImpl.amended~sling_xss.config} | 0
35 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/pom.xml b/pom.xml
index c475d79..da55b29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,18 +63,18 @@
<configuration>
<artifacts>
<artifact>
- <classifier>org.apache.felix.jaas.Configuration.factory-GuestLoginModule</classifier>
- <file>src/main/resources/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.config</file>
+ <classifier>org.apache.felix.jaas.Configuration.factory~GuestLoginModule</classifier>
+ <file>src/main/resources/org.apache.felix.jaas.Configuration.factory~GuestLoginModule.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.felix.jaas.Configuration.factory-LoginModuleImpl</classifier>
- <file>src/main/resources/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.config</file>
+ <classifier>org.apache.felix.jaas.Configuration.factory~LoginModuleImpl</classifier>
+ <file>src/main/resources/org.apache.felix.jaas.Configuration.factory~LoginModuleImpl.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.felix.jaas.Configuration.factory-TokenLoginModule</classifier>
- <file>src/main/resources/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.config</file>
+ <classifier>org.apache.felix.jaas.Configuration.factory~TokenLoginModule</classifier>
+ <file>src/main/resources/org.apache.felix.jaas.Configuration.factory~TokenLoginModule.config</file>
<type>config</type>
</artifact>
<artifact>
@@ -118,158 +118,158 @@
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes</classifier>
- <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes.config</file>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery</classifier>
- <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config</file>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr</classifier>
- <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config</file>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</classifier>
- <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss.config</file>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss.config</file>
<type>config</type>
</artifact>
</artifacts>
diff --git a/src/main/resources/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.config b/src/main/resources/org.apache.felix.jaas.Configuration.factory~GuestLoginModule.config
similarity index 100%
rename from src/main/resources/org.apache.felix.jaas.Configuration.factory-GuestLoginModule.config
rename to src/main/resources/org.apache.felix.jaas.Configuration.factory~GuestLoginModule.config
diff --git a/src/main/resources/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.config b/src/main/resources/org.apache.felix.jaas.Configuration.factory~LoginModuleImpl.config
similarity index 100%
rename from src/main/resources/org.apache.felix.jaas.Configuration.factory-LoginModuleImpl.config
rename to src/main/resources/org.apache.felix.jaas.Configuration.factory~LoginModuleImpl.config
diff --git a/src/main/resources/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.config b/src/main/resources/org.apache.felix.jaas.Configuration.factory~TokenLoginModule.config
similarity index 100%
rename from src/main/resources/org.apache.felix.jaas.Configuration.factory-TokenLoginModule.config
rename to src/main/resources/org.apache.felix.jaas.Configuration.factory~TokenLoginModule.config
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes.config
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery.config
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation.config
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config
similarity index 100%
rename from src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss.config
rename to src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss.config