SLING-3479 - Upgrade to Oak 1.0

Upgraded Oak to 1.0.9 -- Add Felix JAAS bundle to the Pax Bundle list -- Fix the setup logic in CommonTests to break if service reference is found instead of returning back git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1649333 13f79535-47bb-0310-9956-ffa450edef68
longuyen1 · Jan 4, 2015 · 21d927d · 21d927d
1 parent e299832
commit 21d927d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/bundles/jcr/it-jackrabbit-oak/pom.xml b/bundles/jcr/it-jackrabbit-oak/pom.xml
@@ -36,7 +36,7 @@
             WARNING make sure oak.version and sling.oak.server.version 
             are in sync with bundles/jcr/oak-server
         -->
-        <oak.version>1.0.7</oak.version>
+        <oak.version>1.0.9</oak.version>
         <sling.oak.server.version>${project.version}</sling.oak.server.version>
 
         <!-- optionally activate the webconsole -->

diff --git a/...s/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java b/...s/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
@@ -565,11 +565,11 @@ public void setup() throws Exception {
         while(System.currentTimeMillis() < timeoutAt) {
             ref = bundleContext.getServiceReference(ResourceResolverFactory.class.getName());
             if(ref != null) {
-                return;
+                break;
             }
         }
 
-        assertNotNull("Expecting ResourceResolverFactory within " + timeout + " seconds");
+        assertNotNull("Expecting ResourceResolverFactory within " + timeout + " seconds", ref);
         ResourceResolver rr = null;
         try {
             final ResourceResolverFactory f = (ResourceResolverFactory)bundleContext.getService(ref);

diff --git a/...r/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java b/...r/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
@@ -64,14 +64,12 @@ public Option[] config() {
         // embedded for now opt.add(mavenBundle("org.apache.jackrabbit", "oak-jcr", oakVersion));
         opt.add(mavenBundle("org.apache.jackrabbit", "oak-commons", oakVersion));
 
-        // not needed anymore?
-        opt.add(mavenBundle("org.apache.jackrabbit", "oak-mk", oakVersion));
         opt.add(mavenBundle("org.apache.jackrabbit", "oak-mk-api", oakVersion));
-        opt.add(mavenBundle("org.apache.jackrabbit", "oak-mk-remote", oakVersion));
 
         opt.add(mavenBundle("org.apache.jackrabbit", "oak-lucene", oakVersion));
         opt.add(mavenBundle("org.apache.jackrabbit", "oak-blob", oakVersion));
-
+        opt.add(mavenBundle("org.apache.felix", "org.apache.felix.jaas", "0.0.2"));
+
         return opt.toArray(new Option[]{});
     }