Author: rombert
Date: Thu Sep 28 08:33:01 2017
New Revision: 1809961
URL: http://svn.apache.org/viewvc?rev=1809961&view=rev
Log:
OAK-6739 - Improve oak-it-osgi to support SCR spec 1.3
Moving to the standard annotations means that the components now require
the osgi.extender=osgi.component capability. This is only provided in
org.apache.felix.scr 2.0.0 or newer, so we needed to upgrade a number of
bundles in test.
Modified:
jackrabbit/oak/trunk/oak-it-osgi/pom.xml
jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Modified: jackrabbit/oak/trunk/oak-it-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/pom.xml?rev=1809961&r1=1809960&r2=1809961&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/pom.xml Thu Sep 28 08:33:01 2017
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.2.1</version>
+ <version>5.6.8</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1809961&r1=1809960&r2=1809961&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
(original)
+++
jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Thu Sep 28 08:33:01 2017
@@ -56,8 +56,9 @@ public class OSGiIT {
public Option[] configuration() throws IOException, URISyntaxException {
return CoreOptions.options(
junitBundles(),
- mavenBundle("org.apache.felix", "org.apache.felix.scr",
"1.8.0"),
- mavenBundle( "org.apache.felix",
"org.apache.felix.configadmin", "1.4.0" ),
+ mavenBundle("org.apache.felix", "org.apache.felix.scr",
"2.0.12"),
+ mavenBundle("org.osgi", "org.osgi.dto", "1.0.0"),
+ mavenBundle( "org.apache.felix",
"org.apache.felix.configadmin", "1.8.16" ),
mavenBundle( "org.apache.felix",
"org.apache.felix.fileinstall", "3.2.6" ),
mavenBundle( "org.ops4j.pax.logging", "pax-logging-api",
"1.7.2" ),
frameworkProperty("repository.home").value("target"),
