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 2018/04/09 08:37:07 UTC
[sling-org-apache-sling-karaf-distribution] branch master updated
(6f16ffb -> 7f6c36b)
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 6f16ffb decouple versions
new e35a143 SLING-6608 Provide Resource Presence feature
new a4d06f0 align order of configuration dependencies with file system
new 6fe597f move LICENSE and NOTICE to distribution's root and remove META-INF
new 24c85a8 align features with Karaf distribution
new 7f6c36b SLING-7253 Upgrade Karaf to 4.2
The 5 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 | 74 +++++++++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 56 insertions(+), 18 deletions(-)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 05/05: SLING-7253
Upgrade Karaf to 4.2
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 7f6c36b75580fe45b6811da63f2cabfe7bc5902a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Apr 9 10:31:34 2018 +0200
SLING-7253 Upgrade Karaf to 4.2
use Karaf 4.2.0
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 478a027..f031044 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,13 +47,13 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
- <version>4.2.0.M2</version>
+ <version>4.2.0</version>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
- <version>4.2.0.M2</version>
+ <version>4.2.0</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>enterprise</artifactId>
- <version>4.2.0.M2</version>
+ <version>4.2.0</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -390,7 +390,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>4.2.0.M2</version>
+ <version>4.2.0</version>
<extensions>true</extensions>
<executions>
<execution>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 01/05: SLING-6608
Provide Resource Presence feature
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 e35a14352149a26f7a3aafe9595a40de2fa90bd2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 6 14:57:06 2018 +0200
SLING-6608 Provide Resource Presence feature
add dependency (configuration for service user mapping)
---
pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pom.xml b/pom.xml
index ccb9bbf..cd82764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,6 +302,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-resource_presence</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-resourceresolver</classifier>
<type>config</type>
<scope>runtime</scope>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 03/05: move LICENSE and
NOTICE to distribution's root and remove META-INF
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 6fe597f4dec73d451117dc3bc81b113f73291cf3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Apr 8 13:52:54 2018 +0200
move LICENSE and NOTICE to distribution's root and remove META-INF
---
pom.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/pom.xml b/pom.xml
index 9a5f61e..1d48fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,6 +520,26 @@
<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>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 04/05: align features
with Karaf distribution
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 24c85a8ec32cbec9d495b1631c812914fad20ca0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Apr 8 15:13:53 2018 +0200
align features with Karaf distribution
---
pom.xml | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1d48fdc..478a027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,14 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>enterprise</artifactId>
+ <version>4.2.0.M2</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-features</artifactId>
<version>0.1.1-SNAPSHOT</version>
@@ -401,10 +409,13 @@
</executions>
<configuration>
<installedFeatures>
- <!-- Apache Karaf -->
+ <!-- Apache Karaf (default) -->
<feature>wrapper</feature>
- <feature>wrap</feature>
- <feature>kar</feature>
+ <!-- Apache Karaf (additional for Sling)-->
+ <feature>http</feature>
+ <feature>http-whiteboard</feature>
+ <feature>scr</feature>
+ <feature>webconsole</feature>
<!-- Apache Sling -->
<feature>sling</feature>
<!-- Apache Sling Auth -->
@@ -493,9 +504,10 @@
<feature>composum</feature>
</installedFeatures>
<startupFeatures>
+ <feature>eventadmin</feature>
</startupFeatures>
<bootFeatures>
- <feature>eventadmin</feature>
+ <feature>wrap</feature>
<feature>shell</feature>
<feature>feature</feature>
<feature>jaas</feature>
@@ -505,15 +517,13 @@
<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>
- <feature>scr</feature>
- <feature>http</feature>
- <feature>http-whiteboard</feature>
- <feature>webconsole</feature>
</bootFeatures>
<libraries>
</libraries>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 02/05: align order of
configuration dependencies with file system
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 a4d06f038c4eb698b53d1fe4b629df762efce1a7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 6 15:01:29 2018 +0200
align order of configuration dependencies with file system
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd82764..9a5f61e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <classifier>org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</classifier>
+ <classifier>org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</classifier>
<type>config</type>
<scope>runtime</scope>
</dependency>
@@ -126,7 +126,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <classifier>org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</classifier>
+ <classifier>org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</classifier>
<type>config</type>
<scope>runtime</scope>
</dependency>
@@ -134,7 +134,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <classifier>org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</classifier>
+ <classifier>org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</classifier>
<type>config</type>
<scope>runtime</scope>
</dependency>
@@ -142,7 +142,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <classifier>org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</classifier>
+ <classifier>org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</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-scripting_sightly</classifier>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting</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-scripting_thymeleaf</classifier>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly</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-scripting</classifier>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</classifier>
<type>config</type>
<scope>runtime</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.