diff --git a/pom.xml b/pom.xml index df807646..7f09892d 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ 8 2023-05-30T08:54:10Z + 1.5.0 @@ -93,6 +94,101 @@ false + + org.apache.sling + slingfeature-maven-plugin + 1.7.2 + true + + true + false + 25 + + + + + prepare-features + prepare-package + + analyse-features + attach-features + + + + create-app-repository + package + + repository + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + reserve-network-port + + reserve-network-port + + pre-integration-test + + + starter-its.http.port + + + + + + + + org.apache.sling + feature-launcher-maven-plugin + 0.1.6 + + + 1.1.26 + + + sling-starter-oak-tar + + ${project.groupId} + ${project.artifactId} + ${project.version} + app + slingosgifeature + + + file://${project.build.directory}/artifacts + + + + ${starter-its.http.port} + + + ${starter-its.startTimeoutSeconds} + + + true + + + + + start + stop + + + + @@ -100,7 +196,7 @@ org.apache.sling org.apache.sling.models.api - 1.5.0 + ${models.api.version} provided @@ -198,6 +294,12 @@ annotations provided + + javax.annotation + javax.annotation-api + 1.3.2 + provided + junit @@ -253,11 +355,37 @@ 5.2.9.RELEASE test + + - javax.annotation - javax.annotation-api - 1.3.2 + org.apache.sling + org.apache.sling.junit.core + 1.0.28 provided + + org.apache.sling + org.apache.sling.testing.rules + 1.0.8 + test + + + org.apache.sling + org.apache.sling.testing.clients + 2.0.12 + test + + + javax.servlet + servlet-api + + + + + org.apache.sling + org.apache.sling.junit.teleporter + 1.0.20 + test + diff --git a/src/test/features/main.json b/src/test/features/main.json new file mode 100644 index 00000000..e1c15e85 --- /dev/null +++ b/src/test/features/main.json @@ -0,0 +1,25 @@ +{ + "prototype" : { + "id" : "org.apache.sling:org.apache.sling.starter:slingosgifeature:oak_tar:12", + "removals" : { + "bundles" : [ + "${project.groupId}:${project.artifactId}:0", + "org.apache.sling:org.apache.sling.models.api:0" + ] + } + }, + "bundles": [ + { + "id":"${project.groupId}:${project.artifactId}:${project.version}", + "start-order": 24 + }, + { + "id":"org.apache.sling:org.apache.sling.models.api:${models.api.version}", + "start-order": 24 + }, + { + "id":"org.apache.sling:org.apache.sling.junit.core:1.1.6", + "start-order": 24 + } + ] +} \ No newline at end of file