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:40 UTC
[sling-org-apache-sling-scripting-groovy] branch master updated
(0a7671f -> 424ccc9)
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-groovy.git.
from 0a7671f Updating badges for org-apache-sling-scripting-groovy
new a3b6f49 SLING-8499 Use Sling Bundle Parent 35
new 3e453ab SLING-8500 Update Pax Exam to 4.13.1
new 797ad06 SLING-8501 Update Testing PaxExam to 3.0.0
new 424ccc9 SLING-8505 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 | 11 ++++++-----
.../apache/sling/scripting/groovy/it/GroovyTestSupport.java | 3 ++-
2 files changed, 8 insertions(+), 6 deletions(-)
[sling-org-apache-sling-scripting-groovy] 04/04: SLING-8505 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-groovy.git
commit 424ccc9696a36ef970fc1e9a2d29de23c2624d28
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 14:58:39 2019 +0200
SLING-8505 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 d56ebfe..5a03e5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,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-groovy] 03/04: SLING-8501 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-groovy.git
commit 797ad0611443f86ff8058498303dcf9ffd0a5483
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:42:19 2019 +0200
SLING-8501 Update Testing PaxExam to 3.0.0
---
pom.xml | 2 +-
.../java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 45b3ea1..d56ebfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,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>
<!-- Groovy -->
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
index 560d8e2..f612f40 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
@@ -31,6 +31,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.service.http.HttpService;
@@ -68,7 +69,7 @@ public class GroovyTestSupport extends TestSupport {
@Inject
protected TemplateEngine templateEngine;
- public Option baseConfiguration() {
+ public ModifiableCompositeOption baseConfiguration() {
return composite(
super.baseConfiguration(),
quickstart(),
[sling-org-apache-sling-scripting-groovy] 01/04: SLING-8499 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-groovy.git
commit a3b6f4984b023bad778a8c9f3794f09166f2016e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:40:52 2019 +0200
SLING-8499 Use Sling Bundle Parent 35
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8463782..947fbeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,10 +20,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>sling</artifactId>
<groupId>org.apache.sling</groupId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
[sling-org-apache-sling-scripting-groovy] 02/04: SLING-8500 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-groovy.git
commit 3e453ab7e1135777181c251ef2d4ded7647d7798
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jun 15 10:41:25 2019 +0200
SLING-8500 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 947fbeb..45b3ea1 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>
<groovy.version>2.5.0</groovy.version>
</properties>