SLING-3239 - Upgrade to SCR 1.8.0

Use org.apache.felix.scr in the launchpad/builder and also upgrade the
version referenced in integration tests.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1540694 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index a3bb903..726a501 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.0</version>
+            <version>1.8.0</version>
         </dependency>
 
     </dependencies>
diff --git a/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java b/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
index 771e1a0..43e6293 100644
--- a/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
+++ b/src/main/java/org/apache/sling/test/AbstractOSGiRunner.java
@@ -109,7 +109,7 @@
 						// url resolution for pax
 						mavenBundle("org.ops4j.pax.url", "pax-url-mvn", "1.3.5"),
 						// to support declarative services
-						mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.0"),
+						mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
 						// bound to need servlet api
 						mavenBundle("org.apache.felix", "javax.servlet","1.0.0"),
 						// standard items.