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/09/07 17:02:27 UTC
[sling-org-apache-sling-scripting-thymeleaf] branch master updated
(127ed8b -> 89e3694)
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-scripting-thymeleaf.git.
from 127ed8b remove default values from bnd file
new 69ba820 style
new 89e3694 SLING-7894 Update Pax Exam to 4.12.0
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 | 2 +-
.../scripting/thymeleaf/internal/SlingResourceTemplateResolver.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
[sling-org-apache-sling-scripting-thymeleaf] 02/02: SLING-7894
Update Pax Exam to 4.12.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-scripting-thymeleaf.git
commit 89e3694a85b37a2ce0ef1e52e78892e11bc0f251
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 19:01:35 2018 +0200
SLING-7894 Update Pax Exam to 4.12.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a384952..c6f2aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
<com.fasterxml.jackson.version>2.6.3</com.fasterxml.jackson.version>
- <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.12.0</org.ops4j.pax.exam.version>
</properties>
<scm>
[sling-org-apache-sling-scripting-thymeleaf] 01/02: style
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-scripting-thymeleaf.git
commit 69ba820c05ef40f78176a980ac5aa6035d48e530
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Sep 7 18:59:52 2018 +0200
style
---
.../scripting/thymeleaf/internal/SlingResourceTemplateResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
index dfcbb40..3d53281 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/SlingResourceTemplateResolver.java
@@ -66,9 +66,9 @@ public class SlingResourceTemplateResolver implements ITemplateResolver {
private volatile TemplateModeProvider templateModeProvider;
@Reference(
- cardinality = ReferenceCardinality.MANDATORY,
- policy = ReferencePolicy.DYNAMIC,
- policyOption = ReferencePolicyOption.GREEDY
+ cardinality = ReferenceCardinality.MANDATORY,
+ policy = ReferencePolicy.DYNAMIC,
+ policyOption = ReferencePolicyOption.GREEDY
)
private volatile ScriptingResourceResolverProvider scriptingResourceResolverProvider;