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:00 UTC

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

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git.


      at d91f42c  (tag)
 tagging 7a3f7733741174f98e91cf108331b51dc565233b (commit)
      by Stefan Seifert
      on Mon Mar 27 15:26:17 2017 +0000

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

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 726dba8  1.x maintenance branch
     new 1a816ec  update branch url
     new 920521d  update to latest sling-mock version
     new 4b1d9b8  update to latest sling-mock version
     new 2fcf675  switch back to released versions
     new 7ca8697  update unit tests to test BigDecimal conversion (related to SLING-6416)
     new e9eedb0  SLING-6714 sling-mock-oak 1.x: Register ExecutorService separately
     new d67e88a  update dependency
     new 4703a00  [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-1.0.2
     new 7a3f773  [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-1.0.2

The 42 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] 08/16: update branch url

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 1a816eca6f419dabf34f45c87d447cf4f52169de
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Feb 23 00:59:12 2016 +0000

    update branch url
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1731773 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d4d022..929a094 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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/branches/testing/mocks/sling-mock-oak-1.x</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x</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] 09/16: update to latest sling-mock version

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 920521da670d45d97d35532b318f381616b86215
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Sep 15 14:05:50 2016 +0000

    update to latest sling-mock version
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1760935 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 929a094..5a41d22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,16 +48,27 @@
     <dependencies>
 
         <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.2</version>
+            <version>1.8.1-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>1.8.1-SNAPSHOT</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] 12/16: update unit tests to test BigDecimal conversion (related to SLING-6416)

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 7ca86973db33284fbaa97d253c95d9ca24eb0a25
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Dec 19 11:52:49 2016 +0000

    update unit tests to test BigDecimal conversion (related to SLING-6416)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1775067 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0e13f5..20c8e9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
     <properties>
         <oak.version>1.2.2</oak.version>
         <jackrabbit.version>2.10.1</jackrabbit.version>
+        <sling-mock.version>1.9.5-SNAPSHOT</sling-mock.version>
     </properties>
 
     <scm>
@@ -50,14 +51,14 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.8.0</version>
+            <version>${sling-mock.version}</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.8.0</version>
+            <version>${sling-mock.version}</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] 15/16: [maven-release-plugin] prepare release org.apache.sling.testing.sling-mock-oak-1.0.2

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 4703a0094cbea0743f2ffdb3578b214cdd4a370c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 27 15:26:03 2017 +0000

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

diff --git a/pom.xml b/pom.xml
index 21126f7..5439523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</version>
     <packaging>bundle</packaging>
   
     <name>Apache Sling Testing Sling Mock Oak-based Resource Resolver</name>
@@ -41,9 +41,9 @@
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-oak-1.x</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2</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] 13/16: SLING-6714 sling-mock-oak 1.x: Register ExecutorService separately

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit e9eedb0a26897cb5c222ba9789eafd0efe3319ca
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 27 07:33:50 2017 +0000

    SLING-6714 sling-mock-oak 1.x: Register ExecutorService separately
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1788836 13f79535-47bb-0310-9956-ffa450edef68
---
 .../mock/sling/oak/OakMockSlingRepository.java     | 45 ++++++++++++++++------
 1 file changed, 33 insertions(+), 12 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 1bee5d8..f786e6c 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
@@ -19,7 +19,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,6 +41,7 @@ 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;
@@ -49,41 +53,58 @@ 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 ExecutorService executor;
+    private ScheduledExecutorService scheduledExecutor;
     
     private static final Logger log = LoggerFactory.getLogger(OakMockSlingRepository.class);
     
     @Activate
     protected void activate(ComponentContext componentContext) {
-        this.oak = new Oak();
-        Jcr jcr = new Jcr(oak).with(new ExtraSlingContent());
+        executor = Executors.newSingleThreadExecutor();
+        scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
+        
+        BundleContext bundleContext = componentContext.getBundleContext();
+        if (bundleContext.getServiceReference(Executor.class.getName()) == null) {
+            bundleContext.registerService(Executor.class.getName(), 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();
     }
 
     @Deactivate
     protected void deactivate(ComponentContext componentContext) {
+        // 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();
-        
-        // shutdown further OAK executor services via reflection
-        shutdownExecutorService("executor");
-        shutdownExecutorService("scheduledExecutor");
     }
     
-    private void shutdownExecutorService(String fieldName) {
+    private void shutdownExecutorService(Object instance, String fieldName) {
         try {
-            Field executorField = Oak.class.getDeclaredField(fieldName); 
+            Field executorField = instance.getClass().getDeclaredField(fieldName); 
             executorField.setAccessible(true);
-            ExecutorService executor = (ExecutorService)executorField.get(this.oak);
+            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 " + this.oak, ex);
+            log.error("Potential Memory leak: Unable to shutdown executor service from field '" + fieldName + "' in " + instance, 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] 10/16: update to latest sling-mock version

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 4b1d9b8bc4973877e5c685ec708f7880ba829903
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Sep 15 14:36:45 2016 +0000

    update to latest sling-mock version
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1760941 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a41d22..a5ef7c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,17 +48,6 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
             <version>1.8.1-SNAPSHOT</version>

-- 
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/16: set dependencies to next snapshot version until released versions are available in maven central

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit a402639766ea5e76e7b6dc19f0388f6c461b8e81
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Oct 5 17:43:19 2015 +0000

    set dependencies to next snapshot version until released versions are available in maven central
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1706890 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec50d3a..16debb5 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>1.6.0</version>
+            <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.1-SNAPSHOT</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] 11/16: switch back to released versions

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 2fcf6750136df1dcf8ededcede4f8ff4d657ba64
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Sep 19 09:26:36 2016 +0000

    switch back to released versions
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1761405 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a5ef7c5..d0e13f5 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>1.8.1-SNAPSHOT</version>
+            <version>1.8.0</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.8.1-SNAPSHOT</version>
+            <version>1.8.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] 16/16: [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-1.0.2

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 7a3f7733741174f98e91cf108331b51dc565233b
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 27 15:26:17 2017 +0000

    [maven-release-plugin] copy for tag org.apache.sling.testing.sling-mock-oak-1.0.2
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.2@1788954 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] 04/16: Include the sources of shaded packages in sources jar, useful for debugging

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 832e5e82dff42ef64cd2a865ba8ad129f7527d02
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Dec 21 16:59:21 2015 +0000

    Include the sources of shaded packages in sources jar, useful for debugging
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1721214 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index ec50d3a..34a9c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,7 @@
                         <include>org.apache.jackrabbit:*</include>
                     </includes>
                 </artifactSet>
+                <createSourcesJar>true</createSourcesJar>
               </configuration>
               <executions>
                 <execution>

-- 
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] 14/16: update dependency

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit d67e88aabb093dbeb82708b2048436b8cd9be869
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Mar 27 15:25:22 2017 +0000

    update dependency
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1788952 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 20c8e9c..21126f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     <properties>
         <oak.version>1.2.2</oak.version>
         <jackrabbit.version>2.10.1</jackrabbit.version>
-        <sling-mock.version>1.9.5-SNAPSHOT</sling-mock.version>
+        <sling-mock.version>1.9.6</sling-mock.version>
     </properties>
 
     <scm>

-- 
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/16: Switch to parent pom 26

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit cb0e398e9912a9aa04f8aa6019b3c8b7513771a7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000

    Switch to parent pom 26
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock-oak@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34a9c3a..0b907ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>25</version>
+        <version>26</version>
         <relativePath />
     </parent>
 

-- 
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/16: [maven-release-plugin] prepare for next development iteration

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 831de8077456d5f2e643678605919c3f601c33e7
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Oct 5 17:37:23 2015 +0000

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

diff --git a/pom.xml b/pom.xml
index 93f00df..ec50d3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</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/tags/org.apache.sling.testing.sling-mock-oak-1.0.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.0</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.sling-mock-oak-1.0.0</url>
+        <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>
     </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] 06/16: update to released versions

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 9cdb050b267aa3c292ff2f9a35935278c655cd3b
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Mon Feb 8 23:13:03 2016 +0000

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

diff --git a/pom.xml b/pom.xml
index 0b907ec..5d4d022 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>1.6.0</version>
+            <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.2</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] 07/16: 1.x maintenance branch

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit 726dba824d9de634ea501d125db4901f6a81435c
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Feb 23 00:12:58 2016 +0000

    1.x maintenance branch
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/sling-mock-oak-1.x@1731763 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] 03/16: switch back to released versions of dependency

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-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit caa8a4870355ce1259e303d66029cdb8616b1315
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Oct 9 14:20:05 2015 +0000

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

diff --git a/pom.xml b/pom.xml
index 16debb5..ec50d3a 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>1.6.1-SNAPSHOT</version>
+            <version>1.6.0</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.1-SNAPSHOT</version>
+            <version>1.6.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>.