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/10/30 21:04:08 UTC
[sling-org-apache-sling-karaf-features] branch master updated
(0b587ba -> 599e838)
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-features.git.
from 0b587ba SLING-3027 Improve Launchpad Karaf Features
new 242bc48 SLING-3027 Improve Launchpad Karaf Features
new 16e22ae SLING-8888 Upgrade Karaf to 4.3.0
new 599e838 SLING-9865 Update to Sling (Bundle) Parent 40
The 3 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 | 4 ++--
src/main/feature/feature.xml | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
[sling-org-apache-sling-karaf-features] 02/03: SLING-8888 Upgrade
Karaf to 4.3.0
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-features.git
commit 16e22ae29499f80fe67f73f7cbf2cabc5955253d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Oct 30 21:53:14 2020 +0100
SLING-8888 Upgrade Karaf to 4.3.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e87ea9c..fc2a39b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.0</version>
<extensions>true</extensions>
<executions>
<execution>
[sling-org-apache-sling-karaf-features] 01/03: SLING-3027 Improve
Launchpad Karaf Features
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-features.git
commit 242bc48d8b701d84b25d6c56a2b19cbbf8a2da60
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Oct 18 11:39:02 2020 +0200
SLING-3027 Improve Launchpad Karaf Features
use latest working releases
---
src/main/feature/feature.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 10f312e..b9b89c1 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -21,14 +21,14 @@
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</config>
- <bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.api/2.23.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.engine/2.7.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.resourceresolver/1.7.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.4.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.settings/1.4.0</bundle>
<!-- Apache Sling Commons -->
- <bundle>mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.johnzon/1.2.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.commons.mime/2.2.2</bundle>
<!-- dependencies -->
<feature>config</feature>
@@ -125,7 +125,7 @@
<feature>eventadmin</feature>
</feature>
<feature name="sling-commons-scheduler" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.7.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.7.12</bundle>
<!-- dependencies -->
<feature>scr</feature>
<feature version="${project.version}">sling-commons-metrics</feature>
@@ -256,7 +256,7 @@
</feature>
<feature name="sling-models" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.models.api/1.3.8</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.4.12</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.4.14</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-adapter</feature>
@@ -266,9 +266,9 @@
<bundle>mvn:org.apache.sling/org.apache.sling.models.jacksonexporter/1.0.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-models</feature>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.2</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.11.2</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.11.2</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.3</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.11.3</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.11.3</bundle>
</feature>
<feature name="sling-pipes" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.pipes/3.1.0</bundle>
@@ -384,7 +384,7 @@
<config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource</config>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
- <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.1.4</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.1.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.davex/1.3.10</bundle>
<!-- (not using org.apache.sling.jcr.jcr-wrapper) -->
@@ -497,7 +497,7 @@
<feature>webconsole</feature>
</feature>
<feature name="sling-scripting-freemarker" version="${project.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.scripting.freemarker/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.scripting.freemarker/1.0.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-adapter</feature>
@@ -599,7 +599,7 @@
</feature>
<!-- Apache HttpComponents Client -->
<feature name="httpcomponents-client" version="${project.version}">
- <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.12</bundle>
+ <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/4.5.13</bundle>
<!-- dependencies -->
<feature>config</feature>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.13</bundle>
[sling-org-apache-sling-karaf-features] 03/03: SLING-9865 Update to
Sling (Bundle) Parent 40
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-features.git
commit 599e8389644ddb454f9ac45de5ce6d71387a9499
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Oct 30 22:01:54 2020 +0100
SLING-9865 Update to Sling (Bundle) Parent 40
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fc2a39b..648912d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>38</version>
+ <version>40</version>
<relativePath/>
</parent>