You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2020/04/15 07:07:24 UTC

[sling-org-apache-sling-testing-sling-mock-oak] branch master updated (64bd254 -> 08c5ac3)

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

sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git.


    from 64bd254  update to sling parent 36
     new 0ba06bd  cosmetic: use non-deprecated constant
     new 08c5ac3  update to parent 38 and latest sling-mock version

The 2 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.


Summary of changes:
 pom.xml                                                               | 4 ++--
 .../org/apache/sling/testing/mock/sling/oak/ExtraSlingContent.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


[sling-org-apache-sling-testing-sling-mock-oak] 02/02: update to parent 38 and latest sling-mock version

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git

commit 08c5ac3f190383dccf09a568ac40088cbe484de7
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Wed Apr 15 09:07:07 2020 +0200

    update to parent 38 and latest sling-mock version
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 104b3a9..a83c3b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>36</version>
+        <version>38</version>
         <relativePath />
     </parent>
 
@@ -37,7 +37,7 @@
     <properties>
         <oak.version>1.16.0</oak.version>
         <jackrabbit.version>2.18.2</jackrabbit.version>
-        <sling-mock.version>2.3.14</sling-mock.version>
+        <sling-mock.version>2.4.1-SNAPSHOT</sling-mock.version>
     </properties>
 
     <scm>


[sling-org-apache-sling-testing-sling-mock-oak] 01/02: cosmetic: use non-deprecated constant

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git

commit 0ba06bde8eb2bdf6d4fa845606fa12fb9169ba6e
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Wed Apr 15 09:06:52 2020 +0200

    cosmetic: use non-deprecated constant
---
 .../org/apache/sling/testing/mock/sling/oak/ExtraSlingContent.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/sling/oak/ExtraSlingContent.java b/src/main/java/org/apache/sling/testing/mock/sling/oak/ExtraSlingContent.java
index 3df0254..72f0132 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/oak/ExtraSlingContent.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/oak/ExtraSlingContent.java
@@ -23,7 +23,7 @@ import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
 import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
 import static org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants.REP_NAMESPACES;
-import static org.apache.sling.jcr.resource.JcrResourceConstants.SLING_NAMESPACE_URI;
+import static org.apache.sling.api.SlingConstants.NAMESPACE_URI_ROOT;
 
 import org.apache.jackrabbit.oak.plugins.name.Namespaces;
 import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
@@ -45,7 +45,7 @@ final class ExtraSlingContent implements RepositoryInitializer {
             NodeBuilder jcrSystem = root.getChildNode(JCR_SYSTEM);
             if (jcrSystem.hasChildNode(REP_NAMESPACES)) {
                 NodeBuilder namespaces = jcrSystem.getChildNode(REP_NAMESPACES);
-                slingNs = Namespaces.addCustomMapping(namespaces, SLING_NAMESPACE_URI, slingNs);
+                slingNs = Namespaces.addCustomMapping(namespaces, NAMESPACE_URI_ROOT, slingNs);
                 Namespaces.buildIndexNode(namespaces);
             }
         }