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/15 13:07:59 UTC
[sling-org-apache-sling-scripting-thymeleaf] branch master updated
(a2ad561 -> 66d9f6e)
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 a2ad561 SLING-8467 Update Thymeleaf to 3.0.11
new 76627a3 style
new 66d9f6e SLING-8503 Update Felix Framework to 6.0.3
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 +-
.../sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
[sling-org-apache-sling-scripting-thymeleaf] 02/02: SLING-8503
Update Felix Framework to 6.0.3
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 66d9f6e376c0ae23053660e326707f3b66005ef5
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 14:57:53 2019 +0200
SLING-8503 Update Felix Framework to 6.0.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 547a99e..5f7a48c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
+ <version>6.0.3</version>
<scope>test</scope>
</dependency>
<!-- Apache Sling -->
[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 76627a3191358cbdfbf354d8abca6af95dd8da7a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 14:53:26 2019 +0200
style
---
.../sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
index 8237741..66cebe9 100644
--- a/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
@@ -27,6 +27,7 @@ import org.apache.sling.engine.SlingRequestProcessor;
import org.apache.sling.scripting.thymeleaf.it.app.Activator;
import org.apache.sling.serviceusermapping.ServiceUserMapped;
import org.apache.sling.testing.paxexam.TestSupport;
+import org.jetbrains.annotations.NotNull;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
@@ -90,7 +91,7 @@ public abstract class ThymeleafTestSupport extends TestSupport {
}
@ProbeBuilder
- public TestProbeBuilder probeConfiguration(final TestProbeBuilder testProbeBuilder) {
+ public TestProbeBuilder probeConfiguration(@NotNull final TestProbeBuilder testProbeBuilder) {
testProbeBuilder.setHeader(Constants.BUNDLE_ACTIVATOR, Activator.class.getName());
testProbeBuilder.setHeader(Constants.BUNDLE_SYMBOLICNAME, "org.apache.sling.scripting.thymeleaf.it.app");
testProbeBuilder.setHeader(Constants.EXPORT_PACKAGE, "org.apache.sling.scripting.thymeleaf.it.app");