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/06/02 08:22:09 UTC
[sling-org-apache-sling-scripting-thymeleaf] branch master updated
(c1822e8 -> a2ad561)
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 c1822e8 Updating badges for org-apache-sling-scripting-thymeleaf
new 50f8851 SLING-8463 Mark List fields in ThymeleafScriptEngineFactory volatile
new 6bfae79 SLING-8464 Use Sling Bundle Parent 35
new 85be82b SLING-8465 Update Pax Exam to 4.13.1
new bdbc1ac SLING-8466 Update Testing PaxExam to 3.0.0
new a2ad561 SLING-8467 Update Thymeleaf to 3.0.11
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 | 10 +++++-----
.../thymeleaf/internal/ThymeleafScriptEngineFactory.java | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
[sling-org-apache-sling-scripting-thymeleaf] 01/05: SLING-8463 Mark
List fields in ThymeleafScriptEngineFactory volatile
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 50f88510ffcd3103e1f7a77b6f26f4ec1abb408e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 1 20:38:48 2019 +0200
SLING-8463 Mark List fields in ThymeleafScriptEngineFactory volatile
---
.../thymeleaf/internal/ThymeleafScriptEngineFactory.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
index 5512c09..caf4070 100644
--- a/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ThymeleafScriptEngineFactory.java
@@ -78,7 +78,7 @@ public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFact
bind = "addTemplateResolver",
unbind = "removeTemplateResolver"
)
- private List<ITemplateResolver> templateResolvers;
+ private volatile List<ITemplateResolver> templateResolvers;
@Reference(
cardinality = ReferenceCardinality.AT_LEAST_ONE,
@@ -86,7 +86,7 @@ public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFact
bind = "addMessageResolver",
unbind = "removeMessageResolver"
)
- private List<IMessageResolver> messageResolvers;
+ private volatile List<IMessageResolver> messageResolvers;
@Reference(
cardinality = ReferenceCardinality.AT_LEAST_ONE,
@@ -94,7 +94,7 @@ public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFact
bind = "addDialect",
unbind = "removeDialect"
)
- private List<IDialect> dialects;
+ private volatile List<IDialect> dialects;
@Reference(
cardinality = ReferenceCardinality.MULTIPLE,
@@ -102,7 +102,7 @@ public final class ThymeleafScriptEngineFactory extends AbstractScriptEngineFact
bind = "addLinkBuilder",
unbind = "removeLinkBuilder"
)
- private List<ILinkBuilder> linkBuilders;
+ private volatile List<ILinkBuilder> linkBuilders;
@Reference(
cardinality = ReferenceCardinality.OPTIONAL,
[sling-org-apache-sling-scripting-thymeleaf] 04/05: SLING-8466
Update Testing PaxExam to 3.0.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 bdbc1ac63b20d345a5a12c63dec0599e40bda30b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 1 20:41:18 2019 +0200
SLING-8466 Update Testing PaxExam to 3.0.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 46a35d3..ac77616 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>2.0.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<!-- Thymeleaf -->
[sling-org-apache-sling-scripting-thymeleaf] 02/05: SLING-8464 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-scripting-thymeleaf.git
commit 6bfae79f49007a111d480fdfafd065e20942b702
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 1 20:39:45 2019 +0200
SLING-8464 Use Sling Bundle Parent 35
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index ac5715f..b384e6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
[sling-org-apache-sling-scripting-thymeleaf] 03/05: SLING-8465
Update Pax Exam to 4.13.1
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 85be82bd541fc0355774596256eaa722df94ee91
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 1 20:40:30 2019 +0200
SLING-8465 Update Pax Exam to 4.13.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b384e6c..46a35d3 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.12.0</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
</properties>
<scm>
[sling-org-apache-sling-scripting-thymeleaf] 05/05: SLING-8467
Update Thymeleaf to 3.0.11
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 a2ad5617de61aa6974eaa7f8801e39495df41153
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 1 20:42:00 2019 +0200
SLING-8467 Update Thymeleaf to 3.0.11
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ac77616..547a99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.thymeleaf</artifactId>
- <version>3.0.9.RELEASE_1</version>
+ <version>3.0.11.RELEASE_1</version>
<scope>provided</scope>
</dependency>
<dependency>