diff --git a/.sling-module.json b/.sling-module.json index cfad4d2..517f33e 100644 --- a/.sling-module.json +++ b/.sling-module.json @@ -1,5 +1,9 @@ { "jenkins": { - "jdks": [17, 21] + "jdks": [21], + "operatingSystems": [ + "linux" + ], + "sonarQubeEnabled": false } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index dc30e98..3367d6e 100644 --- a/pom.xml +++ b/pom.xml @@ -323,6 +323,9 @@ org.apache.maven.plugins maven-surefire-plugin + + true + org.junit.jupiter diff --git a/src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java b/src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java index de736d4..0f3455c 100644 --- a/src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java @@ -26,6 +26,7 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; +import org.apache.sling.models.factory.ModelFactory; import org.apache.sling.models.it.testbundle.models.SlingPropertyAnnotationTestModel; import org.junit.Rule; import org.junit.Test; @@ -56,7 +57,9 @@ public void test() throws Exception { Resource resource = resolver.getResource(createdNode.getPath()); - SlingPropertyAnnotationTestModel model = resource.adaptTo(SlingPropertyAnnotationTestModel.class); + ModelFactory modelFactory = teleporter.getService(ModelFactory.class); + SlingPropertyAnnotationTestModel model = + modelFactory.createModel(resource, SlingPropertyAnnotationTestModel.class); assertNotNull("Model is null", model); assertEquals("Test Property is not set correctly", value, model.getTestProperty()); diff --git a/src/test/java/org/apache/sling/models/it/testing/ViaIT.java b/src/test/java/org/apache/sling/models/it/testing/ViaIT.java index b447f4c..3aab053 100644 --- a/src/test/java/org/apache/sling/models/it/testing/ViaIT.java +++ b/src/test/java/org/apache/sling/models/it/testing/ViaIT.java @@ -27,6 +27,7 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; +import org.apache.sling.models.factory.ModelFactory; import org.apache.sling.models.it.testbundle.models.SourceObject; import org.apache.sling.models.it.testbundle.models.ViaModel; import org.junit.Rule; @@ -61,7 +62,8 @@ public void test() throws Exception { Resource resource = resolver.getResource(createdNode.getPath()); SourceObject obj = new SourceObject(resource); - ViaModel model = adapterManager.getAdapter(obj, ViaModel.class); + ModelFactory modelFactory = teleporter.getService(ModelFactory.class); + ViaModel model = modelFactory.createModel(obj, ViaModel.class); assertNotNull("Model is null", model); assertEquals("Test Property is not set correctly", value, model.getTestProperty());