Author: rombert Date: Fri Sep 1 12:29:00 2017 New Revision: 1806946 URL: http://svn.apache.org/viewvc?rev=1806946&view=rev Log: launchpad/testing: move to parent pom 31
Modified: sling/trunk/launchpad/testing/pom.xml Modified: sling/trunk/launchpad/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1806946&r1=1806945&r2=1806946&view=diff ============================================================================== --- sling/trunk/launchpad/testing/pom.xml (original) +++ sling/trunk/launchpad/testing/pom.xml Fri Sep 1 12:29:00 2017 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>26</version> + <version>31</version> <relativePath /> </parent> @@ -93,7 +93,6 @@ <plugin> <groupId>org.apache.sling</groupId> <artifactId>slingstart-maven-plugin</artifactId> - <version>1.7.0</version> <extensions>true</extensions> <executions> <execution> @@ -212,6 +211,16 @@ <artifactId>org.apache.sling.launchpad.integration-tests</artifactId> <version>1.0.5-SNAPSHOT</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Dependencies for the Test Build and Run --> @@ -223,7 +232,6 @@ <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>2.0</version> <scope>test</scope> </dependency> <dependency> @@ -253,17 +261,16 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <scope>test</scope> </dependency> </dependencies>