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:08:18 UTC
[sling-org-apache-sling-scripting-freemarker] branch master updated
(3c983af -> bf14d1e)
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-freemarker.git.
from 3c983af Updating badges for org-apache-sling-scripting-freemarker
new e67fe97 SLING-8496 Use Sling Bundle Parent 35
new 58a52f6 SLING-8497 Update Pax Exam to 4.13.1
new 23f39e5 SLING-8498 Update Testing PaxExam to 3.0.0
new bf14d1e SLING-8504 Update Felix Framework to 6.0.3
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 | 10 +++++-----
.../scripting/freemarker/it/tests/FreemarkerTestSupport.java | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
[sling-org-apache-sling-scripting-freemarker] 04/04: SLING-8504
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-freemarker.git
commit bf14d1ea46b030dde5b613028b620da4b8b3a226
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 14:58:17 2019 +0200
SLING-8504 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 c657d8f..d50ad9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,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-freemarker] 01/04: SLING-8496 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-freemarker.git
commit e67fe97a394585a510d157a9e65e6139e4c4d655
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:36:57 2019 +0200
SLING-8496 Use Sling Bundle Parent 35
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d480031..0a2ec1c 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-freemarker] 03/04: SLING-8498
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-freemarker.git
commit 23f39e5adbb5e3ca3848978815127919b7a55217
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:39:49 2019 +0200
SLING-8498 Update Testing PaxExam to 3.0.0
---
pom.xml | 2 +-
.../sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e9c2cd..c657d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,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>
<!-- FreeMarker -->
diff --git a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
index c8697c7..5f64874 100644
--- a/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/freemarker/it/tests/FreemarkerTestSupport.java
@@ -29,6 +29,7 @@ import org.apache.sling.testing.paxexam.TestSupport;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
+import org.ops4j.pax.exam.options.ModifiableCompositeOption;
import org.ops4j.pax.exam.util.Filter;
import org.osgi.framework.Constants;
import org.osgi.service.http.HttpService;
@@ -65,7 +66,7 @@ public abstract class FreemarkerTestSupport extends TestSupport {
@Filter(value = "(names=freemarker)")
protected ScriptEngineFactory scriptEngineFactory;
- public Option baseConfiguration() {
+ public ModifiableCompositeOption baseConfiguration() {
return composite(
super.baseConfiguration(),
slingQuickstart(),
[sling-org-apache-sling-scripting-freemarker] 02/04: SLING-8497
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-freemarker.git
commit 58a52f631cf4e7e13371351280d799b57a786b19
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:39:14 2019 +0200
SLING-8497 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 0a2ec1c..3e9c2cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.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>