SLING-6170 - build now works with both Java 1.7 and 1.8
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1765316 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 5b48b83..66aabf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
