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/25 09:42:14 UTC
[sling-org-apache-sling-karaf-distribution] branch master updated
(8dc948b -> a62146d)
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-distribution.git.
from 8dc948b SLING-9837 Use OSGi R7 HTTP Service
new d6b4575 pull build section up
new a62146d add configs for contentloader
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:
pom.xml | 376 +++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 196 insertions(+), 180 deletions(-)
[sling-org-apache-sling-karaf-distribution] 01/02: pull build
section up
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-distribution.git
commit d6b45759fb8c54e40e325c26c3a21bc2184d46ed
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 1 20:04:52 2020 +0100
pull build section up
---
pom.xml | 360 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 180 insertions(+), 180 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7439c52..62ea0bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,186 @@
<!-- https://github.com/apache/karaf/blob/master/assemblies/apache-karaf/pom.xml -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>4.3.0</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>process-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package</id>
+ <goals>
+ <goal>archive</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <installedFeatures>
+ <!-- Apache Karaf (default) -->
+ <feature>wrapper</feature>
+ <!-- Apache Karaf (additional for Sling)-->
+ <feature>felix-http</feature>
+ <feature>scr</feature>
+ <feature>webconsole</feature>
+ <!-- Apache Sling -->
+ <feature>sling</feature>
+ <!-- Apache Sling Auth -->
+ <feature>sling-auth-form</feature>
+ <!-- Apache Sling Commons -->
+ <feature>sling-commons-compiler</feature>
+ <feature>sling-commons-clam</feature>
+ <feature>sling-commons-classloader</feature>
+ <feature>sling-commons-crypto</feature>
+ <feature>sling-commons-fsclassloader</feature>
+ <feature>sling-commons-html</feature>
+ <feature>sling-commons-messaging</feature>
+ <feature>sling-commons-messaging-mail</feature>
+ <feature>sling-commons-metrics</feature>
+ <feature>sling-commons-osgi</feature>
+ <feature>sling-commons-scheduler</feature>
+ <feature>sling-commons-threads</feature>
+ <!-- Apache Sling Extensions -->
+ <feature>sling-adapter</feature>
+ <feature>sling-bundleresource</feature>
+ <feature>sling-caconfig</feature>
+ <feature>sling-clam</feature>
+ <feature>sling-discovery</feature>
+ <feature>sling-discovery-oak</feature>
+ <feature>sling-discovery-standalone</feature>
+ <feature>sling-distribution</feature>
+ <feature>sling-event</feature>
+ <feature>sling-featureflags</feature>
+ <feature>sling-fsresource</feature>
+ <feature>sling-healthcheck</feature>
+ <feature>sling-i18n</feature>
+ <feature>sling-jmx-provider</feature>
+ <feature>sling-models</feature>
+ <feature>sling-models-jacksonexporter</feature>
+ <feature>sling-pipes</feature>
+ <feature>sling-query</feature>
+ <feature>sling-resource-inventory</feature>
+ <feature>sling-resource-presence</feature>
+ <feature>sling-resourcemerger</feature>
+ <feature>sling-rewriter</feature>
+ <feature>sling-security</feature>
+ <feature>sling-urlrewriter</feature>
+ <feature>sling-validation</feature>
+ <feature>sling-xss</feature>
+ <!-- Apache Sling Installer -->
+ <feature>sling-installer</feature>
+ <feature>sling-installer-factory-configuration</feature>
+ <feature>sling-installer-factory-packages</feature>
+ <feature>sling-installer-healthcheck</feature>
+ <feature>sling-installer-provider-file</feature>
+ <feature>sling-installer-provider-jcr</feature>
+ <!-- Apache Sling JCR -->
+ <feature>sling-jcr</feature>
+ <feature>sling-jcr-compiler</feature>
+ <feature>sling-jcr-jackrabbit-security</feature>
+ <feature>sling-jcr-repoinit</feature>
+ <!-- Apache Sling Quickstart -->
+ <feature>sling-quickstart-oak</feature>
+ <feature>sling-quickstart-oak-mongo</feature>
+ <feature>sling-quickstart-oak-tar</feature>
+ <!-- Apache Sling Scripting -->
+ <feature>sling-scripting</feature>
+ <feature>sling-scripting-freemarker</feature>
+ <feature>sling-scripting-groovy</feature>
+ <feature>sling-scripting-java</feature>
+ <feature>sling-scripting-javascript</feature>
+ <feature>sling-scripting-jsp</feature>
+ <feature>sling-scripting-htl</feature>
+ <feature>sling-scripting-thymeleaf</feature>
+ <!-- Apache Sling Servlets -->
+ <feature>sling-servlets</feature>
+ <!-- Apache Sling Starter -->
+ <feature>sling-starter-content</feature>
+ <!-- Apache Felix Healthcheck -->
+ <feature>felix-healthcheck</feature>
+ <!-- Apache HttpComponents Client -->
+ <feature>httpcomponents-client</feature>
+ <!-- Apache Jackrabbit -->
+ <feature>jackrabbit</feature>
+ <feature>jackrabbit-oak</feature>
+ <feature>jackrabbit-vault</feature>
+ <!-- Apache Tika -->
+ <feature>tika</feature>
+ <!-- Apache Sling Samples -->
+ <!-- Composum -->
+ <feature>composum-nodes</feature>
+ <!-- Thymeleaf -->
+ <feature>thymeleaf</feature>
+ <!-- asm -->
+ <feature>asm</feature>
+ <!-- spifly -->
+ <feature>spifly</feature>
+ </installedFeatures>
+ <startupFeatures>
+ <feature>eventadmin</feature>
+ </startupFeatures>
+ <bootFeatures>
+ <feature>wrap</feature>
+ <feature>shell</feature>
+ <feature>feature</feature>
+ <feature>jaas</feature>
+ <feature>ssh</feature>
+ <feature>management</feature>
+ <feature>bundle</feature>
+ <feature>config</feature>
+ <feature>deployer</feature>
+ <feature>diagnostic</feature>
+ <feature>feature</feature>
+ <feature>instance</feature>
+ <feature>kar</feature>
+ <feature>log</feature>
+ <feature>package</feature>
+ <feature>service</feature>
+ <feature>system</feature>
+ </bootFeatures>
+ <libraries>
+ </libraries>
+ <javase>1.8</javase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- see maven-remote-resources-plugin in Sling parent -->
+ <move file="${project.build.directory}/assembly/META-INF/LICENSE" tofile="${project.build.directory}/assembly/LICENSE"/>
+ <move file="${project.build.directory}/assembly/META-INF/NOTICE" tofile="${project.build.directory}/assembly/NOTICE"/>
+ <delete dir="${project.build.directory}/assembly/META-INF"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.karaf.features</groupId>
@@ -412,184 +592,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>4.3.0</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>process-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- <execution>
- <id>package</id>
- <goals>
- <goal>archive</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <installedFeatures>
- <!-- Apache Karaf (default) -->
- <feature>wrapper</feature>
- <!-- Apache Karaf (additional for Sling)-->
- <feature>felix-http</feature>
- <feature>scr</feature>
- <feature>webconsole</feature>
- <!-- Apache Sling -->
- <feature>sling</feature>
- <!-- Apache Sling Auth -->
- <feature>sling-auth-form</feature>
- <!-- Apache Sling Commons -->
- <feature>sling-commons-compiler</feature>
- <feature>sling-commons-clam</feature>
- <feature>sling-commons-classloader</feature>
- <feature>sling-commons-crypto</feature>
- <feature>sling-commons-fsclassloader</feature>
- <feature>sling-commons-html</feature>
- <feature>sling-commons-messaging</feature>
- <feature>sling-commons-messaging-mail</feature>
- <feature>sling-commons-metrics</feature>
- <feature>sling-commons-osgi</feature>
- <feature>sling-commons-scheduler</feature>
- <feature>sling-commons-threads</feature>
- <!-- Apache Sling Extensions -->
- <feature>sling-adapter</feature>
- <feature>sling-bundleresource</feature>
- <feature>sling-caconfig</feature>
- <feature>sling-clam</feature>
- <feature>sling-discovery</feature>
- <feature>sling-discovery-oak</feature>
- <feature>sling-discovery-standalone</feature>
- <feature>sling-distribution</feature>
- <feature>sling-event</feature>
- <feature>sling-featureflags</feature>
- <feature>sling-fsresource</feature>
- <feature>sling-healthcheck</feature>
- <feature>sling-i18n</feature>
- <feature>sling-jmx-provider</feature>
- <feature>sling-models</feature>
- <feature>sling-models-jacksonexporter</feature>
- <feature>sling-pipes</feature>
- <feature>sling-query</feature>
- <feature>sling-resource-inventory</feature>
- <feature>sling-resource-presence</feature>
- <feature>sling-resourcemerger</feature>
- <feature>sling-rewriter</feature>
- <feature>sling-security</feature>
- <feature>sling-urlrewriter</feature>
- <feature>sling-validation</feature>
- <feature>sling-xss</feature>
- <!-- Apache Sling Installer -->
- <feature>sling-installer</feature>
- <feature>sling-installer-factory-configuration</feature>
- <feature>sling-installer-factory-packages</feature>
- <feature>sling-installer-healthcheck</feature>
- <feature>sling-installer-provider-file</feature>
- <feature>sling-installer-provider-jcr</feature>
- <!-- Apache Sling JCR -->
- <feature>sling-jcr</feature>
- <feature>sling-jcr-compiler</feature>
- <feature>sling-jcr-jackrabbit-security</feature>
- <feature>sling-jcr-repoinit</feature>
- <!-- Apache Sling Quickstart -->
- <feature>sling-quickstart-oak</feature>
- <feature>sling-quickstart-oak-mongo</feature>
- <feature>sling-quickstart-oak-tar</feature>
- <!-- Apache Sling Scripting -->
- <feature>sling-scripting</feature>
- <feature>sling-scripting-freemarker</feature>
- <feature>sling-scripting-groovy</feature>
- <feature>sling-scripting-java</feature>
- <feature>sling-scripting-javascript</feature>
- <feature>sling-scripting-jsp</feature>
- <feature>sling-scripting-htl</feature>
- <feature>sling-scripting-thymeleaf</feature>
- <!-- Apache Sling Servlets -->
- <feature>sling-servlets</feature>
- <!-- Apache Sling Starter -->
- <feature>sling-starter-content</feature>
- <!-- Apache Felix Healthcheck -->
- <feature>felix-healthcheck</feature>
- <!-- Apache HttpComponents Client -->
- <feature>httpcomponents-client</feature>
- <!-- Apache Jackrabbit -->
- <feature>jackrabbit</feature>
- <feature>jackrabbit-oak</feature>
- <feature>jackrabbit-vault</feature>
- <!-- Apache Tika -->
- <feature>tika</feature>
- <!-- Apache Sling Samples -->
- <!-- Composum -->
- <feature>composum-nodes</feature>
- <!-- Thymeleaf -->
- <feature>thymeleaf</feature>
- <!-- asm -->
- <feature>asm</feature>
- <!-- spifly -->
- <feature>spifly</feature>
- </installedFeatures>
- <startupFeatures>
- <feature>eventadmin</feature>
- </startupFeatures>
- <bootFeatures>
- <feature>wrap</feature>
- <feature>shell</feature>
- <feature>feature</feature>
- <feature>jaas</feature>
- <feature>ssh</feature>
- <feature>management</feature>
- <feature>bundle</feature>
- <feature>config</feature>
- <feature>deployer</feature>
- <feature>diagnostic</feature>
- <feature>feature</feature>
- <feature>instance</feature>
- <feature>kar</feature>
- <feature>log</feature>
- <feature>package</feature>
- <feature>service</feature>
- <feature>system</feature>
- </bootFeatures>
- <libraries>
- </libraries>
- <javase>1.8</javase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <!-- see maven-remote-resources-plugin in Sling parent -->
- <move file="${project.build.directory}/assembly/META-INF/LICENSE" tofile="${project.build.directory}/assembly/LICENSE"/>
- <move file="${project.build.directory}/assembly/META-INF/NOTICE" tofile="${project.build.directory}/assembly/NOTICE"/>
- <delete dir="${project.build.directory}/assembly/META-INF"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
[sling-org-apache-sling-karaf-distribution] 02/02: add configs for
contentloader
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-distribution.git
commit a62146d98c6400652791bfb4374a8bb34e290b38
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 8 11:13:13 2020 +0100
add configs for contentloader
---
pom.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/pom.xml b/pom.xml
index 62ea0bd..bb7d5b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,6 +426,14 @@
<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_jcr_contentloader</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <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>
<type>config</type>
<scope>runtime</scope>
@@ -514,6 +522,14 @@
<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_contentloader</classifier>
+ <type>config</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <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>
<type>config</type>
<scope>runtime</scope>