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 2019/09/26 20:00:41 UTC
[sling-org-apache-sling-resourceresolver] branch master updated
(8a610d0 -> c520f57)
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-resourceresolver.git.
from 8a610d0 SLING-8178 Unable to resolve org.apache.sling.resourceresolver due to missing EventHandler
new 617f4de add missing scope
new 8453418 SLING-8744 Use Sling Bundle Parent 35
new 7358417 remove version of sling-maven-plugin (managed in parent)
new c520f57 [maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.6.14
The 4 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 | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
[sling-org-apache-sling-resourceresolver] 01/04: add missing scope
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-resourceresolver.git
commit 617f4de11c782667e0389d454e89e38eb3124767
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 26 21:49:27 2019 +0200
add missing scope
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 8f8e3ce..153821c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<version>1.3.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[sling-org-apache-sling-resourceresolver] 04/04:
[maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.14
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-resourceresolver.git
commit c520f57250efcf104b08b9e8c1cbc6f11f5d60f2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 26 22:00:36 2019 +0200
[maven-release-plugin] prepare release org.apache.sling.resourceresolver-1.6.14
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index de51b86..002c701 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.6.13-SNAPSHOT</version>
+ <version>1.6.14</version>
<name>Apache Sling Resource Resolver</name>
<description>
@@ -40,7 +40,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-resourceresolver.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.resourceresolver-1.6.14</tag>
</scm>
<properties>
[sling-org-apache-sling-resourceresolver] 03/04: remove version of
sling-maven-plugin (managed in parent)
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-resourceresolver.git
commit 73584171b4a7a2cc4e25c4d142cb7f990dc1d0b7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 26 21:56:22 2019 +0200
remove version of sling-maven-plugin (managed in parent)
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 667d79f..de51b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,8 +52,7 @@
<plugins>
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <version>2.3.8</version>
+ <artifactId>sling-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-adapter-metadata</id>
[sling-org-apache-sling-resourceresolver] 02/04: SLING-8744 Use
Sling Bundle Parent 35
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-resourceresolver.git
commit 84534189b5aa87b9f5eb0c3cd76406f67cf7fe41
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 26 21:51:41 2019 +0200
SLING-8744 Use Sling Bundle Parent 35
---
pom.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 153821c..667d79f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,11 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>