You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/05/24 09:32:39 UTC
[sling-org-apache-sling-testing-sling-mock] branch master updated
(02c4558 -> 17ffdf7)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.
from 02c4558 update dependency to servlet-helpers
add eb10077 add linkedfile and mixin support
add 35da39b SLING-8428 apply additional patch provided by Dominique Jäggi
new 443e531 SLING-8428 switch to geronmio specs
new 17ffdf7 Merge branch 'feature/SLING-8428-mixin-linkedfile'
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:
core/pom.xml | 6 ++++++
.../testing/mock/sling/loader/ContentLoader.java | 1 -
.../mock/sling/loader/LoaderContentHandler.java | 24 ++++++++++++++++------
.../src/test/resources/SLING-INF/nodetypes/app.cnd | 10 +++++++++
.../resources/json-import-samples/content.json | 13 ++++++++++++
5 files changed, 47 insertions(+), 7 deletions(-)
[sling-org-apache-sling-testing-sling-mock] 02/02: Merge branch
'feature/SLING-8428-mixin-linkedfile'
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 17ffdf7b41689303f49c66d8ed5dc2c5a74aa8a0
Merge: 02c4558 443e531
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri May 24 11:32:23 2019 +0200
Merge branch 'feature/SLING-8428-mixin-linkedfile'
core/pom.xml | 6 ++++++
.../testing/mock/sling/loader/ContentLoader.java | 1 -
.../mock/sling/loader/LoaderContentHandler.java | 24 ++++++++++++++++------
.../src/test/resources/SLING-INF/nodetypes/app.cnd | 10 +++++++++
.../resources/json-import-samples/content.json | 13 ++++++++++++
5 files changed, 47 insertions(+), 7 deletions(-)
[sling-org-apache-sling-testing-sling-mock] 01/02: SLING-8428
switch to geronmio specs
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 443e5312b7596f129a20372d006beca55741b6ca
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri May 24 11:13:34 2019 +0200
SLING-8428 switch to geronmio specs
---
core/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 6163a5a..4975412 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -248,9 +248,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>1.0</version>
<scope>test</scope>
</dependency>