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/06/15 18:45:45 UTC

[sling-org-apache-sling-scripting-groovy] branch master updated (112a040 -> 419bab9)

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 112a040  Updating badges for org-apache-sling-scripting-groovy
     new 8e316ca  clean up bnd instructions
     new a80b41c  SLING-7743 Update Groovy to 2.5.0
     new 419bab9  update Testing PaxExam and jsoup

The 3 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:
 bnd.bnd                                                           | 4 ----
 pom.xml                                                           | 8 ++++----
 .../sling/scripting/groovy/it/tests/GspScriptEngineFactoryIT.java | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.

[sling-org-apache-sling-scripting-groovy] 03/03: update Testing PaxExam and jsoup

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 419bab9add3c2b7d4d226daf8c31cda2172540de
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jun 15 20:45:16 2018 +0200

    update Testing PaxExam and jsoup
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6f51f19..cb16654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,8 +166,8 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.paxexam</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
+      <version>2.0.0</version>
+      <scope>test</scope>
     </dependency>
     <!-- Groovy -->
     <dependency>
@@ -192,7 +192,7 @@
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.10.2</version>
+      <version>1.11.3</version>
       <scope>test</scope>
     </dependency>
     <!-- logging -->

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.

[sling-org-apache-sling-scripting-groovy] 02/03: SLING-7743 Update Groovy to 2.5.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 a80b41c669872788c618c4a3c2bd228d5177671e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jun 15 20:42:13 2018 +0200

    SLING-7743 Update Groovy to 2.5.0
---
 pom.xml                                                                 | 2 +-
 .../sling/scripting/groovy/it/tests/GspScriptEngineFactoryIT.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 72adb13..6f51f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sling.java.version>8</sling.java.version>
     <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
-    <groovy.version>2.4.13</groovy.version>
+    <groovy.version>2.5.0</groovy.version>
   </properties>
 
   <scm>
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GspScriptEngineFactoryIT.java b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GspScriptEngineFactoryIT.java
index aff0db4..3cebdd0 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GspScriptEngineFactoryIT.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GspScriptEngineFactoryIT.java
@@ -61,7 +61,7 @@ public class GspScriptEngineFactoryIT extends GroovyTestSupport {
 
     @Test
     public void testScriptEngineFactoryLanguageVersion() {
-        assertThat(scriptEngineFactory.getLanguageVersion(), startsWith("2.4."));
+        assertThat(scriptEngineFactory.getLanguageVersion(), startsWith("2.5."));
     }
 
     @Test

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.

[sling-org-apache-sling-scripting-groovy] 01/03: clean up bnd instructions

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 8e316ca99249673e1ff45d108a4eade096b9b76a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue May 29 14:06:26 2018 +0200

    clean up bnd instructions
---
 bnd.bnd | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index c99a014..669351e 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -12,10 +12,6 @@ ScriptEngine-Name: ${project.name}
 
 ScriptEngine-Version: ${project.version}
 
--baseline: *
-
 -removeheaders:\
-  Embed-Dependency,\
-  Embed-Transitive,\
   Include-Resource,\
   Private-Package

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.