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-distribution.git
commit daad296e447ccd1e24bc859127718baf467dd73a Author: Oliver Lietz <o...@apache.org> AuthorDate: Sat Oct 31 14:37:25 2020 +0100 SLING-8990 Switch configurations to OSGi R7 configuration format use tilde as separator for factory configurations --- pom.xml | 68 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 27466a2..cdfb3f6 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.felix.jaas.Configuration.factory-GuestLoginModule</classifier> + <classifier>org.apache.felix.jaas.Configuration.factory~GuestLoginModule</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -86,7 +86,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.felix.jaas.Configuration.factory-LoginModuleImpl</classifier> + <classifier>org.apache.felix.jaas.Configuration.factory~LoginModuleImpl</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -94,7 +94,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.felix.jaas.Configuration.factory-TokenLoginModule</classifier> + <classifier>org.apache.felix.jaas.Configuration.factory~TokenLoginModule</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -166,7 +166,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum_nodes</classifier> + <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -174,7 +174,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery</classifier> + <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_discovery</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -182,7 +182,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr</classifier> + <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -190,7 +190,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -198,7 +198,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_caconfig</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -206,7 +206,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_clam</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -214,7 +214,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_discovery</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -222,7 +222,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_event</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -230,7 +230,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_i18n</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -238,7 +238,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_installer_jcr</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -246,7 +246,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_mapping</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -254,7 +254,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_readall</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_readall</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -262,7 +262,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_scripting</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -270,7 +270,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_validation</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -278,7 +278,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</classifier> + <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_xss</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -286,7 +286,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_caconfig</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -294,7 +294,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_clam</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -302,7 +302,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_discovery</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -310,7 +310,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_event</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -318,7 +318,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_i18n</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -326,7 +326,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_installer_jcr</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -334,7 +334,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_resource</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -342,7 +342,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resource_presence</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -350,7 +350,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_resourceresolver</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -358,7 +358,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_rewriter</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -366,7 +366,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -374,7 +374,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_htl</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -382,7 +382,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_scripting_thymeleaf</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -390,7 +390,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_servlets</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -398,7 +398,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_validation</classifier> <type>config</type> <scope>runtime</scope> </dependency> @@ -406,7 +406,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.karaf-configs</artifactId> <version>0.1.1-SNAPSHOT</version> - <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss</classifier> + <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_xss</classifier> <type>config</type> <scope>runtime</scope> </dependency>