Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1535b26
SLING-13068 Update to Parent 65
stefanseifert Jan 23, 2026
7ad9b4a
SLING-13068 update testing dependencies
stefanseifert Jan 23, 2026
8686094
SLING-13050 define models versions
stefanseifert Jan 23, 2026
94a4364
SLING-13050 add IT test models
stefanseifert Jan 23, 2026
d4f3dbf
SLING-13050 add sling launcher
stefanseifert Jan 23, 2026
32e3784
SLING-13050 add ITs
stefanseifert Jan 23, 2026
0e11be2
SLING-13050 rename IT packages
stefanseifert Jan 23, 2026
56da090
SLING-13050 generate IT test bundle on the fly
stefanseifert Jan 23, 2026
f25c78f
Merge branch 'master' into feature/SLING-13050-integration-tests-sing…
stefanseifert Jan 23, 2026
ffba16a
SLING-13050 workaround to ensure Component Property Type from this an…
stefanseifert Jan 23, 2026
3409a2a
SLING-13050 rename classifier/feature
stefanseifert Jan 23, 2026
56c47e5
SLING-13050 update feature launcher maven plugin
stefanseifert Jan 27, 2026
09f2d4e
Merge branch 'master' into feature/SLING-13050-integration-tests-sing…
stefanseifert Jan 27, 2026
74f882c
SLING-13050 eliminate some sonar warnings
stefanseifert Jan 27, 2026
fe48474
SLING-13050 eliminate some sonar warnings
stefanseifert Jan 27, 2026
f23d63e
SLING-13050 add jacoco code coverage
stefanseifert Jan 27, 2026
4ab1514
SLING-13050 add comment
stefanseifert Jan 27, 2026
be1db98
enable debug level by default, use ModelFactory instead adapt to get …
stefanseifert Jan 28, 2026
8056876
for debugging: build only unix java 21, do not run unit tests, only ITs
stefanseifert Jan 28, 2026
467ca2c
use ModelFactory to get more insight
stefanseifert Jan 28, 2026
3dee53f
Merge branch 'master' into feature/SLING-13050-integration-tests-sing…
stefanseifert Jan 28, 2026
2b3b203
Merge branch 'master' into feature/SLING-13050-integration-tests-sing…
stefanseifert Feb 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .sling-module.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"jenkins": {
"jdks": [17, 21]
"jdks": [21],
"operatingSystems": [
"linux"
],
"sonarQubeEnabled": false
}
}
3 changes: 3 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/apache/sling/models/it/testing/ViaIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down