Author: cziegeler Date: Sun Oct 16 14:05:40 2016 New Revision: 1765157 URL: http://svn.apache.org/viewvc?rev=1765157&view=rev Log: Use java 8 for war tests, sync prov model with launchpad testing
Modified: sling/trunk/launchpad/testing-war/pom.xml sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Modified: sling/trunk/launchpad/testing-war/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1765157&r1=1765156&r2=1765157&view=diff ============================================================================== --- sling/trunk/launchpad/testing-war/pom.xml (original) +++ sling/trunk/launchpad/testing-war/pom.xml Sun Oct 16 14:05:40 2016 @@ -61,6 +61,7 @@ <slf4j.version>1.7.6</slf4j.version> <logback.version>1.1.2</logback.version> + <sling.java.version>8</sling.java.version> </properties> <build> @@ -103,7 +104,7 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>slingstart-maven-plugin</artifactId> - <version>1.4.2</version> + <version>1.4.4</version> <extensions>true</extensions> <configuration> <createWebapp>true</createWebapp> @@ -112,7 +113,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.2.10.v20150310</version> + <version>9.3.12.v20160915</version> <configuration> <skip>${maven.test.skip}</skip> <stopKey>alpha</stopKey> Modified: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt?rev=1765157&r1=1765156&r2=1765157&view=diff ============================================================================== --- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (original) +++ sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Sun Oct 16 14:05:40 2016 @@ -31,6 +31,9 @@ # Set the servlet resolver's cache size to zero for testing servletresolver.cacheSize=I"0" + org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl + whitelist.regexp="org.apache.sling.(launchpad|junit).*" + # Test repository initialization from provisioning model #Â No need to test all repoinit statements, this is done # by the repoinit it module