You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:29:17 UTC

[sling-org-apache-sling-testing-sling-mock] annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0 created (now ab180a0)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.


      at ab180a0  (tag)
 tagging db4501bb928e212f1bd2795eb3a4732aa2be69f9 (commit)
      by Stefan Seifert
      on Tue Jul 12 10:31:26 2016 +0000

- Log -----------------------------------------------------------------
org.apache.sling.testing.sling-mock-oak-2.0.0
-----------------------------------------------------------------------

This annotated tag includes the following new commits:

     new fd0d1a0  SLING-4605 - Add support for an Oak resource resolver type mock
     new e224c05  Mocks: use latest snapshots
     new c72f3a4  update to released mock versions
     new 335ff9d  switch back to latest sling-mock snapshot
     new 2f2f13b  svn:ignore
     new 9b901a8  SLING-4824 - Embed all needed classes in the sling-oak-mock jar
     new 929e4e1  update to latest development snapshots
     new 74e91c0  Update to Sling Parent 23
     new 2001197  Testing: remove superflous sling.java.version=6 as it's the default now
     new 3b08cf0  Update rat exclude rules
     new 69ff780  switch to released versions
     new 3da3620  add "dependency-reduced-pom.xml" to svn:ignore
     new db18087  set parent version to 24 and add empty relativePath where missing
     new 82ac036  SLING-5007 realx unit test to test root path child listing in sling-mock-jackrabbit and sling-mock-jackrabbit and sling-mock-oak because in real repositories multiple root test nodes may be created in parallel, or nodes already exist
     new 8d645b6  SLING-5007 use same unit tests for root node tests for all resource resolver types without counting the number of children.
     new 9484e6d  SLING-5064 sling-mock: Register JCR node types for OSGi bundles in class path
     new fa5c56d  SLING-5067 sling-mock: "uniqueRoot()" to simplify creation and cleanup of unique root paths in repository
     new 657461c  SLING-5064 manual registration of node types no longer required
     new 3e33871  SLING-5064 manual registration of node types no longer required; register namespaces and node types centrally depending on NodeTypeMode
     new 300fe88  SLING-5084 sling-mock-oak: Provide a minimal index configuration for Sling-related properties
     new cb1a8a2  SLING-4824/SLING-4827 do not embed org.apache.sling.jcr.resource dependency; it's a dependency of sling mock and not sling-mock-jackrabbit/oak and version used should be controlled by sling-mock
     new 2d405ea  SLING-5088 control SlingRepository resources via activate/deactivate methods; make sure all oak ExecutorServices are shutdown properly
     new 17335f6  Update the main reactor to parent 25
     new 4c2c442  SLING-5088 do not use ReflectiveOperationException which is a JDK 1.7 class
     new 31fb0b2  update dependencies
     new 3769038  [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-1.0.0
     new 831de80  [maven-release-plugin] prepare for next development iteration
     new a402639  set dependencies to next snapshot version until released versions are available in maven central
     new caa8a48  switch back to released versions of dependency
     new 832e5e8  Include the sources of shaded packages in sources jar, useful for debugging
     new cb0e398  Switch to parent pom 26
     new 9cdb050  update to released versions
     new 0a3df5d  SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15
     new 1b5ccb9  SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15
     new 7985024  SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15
     new f9203cd  SLING-5835 sling-mock-oak: Update to Oak 1.4.1 and Jackrabbit API 2.12.1
     new f9d8854  set sling-mock dependency to 2.0.0
     new febad13  [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-2.0.0
     new db4501b  [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-2.0.0

The 39 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-testing-sling-mock] 03/07: SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 7985024037618c3630a49748451663f743931619
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Feb 23 02:06:41 2016 +0000

    SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1731778 13f79535-47bb-0310-9956-ffa450edef68
---
 .../mock/sling/oak/OakMockSlingRepository.java     | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
index cd6133a..45f7094 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.testing.mock.sling.oak;
 
+import java.lang.reflect.Field;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -42,6 +43,8 @@ import org.apache.jackrabbit.oak.jcr.Jcr;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component
 @Service(SlingRepository.class)
@@ -54,6 +57,8 @@ public final class OakMockSlingRepository implements SlingRepository {
     private ExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     
+    private static final Logger log = LoggerFactory.getLogger(OakMockSlingRepository.class);
+    
     @Activate
     protected void activate(BundleContext bundleContext) {
         executor = Executors.newSingleThreadExecutor();
@@ -77,12 +82,26 @@ public final class OakMockSlingRepository implements SlingRepository {
 
     @Deactivate
     protected void deactivate(ComponentContext componentContext) {
-        // shutdown OAK JCR repository
-        ((JackrabbitRepository)repository).shutdown();
-        
         // shutdown executors
+        // force immediate shutdown for all executors without waiting for tasks for completion - we're only in unit tests! 
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
+        shutdownExecutorService(repository, "scheduledExecutor");
+
+        // shutdown OAK JCR repository
+        ((JackrabbitRepository)repository).shutdown();
+    }
+
+    private void shutdownExecutorService(Object instance, String fieldName) {
+        try {
+            Field executorField = instance.getClass().getDeclaredField(fieldName); 
+            executorField.setAccessible(true);
+            ExecutorService executor = (ExecutorService)executorField.get(instance);
+            executor.shutdownNow();
+        }
+        catch (Throwable ex) {
+            log.error("Potential Memory leak: Unable to shutdown executor service from field '" + fieldName + "' in " + instance, ex);
+        }
     }
     
     public String getDescriptor(String key) {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-testing-sling-mock] 02/07: SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 1b5ccb9aa47a829266fd4ee287c5972cf0b949fe
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Feb 23 01:49:03 2016 +0000

    SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1731777 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/oak/OakMockResourceResolverAdapter.java  | 11 +----
 .../mock/sling/oak/OakMockSlingRepository.java     | 51 +++++++++++-----------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java
index 91e984d..cefb70b 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java
@@ -18,13 +18,9 @@
  */
 package org.apache.sling.testing.mock.sling.oak;
 
-import java.util.concurrent.Executor;
-
-import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardExecutor;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
-import org.osgi.framework.BundleContext;
 
 /**
  * Resource resolver type adapter for Jackrabbit Oak repository.
@@ -32,15 +28,12 @@ import org.osgi.framework.BundleContext;
 public class OakMockResourceResolverAdapter implements ResourceResolverTypeAdapter {
 
     @Override
-    public ResourceResolverFactory newResourceResolverFactory(BundleContext bundleContext) {
+    public ResourceResolverFactory newResourceResolverFactory() {
         return null;
     }
 
     @Override
-    public SlingRepository newSlingRepository(BundleContext bundleContext) {
-        if (bundleContext.getServiceReference(Executor.class) == null) {
-            bundleContext.registerService(Executor.class, new WhiteboardExecutor(), null);
-        }
+    public SlingRepository newSlingRepository() {
         return new OakMockSlingRepository();
     }
 
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
index ff14d11..cd6133a 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
@@ -18,8 +18,10 @@
  */
 package org.apache.sling.testing.mock.sling.oak;
 
-import java.lang.reflect.Field;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 
 import javax.jcr.Credentials;
 import javax.jcr.LoginException;
@@ -38,9 +40,8 @@ import org.apache.jackrabbit.api.JackrabbitRepository;
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.jcr.Jcr;
 import org.apache.sling.jcr.api.SlingRepository;
+import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Component
 @Service(SlingRepository.class)
@@ -49,15 +50,28 @@ public final class OakMockSlingRepository implements SlingRepository {
     private static final String ADMIN_NAME = "admin";
     private static final String ADMIN_PASSWORD = "admin";
 
-    private Oak oak;
     private Repository repository;
-    
-    private static final Logger log = LoggerFactory.getLogger(OakMockSlingRepository.class);
+    private ExecutorService executor;
+    private ScheduledExecutorService scheduledExecutor;
     
     @Activate
-    protected void activate(ComponentContext componentContext) {
-        this.oak = new Oak();
-        Jcr jcr = new Jcr(oak).with(new ExtraSlingContent());
+    protected void activate(BundleContext bundleContext) {
+        executor = Executors.newSingleThreadExecutor();
+        scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+        
+        if (bundleContext.getServiceReference(Executor.class) == null) {
+            bundleContext.registerService(Executor.class, executor, null);
+        }
+        
+        Oak oak = new Oak()
+                .with(executor)
+                .with(scheduledExecutor);
+        
+        Jcr jcr = new Jcr(oak)
+                .with(new ExtraSlingContent())
+                .with(executor)
+                .with(scheduledExecutor);
+        
         this.repository = jcr.createRepository();
     }
 
@@ -66,24 +80,11 @@ public final class OakMockSlingRepository implements SlingRepository {
         // shutdown OAK JCR repository
         ((JackrabbitRepository)repository).shutdown();
         
-        // shutdown further OAK executor services via reflection
-        shutdownExecutorService("executor");
-        shutdownExecutorService("scheduledExecutor");
+        // shutdown executors
+        executor.shutdownNow();
+        scheduledExecutor.shutdownNow();
     }
     
-    private void shutdownExecutorService(String fieldName) {
-        try {
-            Field executorField = Oak.class.getDeclaredField(fieldName); 
-            executorField.setAccessible(true);
-            ExecutorService executor = (ExecutorService)executorField.get(this.oak);
-            executor.shutdownNow();
-        }
-        catch (Throwable ex) {
-            log.error("Potential Memory leak: Unable to shutdown executor service from field '" + fieldName + "' in " + this.oak, ex);
-        }
-    }
-
-
     public String getDescriptor(String key) {
         return repository.getDescriptor(key);
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-testing-sling-mock] 05/07: set sling-mock dependency to 2.0.0

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit f9d885402fab3588ad0e93d7d7e73bb823d3b509
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Jul 12 10:30:40 2016 +0000

    set sling-mock dependency to 2.0.0
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1752268 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a5e8d60..3481857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,14 +50,14 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.0.0</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-testing-sling-mock] 01/07: SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 0a3df5de0aaa433fed9707c8515a4b3e4f5269d8
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Feb 23 00:55:22 2016 +0000

    SLING-5547 Update sling-mock-oak to Sling API 2.11 and Oak 1.3.15
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1731771 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                       | 10 +++++-----
 .../mock/sling/oak/OakMockResourceResolverAdapter.java        | 11 +++++++++--
 .../sling/testing/mock/sling/oak/OakMockSlingRepository.java  |  6 ++++++
 .../org/apache/sling/testing/mock/sling/oak/package-info.java |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d4d022..8da88a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
     </parent>
 
     <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
   
     <name>Apache Sling Testing Sling Mock Oak-based Resource Resolver</name>
     <description>Implements a resource resolver type for Jackrabbit Oak that can be used in unit tests based on Sling Mocks.</description>
   
     <properties>
-        <oak.version>1.2.2</oak.version>
-        <jackrabbit.version>2.10.1</jackrabbit.version>
+        <oak.version>1.3.15</oak.version>
+        <jackrabbit.version>2.11.3</jackrabbit.version>
     </properties>
 
     <scm>
@@ -50,14 +50,14 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.2</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.2</version>
+            <version>2.0.0-SNAPSHOT</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java
index cefb70b..91e984d 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockResourceResolverAdapter.java
@@ -18,9 +18,13 @@
  */
 package org.apache.sling.testing.mock.sling.oak;
 
+import java.util.concurrent.Executor;
+
+import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardExecutor;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
+import org.osgi.framework.BundleContext;
 
 /**
  * Resource resolver type adapter for Jackrabbit Oak repository.
@@ -28,12 +32,15 @@ import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
 public class OakMockResourceResolverAdapter implements ResourceResolverTypeAdapter {
 
     @Override
-    public ResourceResolverFactory newResourceResolverFactory() {
+    public ResourceResolverFactory newResourceResolverFactory(BundleContext bundleContext) {
         return null;
     }
 
     @Override
-    public SlingRepository newSlingRepository() {
+    public SlingRepository newSlingRepository(BundleContext bundleContext) {
+        if (bundleContext.getServiceReference(Executor.class) == null) {
+            bundleContext.registerService(Executor.class, new WhiteboardExecutor(), null);
+        }
         return new OakMockSlingRepository();
     }
 
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
index 1bee5d8..ff14d11 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/OakMockSlingRepository.java
@@ -143,4 +143,10 @@ public final class OakMockSlingRepository implements SlingRepository {
         return repository.isStandardDescriptor(key);
     }
 
+    @Override
+    public Session impersonateFromService(String subServiceName, Credentials credentials, String workspaceName)
+            throws LoginException, RepositoryException {
+        return repository.login(credentials, (workspaceName == null ? getDefaultWorkspace() : workspaceName));
+    }
+
 }
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/package-info.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/package-info.java
index b4e676f..c9adfb7 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/package-info.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Sling Mock Jackrabbit Oak-based Resource Resolver
  */
-@aQute.bnd.annotation.Version("1.0")
+@aQute.bnd.annotation.Version("2.0")
 package org.apache.sling.testing.mock.sling.oak;

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-testing-sling-mock] 07/07: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-2.0.0

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit db4501bb928e212f1bd2795eb3a4732aa2be69f9
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Jul 12 10:31:26 2016 +0000

    [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-2.0.0
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-2.0.0@1752270 13f79535-47bb-0310-9956-ffa450edef68

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-testing-sling-mock] 06/07: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-2.0.0

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit febad13835c9fbfd51e4285a8b3aee93fb8503d4
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Jul 12 10:31:14 2016 +0000

    [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-2.0.0
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1752269 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3481857..6af396d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <packaging>bundle</packaging>
   
     <name>Apache Sling Testing Sling Mock Oak-based Resource Resolver</name>
@@ -40,9 +40,9 @@
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-2.0.0</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-2.0.0</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-oak-2.0.0</url>
     </scm>
 
     <dependencies>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-testing-sling-mock] 04/07: SLING-5835 sling-mock-oak: Update to Oak 1.4.1 and Jackrabbit API 2.12.1

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-oak-2.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit f9203cd4d6d782f0f9528dfad0d87375dfbc41f7
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Jul 12 10:05:52 2016 +0000

    SLING-5835 sling-mock-oak: Update to Oak 1.4.1 and Jackrabbit API 2.12.1
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1752260 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8da88a2..a5e8d60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,8 +35,8 @@
     <description>Implements a resource resolver type for Jackrabbit Oak that can be used in unit tests based on Sling Mocks.</description>
   
     <properties>
-        <oak.version>1.3.15</oak.version>
-        <jackrabbit.version>2.11.3</jackrabbit.version>
+        <oak.version>1.4.1</oak.version>
+        <jackrabbit.version>2.12.1</jackrabbit.version>
     </properties>
 
     <scm>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.