Author: bdelacretaz Date: Mon Oct 17 15:39:00 2016 New Revision: 1765316 URL: http://svn.apache.org/viewvc?rev=1765316&view=rev Log: SLING-6170 - build now works with both Java 1.7 and 1.8
Modified: sling/trunk/contrib/crankstart/launcher/pom.xml Modified: sling/trunk/contrib/crankstart/launcher/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/pom.xml?rev=1765316&r1=1765315&r2=1765316&view=diff ============================================================================== --- sling/trunk/contrib/crankstart/launcher/pom.xml (original) +++ sling/trunk/contrib/crankstart/launcher/pom.xml Mon Oct 17 15:39:00 2016 @@ -111,26 +111,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> - <executions> - <execution> - <id>enforce-java</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireJavaVersion> - <version>[1.7,1.8)</version> - </requireJavaVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -144,7 +124,8 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>4.0.0</version> + <!-- This should be the same version as in crankstart-model.txt --> + <version>5.0.0</version> <scope>provided</scope> </dependency> <dependency>