This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-testing.git
commit a15ff7782669420c4c4f520b1b773368decaae54 Author: Robert Munteanu <[email protected]> AuthorDate: Wed Jun 24 22:42:46 2020 +0200 SLING-9499 - Launchpad-Testing: branch which runs ITs against oak_tar feature model aggregate First pass at the conversion: Tests run: 658, Failures: 5, Errors: 6, Skipped: 1 --- pom.xml | 89 +++++++++++++++++++++++++++-------------- src/main/features/model.json | 32 +++++++++++++++ src/main/provisioning/model.txt | 51 ----------------------- 3 files changed, 92 insertions(+), 80 deletions(-) diff --git a/pom.xml b/pom.xml index 5651af6..ca89ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,6 @@ </parent> <artifactId>org.apache.sling.launchpad.testing</artifactId> - <packaging>slingstart</packaging> <version>12-SNAPSHOT</version> <name>Apache Sling Launchpad Testing</name> @@ -96,33 +95,68 @@ </plugin> <plugin> <groupId>org.apache.sling</groupId> - <artifactId>slingstart-maven-plugin</artifactId> + <artifactId>slingfeature-maven-plugin</artifactId> + <version>1.3.6</version> <extensions>true</extensions> + <configuration> + <aggregates> + <aggregate> + <!-- agregate the Sling Starter with the additonal testing files from this module --> + <classifier>testing-oak_tar</classifier> + <!-- depend on the exact same Slingstart version --> + <includeArtifact> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.starter</artifactId> + <version>${project.version}</version> + <classifier>oak_tar</classifier> + <type>slingosgifeature</type> + </includeArtifact> + <filesInclude>model.json</filesInclude> + </aggregate> + </aggregates> + </configuration> <executions> <execution> - <id>start-container</id> + <id>aggregate-features</id> <goals> - <goal>start</goal> + <goal>attach-features</goal> + <goal>aggregate-features</goal> </goals> </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.sling</groupId> + <artifactId>feature-launcher-maven-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + <configuration> + <launches> + <launch> + <!-- launch the new aggregate for the integration tests --> + <id>sling-12-oak-tar</id> + <feature> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <classifier>testing-oak_tar</classifier> + <type>slingosgifeature</type> + </feature> + <launcherArguments> + <frameworkProperties> + <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port> + </frameworkProperties> + </launcherArguments> + </launch> + </launches> + </configuration> + <executions> <execution> - <id>stop-container</id> <goals> + <goal>start</goal> <goal>stop</goal> </goals> </execution> </executions> - <configuration> - <servers> - <server> - <port>${http.port}</port> - <controlPort>${sling.control.port}</controlPort> - <runmode>${sling.run.modes}</runmode> - <contextPath>${http.base.path}</contextPath> - <vmOpts>${sling.vm.options}</vmOpts> - </server> - </servers> - </configuration> </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> @@ -174,24 +208,21 @@ </exclusion> </exclusions> </dependency> - - <!-- depend on the exact same Slingstart version --> + <!-- missing dependencies for surefire; used but not pulled in transitively --> <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.starter</artifactId> - <type>slingstart</type> - <version>${project.version}</version> - <scope>provided</scope> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>test</scope> </dependency> + + <!-- Dependencies for the Test Build and Run --> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.launchpad.test-bundles</artifactId> - <version>${project.version}</version> - <type>slingfeature</type> - <scope>provided</scope> + <artifactId>org.apache.sling.feature.launcher</artifactId> + <version>1.1.2</version> + <scope>runtime</scope> </dependency> - - <!-- Dependencies for the Test Build and Run --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/src/main/features/model.json b/src/main/features/model.json new file mode 100644 index 0000000..c1fe767 --- /dev/null +++ b/src/main/features/model.json @@ -0,0 +1,32 @@ +{ + "id":"${project.groupId}:${project.artifactId}:slingosgifeature:model:${project.version}", + "framework-properties": { + "org.apache.sling.commons.log.julenabled": true + }, + "bundles":[ + "org.apache.sling/org.apache.sling.junit.core/1.0.26", + "org.apache.sling/org.apache.sling.junit.remote/1.0.12", + "org.apache.sling/org.apache.sling.junit.scriptable/1.0.12", + "org.apache.sling/org.apache.sling.launchpad.test-fragment/12-SNAPSHOT", + "org.apache.sling/org.apache.sling.launchpad.test-services/12-SNAPSHOT" + ], + "configurations": { + "integrationTestsConfig": { + "message": "This test config should be loaded at startup" + }, + "org.apache.sling.servlets.resolver.SlingServletResolver": { + "servletresolver.cacheSize": 0 + }, + "org.apache.sling.jcr.base.internal.LoginAdminWhitelist~testing": { + "whitelist.bundles.regexp": "org.apache.sling.(launchpad|junit).*" + } + }, + "repoinit:TEXT|true": [ + "create path /repoinit/provisioningModelTest", + "create service user provisioningModelUser", + "create path (sling:OrderedFolder) /ANON_CAN_READ", + "set ACL for everyone", + " allow jcr:read on /ANON_CAN_READ", + "end" + ] +} \ No newline at end of file diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt deleted file mode 100644 index bc22ba0..0000000 --- a/src/main/provisioning/model.txt +++ /dev/null @@ -1,51 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -[feature name=launchpad-testing] -# Dependencies -[artifacts] - org.apache.sling/org.apache.sling.starter/12-SNAPSHOT/slingstart - org.apache.sling/org.apache.sling.launchpad.test-bundles/12-SNAPSHOT/slingfeature - -# additional configuration for testing -[configurations] - integrationTestsConfig - message="This test config should be loaded at startup" - - org.apache.sling.servlets.resolver.SlingServletResolver - # Set the servlet resolver's cache size to zero for testing - servletresolver.cacheSize=I"0" - - org.apache.sling.jcr.base.internal.LoginAdminWhitelist [mode=merge] - whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*" - -[settings] - org.apache.sling.commons.log.julenabled=true - - # Test repository initialization from provisioning model - # No need to test all repoinit statements, this is done - # by the repoinit it module - [:repoinit] -create path /repoinit/provisioningModelTest - -create service user provisioningModelUser - -create path (sling:OrderedFolder) /ANON_CAN_READ -set ACL for everyone - allow jcr:read on /ANON_CAN_READ -end
