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 2022/06/23 11:37:53 UTC
[sling-org-apache-sling-scripting-groovy] branch master updated (189fb37 -> 90cefe9)
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 189fb37 SLING-11051 - Fixing JavaDoc badge
new 0d21a6c use Hamcrest matchers only
new 9c965e2 update test dependencies
new 7e1db68 SLING-11406 Update to Sling Bundle Parent 48
new c82bf0e SLING-11407 Upgrade to Groovy 4
new 90cefe9 tell Jenkins to run build with Java 8, 11 and 17
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:
.sling-module.json | 9 +++++++++
pom.xml | 17 +++++++----------
.../sling/scripting/groovy/it/GroovyTestSupport.java | 6 +++---
.../sling/scripting/groovy/it/tests/AdaptToModelIT.java | 2 +-
.../groovy/it/tests/GStringScriptEngineFactoryIT.java | 8 ++++----
.../sling/scripting/groovy/it/tests/SimpleIT.java | 2 +-
6 files changed, 25 insertions(+), 19 deletions(-)
create mode 100644 .sling-module.json
[sling-org-apache-sling-scripting-groovy] 01/05: use Hamcrest matchers only
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 0d21a6c284e770194ef5bd68218f0cd7aabdff34
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jun 23 13:28:10 2022 +0200
use Hamcrest matchers only
---
.../org/apache/sling/scripting/groovy/it/tests/AdaptToModelIT.java | 2 +-
.../scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java | 6 +++---
.../java/org/apache/sling/scripting/groovy/it/tests/SimpleIT.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/tests/AdaptToModelIT.java b/src/test/java/org/apache/sling/scripting/groovy/it/tests/AdaptToModelIT.java
index aced412..3d0be81 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/tests/AdaptToModelIT.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/tests/AdaptToModelIT.java
@@ -37,8 +37,8 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.exam.util.Filter;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
index 52f7e51..ac1e8ba 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
@@ -27,11 +27,11 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -46,7 +46,7 @@ public class GStringScriptEngineFactoryIT extends GroovyTestSupport {
@Test
public void testScriptEngineFactory() {
- assertNotNull(scriptEngineFactory);
+ assertThat(scriptEngineFactory, is(notNullValue()));
}
@Test
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/tests/SimpleIT.java b/src/test/java/org/apache/sling/scripting/groovy/it/tests/SimpleIT.java
index fe71538..c585886 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/tests/SimpleIT.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/tests/SimpleIT.java
@@ -37,8 +37,8 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.exam.util.Filter;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
[sling-org-apache-sling-scripting-groovy] 03/05: SLING-11406 Update to Sling Bundle Parent 48
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 7e1db68c81e0384f91421b808cb08db3b82f2de5
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jun 23 13:32:51 2022 +0200
SLING-11406 Update to Sling Bundle Parent 48
---
pom.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e3158a..c1dc7d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>43</version>
+ <version>48</version>
<relativePath />
</parent>
@@ -35,9 +35,6 @@
<description>Support for scripting with Groovy</description>
<properties>
- <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.13.3</org.ops4j.pax.exam.version>
<groovy.version>3.0.1</groovy.version>
</properties>
[sling-org-apache-sling-scripting-groovy] 02/05: update test dependencies
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 9c965e26e83a42ff8959b07c99e2afcf958e6802
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jun 23 13:29:47 2022 +0200
update test dependencies
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 093d6bf..5e3158a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
+ <version>7.0.5</version>
<scope>test</scope>
</dependency>
<!-- Apache Sling -->
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.11.3</version>
+ <version>1.15.1</version>
<scope>test</scope>
</dependency>
<!-- logging -->
[sling-org-apache-sling-scripting-groovy] 04/05: SLING-11407 Upgrade to Groovy 4
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 c82bf0ec8eca3e66b3258c147bb42ab4e0586cef
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jun 23 13:33:54 2022 +0200
SLING-11407 Upgrade to Groovy 4
---
pom.xml | 8 ++++----
.../org/apache/sling/scripting/groovy/it/GroovyTestSupport.java | 6 +++---
.../scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1dc7d1..f68645c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<properties>
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
- <groovy.version>3.0.1</groovy.version>
+ <groovy.version>4.0.3</groovy.version>
</properties>
<scm>
@@ -165,19 +165,19 @@
</dependency>
<!-- Groovy -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-templates</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
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 19cdbac..57548cd 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
@@ -81,9 +81,9 @@ public class GroovyTestSupport extends TestSupport {
quickstart(),
// Sling Scripting Groovy
testBundle("bundle.filename"),
- mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy").versionAsInProject(),
- mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-json").versionAsInProject(),
- mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-templates").versionAsInProject(),
+ mavenBundle().groupId("org.apache.groovy").artifactId("groovy").versionAsInProject(),
+ mavenBundle().groupId("org.apache.groovy").artifactId("groovy-json").versionAsInProject(),
+ mavenBundle().groupId("org.apache.groovy").artifactId("groovy-templates").versionAsInProject(),
// testing
slingResourcePresence(),
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
index ac1e8ba..41e3c44 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/tests/GStringScriptEngineFactoryIT.java
@@ -61,7 +61,7 @@ public class GStringScriptEngineFactoryIT extends GroovyTestSupport {
@Test
public void testScriptEngineFactoryLanguageVersion() {
- assertThat(scriptEngineFactory.getLanguageVersion(), startsWith("3.0."));
+ assertThat(scriptEngineFactory.getLanguageVersion(), startsWith("4.0."));
}
@Test
[sling-org-apache-sling-scripting-groovy] 05/05: tell Jenkins to run build with Java 8, 11 and 17
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 90cefe909c151f24c91d7fe4bcd978405a579798
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jun 23 13:37:41 2022 +0200
tell Jenkins to run build with Java 8, 11 and 17
---
.sling-module.json | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..c4627e9
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,9 @@
+{
+ "jenkins": {
+ "jdks": [
+ 17,
+ 11,
+ 8
+ ]
+ }
+}