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/26 21:50:17 UTC

[sling-org-apache-sling-karaf-configs] branch master updated: SLING-9944 Bundle configurations and reference via classpath protocol

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 62f9da9  SLING-9944 Bundle configurations and reference via classpath protocol
62f9da9 is described below

commit 62f9da92b19d2f5604be9b642523e85fea572b1d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Nov 26 22:32:58 2020 +0100

    SLING-9944 Bundle configurations and reference via classpath protocol
---
 pom.xml | 241 ++--------------------------------------------------------------
 1 file changed, 6 insertions(+), 235 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d26208..7c62970 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
   <parent>
     <groupId>org.apache.sling</groupId>
-    <artifactId>sling</artifactId>
+    <artifactId>sling-bundle-parent</artifactId>
     <version>40</version>
     <relativePath/>
   </parent>
@@ -52,240 +52,11 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <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>
-                  <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>
-                  <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>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.felix.jaas.ConfigurationSpi</classifier>
-                  <file>src/main/resources/org.apache.felix.jaas.ConfigurationSpi.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.security.user.UserConfigurationImpl.config</file>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider</classifier>
-                  <file>src/main/resources/org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider.config</file>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader</classifier>
-                  <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <type>config</type>
-                </artifact>
-                <artifact>
-                  <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader</classifier>
-                  <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <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>
-                  <type>config</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-baseline-maven-plugin</artifactId>
+        <configuration>
+          <failOnMissing>false</failOnMissing>
+        </configuration>
       </plugin>
     </plugins>
   </build>