This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new 9a00dd4 SLING-12470 Sling Models Integration Tests: Fix running with
latest Models Impl 1.7.x (#6)
9a00dd4 is described below
commit 9a00dd4cf090779015753d88efcb16dc19924842
Author: Stefan Seifert <[email protected]>
AuthorDate: Tue Nov 5 11:45:26 2024 +0100
SLING-12470 Sling Models Integration Tests: Fix running with latest Models
Impl 1.7.x (#6)
---
.sling-module.json | 8 ++++++++
pom.xml | 6 +++---
.../org/apache/sling/models/testing/ModelFactorySimpleIT.java | 2 ++
src/test/provisioning/sling-models-jacksonexporter.txt | 2 +-
src/test/provisioning/sling.txt | 7 +++++++
5 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..a357d74
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,8 @@
+{
+ "jenkins": {
+ "sonarQubeEnabled": false,
+ "jdks": [
+ 11
+ ]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a370874..95318dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,19 +252,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.api</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.5.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.impl</artifactId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.7.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.jacksonexporter</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git
a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
index e5bc8cc..e807f02 100644
--- a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
@@ -37,6 +37,7 @@ import
org.apache.sling.models.it.models.implextend.InvalidImplementsInterfacePr
import org.apache.sling.models.it.models.implextend.SampleServiceInterface;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -89,6 +90,7 @@ public class ModelFactorySimpleIT {
assertSame("Adaptable is not injected", resource, model.getResource());
}
+ @Ignore
private static final class DummyClass {
}
diff --git a/src/test/provisioning/sling-models-jacksonexporter.txt
b/src/test/provisioning/sling-models-jacksonexporter.txt
index cf590fa..a2a903d 100644
--- a/src/test/provisioning/sling-models-jacksonexporter.txt
+++ b/src/test/provisioning/sling-models-jacksonexporter.txt
@@ -21,4 +21,4 @@
[feature name=models-jacksonexporter]
[artifacts]
- org.apache.sling/org.apache.sling.models.jacksonexporter
+ org.apache.sling/org.apache.sling.models.jacksonexporter
diff --git a/src/test/provisioning/sling.txt b/src/test/provisioning/sling.txt
index 432d466..d5d7e47 100644
--- a/src/test/provisioning/sling.txt
+++ b/src/test/provisioning/sling.txt
@@ -23,6 +23,13 @@
[artifacts]
org.apache.sling/org.apache.sling.starter/11/slingstart
+ # Update to newer bundles required by sling models impl
+ org.osgi/org.osgi.util.converter/1.0.9
+ org.apache.sling/org.apache.sling.api/2.21.0
+ org.apache.sling/org.apache.sling.resourceresolver/1.6.16
+ org.apache.sling/org.apache.sling.servlets.resolver/2.5.8
+ org.apache.sling/org.apache.sling.scripting.core/2.1.0
+
# Use versions as defined in POM
org.apache.sling/org.apache.sling.models.api
org.apache.sling/org.apache.sling.models.impl
