Jenkins build is still unstable: sling-karaf-org.apache.sling.karaf-launchpad-oak-tar-integration-tests-1.8 #38

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-karaf-org.apache.sling.karaf-integration-tests-1.8 #48

[Apache Jenkins Server]

See 

svn propchange: r1801539 - svn:log

[olli]

Author: olli
Revision: 1801539
Modified property: svn:log

Modified: svn:log at Mon Jul 10 21:34:33 2017
--
--- svn:log (original)
+++ svn:log Mon Jul 10 21:34:33 2017
@@ -0,0 +1 @@
+fix configurations

svn commit: r1801539 - /sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/

[olli]

Author: olli
Date: Mon Jul 10 21:28:40 2017
New Revision: 1801539

URL: http://svn.apache.org/viewvc?rev=1801539&view=rev
Log: (empty)

Modified:

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config

sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config?rev=1801539&r1=1801538&r2=1801539&view=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config
 Mon Jul 10 21:28:40 2017
@@ -1,3 +1,3 @@
 user.mapping=[\
-  "org.apache.sling.installer.provider.jcr\=sling-jcr-install"
+  "org.apache.sling.installer.provider.jcr\=sling-jcr-install"\
 ]

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config?rev=1801539&r1=1801538&r2=1801539&view=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config
 Mon Jul 10 21:28:40 2017
@@ -1,3 +1,3 @@
 user.mapping=[\
-  "org.apache.sling.jcr.resource:observation\=sling-readall"
+  "org.apache.sling.jcr.resource:observation\=sling-readall"\
 ]

Jenkins build is still unstable: sling-karaf-org.apache.sling.karaf-integration-tests-1.8 #47

[Apache Jenkins Server]

See 

svn commit: r1801529 - /sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml

[olli]

Author: olli
Date: Mon Jul 10 20:24:44 2017
New Revision: 1801529

URL: http://svn.apache.org/viewvc?rev=1801529&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf

update dependencies and plugins

Modified:

sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1801529&r1=1801528&r2=1801529&view=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
 Mon Jul 10 20:24:44 2017
@@ -141,49 +141,49 @@
 
   org.apache.sling
   org.apache.sling.junit.core
-  1.0.20
+  1.0.26
   test
 
 
   org.apache.sling
   org.apache.sling.junit.remote
-  1.0.10
+  1.0.12
   test
 
 
   org.apache.sling
   org.apache.sling.junit.scriptable
-  1.0.10
+  1.0.12
   test
 
 
   org.apache.sling
   org.apache.sling.launchpad.test-services
-  2.0.11-SNAPSHOT
+  2.0.12
   test
 
 
   org.apache.sling
   org.apache.sling.launchpad.test-fragment
-  2.0.11-SNAPSHOT
+  2.0.12
   test
 
 
   org.apache.sling
   org.apache.sling.testing.tools
-  1.0.14
+  1.0.16
   test
 
 
   org.apache.httpcomponents
   httpcore-osgi
-  4.4.5
+  4.4.6
   test
 
 
   org.apache.httpcomponents
   httpclient-osgi
-  4.5.2
+  4.5.3
   test
 
   
@@ -199,7 +199,7 @@
 
   org.codehaus.mojo
   build-helper-maven-plugin
-  1.11
+  3.0.0
 
 
   org.apache.servicemix.tooling

svn commit: r1801528 - in /sling/trunk/karaf/org.apache.sling.karaf-integration-tests: pom.xml src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java

[olli]

Author: olli
Date: Mon Jul 10 20:14:43 2017
New Revision: 1801528

URL: http://svn.apache.org/viewvc?rev=1801528&view=rev
Log:
SLING-3017 Improve Karaf integration tests

* use latest releases
* enable Couchbase IT
* exclude Launchpad Oak ITs until timing issues are fixed

Modified:
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml

sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java

Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml?rev=1801528&r1=1801527&r2=1801528&view=diff
==
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml 
(original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml Mon Jul 
10 20:14:43 2017
@@ -92,7 +92,7 @@
 
   org.apache.sling
   org.apache.sling.engine
-  2.6.6
+  2.6.8
   test
 
 
@@ -196,18 +196,16 @@
   test
 
 
-
 
   com.couchbase.client
   couchbase-client
-  1.4.12
+  1.4.13
   test
 
 
@@ -284,6 +282,9 @@
 
 
   true
+  
+**/SlingLaunchpadOak*IT.*
+  
 
   
 

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java?rev=1801528&r1=1801527&r2=1801528&view=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingLaunchpadNosqlCouchbaseIT.java
 Mon Jul 10 20:14:43 2017
@@ -22,11 +22,10 @@ import java.io.IOException;
 
 import javax.inject.Inject;
 
+import com.couchbase.mock.CouchbaseMock;
 import org.apache.sling.api.resource.ResourceProviderFactory;
 import org.apache.sling.karaf.testing.KarafTestSupport;
-// import org.couchbase.mock.CouchbaseMock;
 import org.junit.AfterClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -47,27 +46,23 @@ import static org.ops4j.pax.exam.karaf.o
 @ExamReactorStrategy(PerClass.class)
 public class SlingLaunchpadNosqlCouchbaseIT extends KarafTestSupport {
 
-// private static CouchbaseMock couchbase;
+private static CouchbaseMock couchbase;
 
 @Inject
 @Filter(timeout = 30)
 public ResourceProviderFactory resourceProviderFactory;
 
 protected void startCouchbase(final int port) throws IOException, 
InterruptedException {
-/*
 couchbase = new CouchbaseMock("localhost", port, 10, 1024);
 couchbase.start();
 couchbase.waitForStartup();
-*/
 }
 
 @AfterClass // TODO does it work? (no - not supported by Pax Exam)
 public static void stopCouchbase() throws Exception {
-/*
 if (couchbase != null) {
 couchbase.stop();
 }
-*/
 }
 
 @Configuration
@@ -81,7 +76,7 @@ public class SlingLaunchpadNosqlCouchbas
 
editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config",
 "clientId", "sling-resourceprovider-couchbase"),
 
editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config",
 "bucketName", "sling"),
 
editConfigurationFilePut("etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config.config",
 "enabled", "true"),
-// 
wrappedBundle(mavenBundle().groupId("org.couchbase.mock").artifactId("CouchbaseMock").versionAsInProject()),
+
wrappedBundle(mavenBundle().groupId("com.couchbase.mock").artifactId("CouchbaseMock").versionAsInProject()),
 
wrappedBundle(mavenBundle().groupId("com.couchbase.client").artifactId("couchbase-client").versionAsInProject()),
 
wrappedBundle(mavenBundle().groupId("com.intellij").artifactId("annotations").versionAsInProject()),
 
mavenBundle().groupId("com.google.code.gson").artifactId("gson").versionAsInProject(),
@@ -93,7 +88,6 @@ public class SlingLaunchpadNosqlCouchbas
 }
 
 @Test
-@Ignore
 public void testResourceProviderFactory() {
 assertNotNull(resourceProviderFactory);
 
assertEquals("org.apache.sling.nosql.couchbase.resourceprovider.imp

svn commit: r1801526 - in /sling/trunk/karaf/org.apache.sling.karaf-features: pom.xml src/main/feature/feature.xml

[olli]

Author: olli
Date: Mon Jul 10 20:09:03 2017
New Revision: 1801526

URL: http://svn.apache.org/viewvc?rev=1801526&view=rev
Log:
SLING-3027 Improve Launchpad Karaf Features

use latest releases

Modified:
sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml

sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml

Modified: sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml?rev=1801526&r1=1801525&r2=1801526&view=diff
==
--- sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml Mon Jul 10 
20:09:03 2017
@@ -37,8 +37,8 @@
 
   
 4.1.1
-2.14.0
-
1.6.1
+2.14.1
+
1.6.2
 1.14
 
0.2.0
   

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1801526&r1=1801525&r2=1801526&view=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml 
(original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml 
Mon Jul 10 20:09:03 2017
@@ -22,9 +22,9 @@
   
 mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver
 mvn:org.apache.sling/org.apache.sling.api/2.16.2
-mvn:org.apache.sling/org.apache.sling.auth.core/1.3.26
+mvn:org.apache.sling/org.apache.sling.auth.core/1.4.0
 mvn:org.apache.sling/org.apache.sling.engine/2.6.8
-
mvn:org.apache.sling/org.apache.sling.resourceresolver/1.5.24
+
mvn:org.apache.sling/org.apache.sling.resourceresolver/1.5.26
 
mvn:org.apache.sling/org.apache.sling.serviceusermapper/1.3.2
 mvn:org.apache.sling/org.apache.sling.settings/1.3.8
 
@@ -43,11 +43,11 @@
 sling-commons-threads
 mvn:commons-codec/commons-codec/1.10
 mvn:commons-collections/commons-collections/3.2.2
-mvn:commons-fileupload/commons-fileupload/1.3.2
+mvn:commons-fileupload/commons-fileupload/1.3.3
 mvn:commons-io/commons-io/2.5
 mvn:commons-lang/commons-lang/2.6
 mvn:org.apache.commons/commons-collections4/4.1
-mvn:org.apache.commons/commons-lang3/3.5
+mvn:org.apache.commons/commons-lang3/3.6
 mvn:org.apache.commons/commons-math/2.2
   
   
@@ -85,7 +85,7 @@
 sling-commons-classloader
 mvn:org.apache.sling/org.apache.sling.commons.osgi/2.4.0
 mvn:commons-io/commons-io/2.5
-mvn:org.apache.commons/commons-lang3/3.5
+mvn:org.apache.commons/commons-lang3/3.6
   
   
 mvn:org.apache.sling/org.apache.sling.commons.html/1.0.0
@@ -106,10 +106,10 @@
 mvn:org.apache.commons/commons-email/1.4
   
   
-
mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.0
+
mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.2
 
 scr
-mvn:io.dropwizard.metrics/metrics-core/3.2.2
+mvn:io.dropwizard.metrics/metrics-core/3.2.3
   
   
 
mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.6.2
@@ -135,7 +135,7 @@
   
   
 mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.4
-mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.0
+mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.4
 
mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20
 
mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0
 
@@ -152,7 +152,7 @@
   
   
 mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery
-mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.18
+mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.20
 
 webconsole
 sling-extension-discovery
@@ -165,7 +165,7 @@
   
   
 
mvn:org.apache.sling/org.apache.sling.distribution.api/0.3.0
-
mvn:org.apache.sling/org.apache.sling.distribution.core/0.2.6
+
mvn:org.apache.sling/org.apache.sling.distribution.core/0.2.8
 
 sling
 sling-jcr
@@ -173,13 +173,11 @@
 sling-extension-healthcheck
 mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6
 mvn:org.apache.httpcomponents/httpclient-osgi/4.5.3
-mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.38
-
-mvn:org.apache.sling/org.apache.sling.commons.json/2.0.20
+mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.40
   
   
 mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event
-mvn:org.apache.sling/org.apache.sling.event/4.2.2
+mvn:org.apache.sling/org.apache.slin

svn commit: r1801522 - /sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml

[olli]

Author: olli
Date: Mon Jul 10 19:54:09 2017
New Revision: 1801522

URL: http://svn.apache.org/viewvc?rev=1801522&view=rev
Log:
SLING-7003 Update Pax Exam to 4.11

Modified:
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml?rev=1801522&r1=1801521&r2=1801522&view=diff
==
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml 
(original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/pom.xml 
Mon Jul 10 19:54:09 2017
@@ -41,7 +41,7 @@
 8
 3.0.3.RELEASE
 2.6.3
-4.10.0
+4.11.0
   
 
   

svn commit: r1801524 - /sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml

[olli]

Author: olli
Date: Mon Jul 10 19:54:29 2017
New Revision: 1801524

URL: http://svn.apache.org/viewvc?rev=1801524&view=rev
Log:
SLING-7003 Update Pax Exam to 4.11

Modified:

sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1801524&r1=1801523&r2=1801524&view=diff
==
--- 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
 Mon Jul 10 19:54:29 2017
@@ -37,7 +37,7 @@
 
   
 4.1.1
-4.10.0
+4.11.0
 
${project.basedir}/src/test/resources/repoinit.txt
   
 

svn commit: r1801521 - /sling/trunk/contrib/scripting/freemarker/pom.xml

[olli]

Author: olli
Date: Mon Jul 10 19:53:57 2017
New Revision: 1801521

URL: http://svn.apache.org/viewvc?rev=1801521&view=rev
Log:
SLING-7003 Update Pax Exam to 4.11

Modified:
sling/trunk/contrib/scripting/freemarker/pom.xml

Modified: sling/trunk/contrib/scripting/freemarker/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/freemarker/pom.xml?rev=1801521&r1=1801520&r2=1801521&view=diff
==
--- sling/trunk/contrib/scripting/freemarker/pom.xml (original)
+++ sling/trunk/contrib/scripting/freemarker/pom.xml Mon Jul 10 19:53:57 2017
@@ -39,7 +39,7 @@
 UTF-8
 UTF-8
 8
-4.10.0
+4.11.0
   
 
   

svn commit: r1801523 - /sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml

[olli]

Author: olli
Date: Mon Jul 10 19:54:19 2017
New Revision: 1801523

URL: http://svn.apache.org/viewvc?rev=1801523&view=rev
Log:
SLING-7003 Update Pax Exam to 4.11

Modified:
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml

Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml?rev=1801523&r1=1801522&r2=1801523&view=diff
==
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml 
(original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml Mon Jul 
10 19:54:19 2017
@@ -38,7 +38,7 @@
   
 2.14.0
 4.1.1
-4.10.0
+4.11.0
   
 
   

svn commit: r1801520 - /sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml

[olli]

Author: olli
Date: Mon Jul 10 19:53:45 2017
New Revision: 1801520

URL: http://svn.apache.org/viewvc?rev=1801520&view=rev
Log:
SLING-7003 Update Pax Exam to 4.11

Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml

Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml?rev=1801520&r1=1801519&r2=1801520&view=diff
==
--- sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/pom.xml Mon Jul 10 
19:53:45 2017
@@ -39,7 +39,7 @@
 UTF-8
 UTF-8
 7
-4.10.0
+4.11.0
   
 
   

svn commit: r1801516 - /sling/tags/org.apache.sling.pipes-1.0.0/

[npeltier]

Author: npeltier
Date: Mon Jul 10 18:54:29 2017
New Revision: 1801516

URL: http://svn.apache.org/viewvc?rev=1801516&view=rev
Log:
cancelling the release

Removed:
sling/tags/org.apache.sling.pipes-1.0.0/

svn commit: r1801506 - in /sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes: PipeBuilder.java internal/PipeBuilderImpl.java

[npeltier]

Author: npeltier
Date: Mon Jul 10 17:39:14 2017
New Revision: 1801506

URL: http://svn.apache.org/viewvc?rev=1801506&view=rev
Log:
SLING-7002 fix PipeBuilder properties value

Modified:

sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PipeBuilder.java

sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java

Modified: 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PipeBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PipeBuilder.java?rev=1801506&r1=1801505&r2=1801506&view=diff
==
--- 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PipeBuilder.java
 (original)
+++ 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/PipeBuilder.java
 Mon Jul 10 17:39:14 2017
@@ -121,7 +121,7 @@ public interface PipeBuilder {
  * @return updated instance of PipeBuilder
  * @throws IllegalAccessException in case it's called in a bad time
  */
-PipeBuilder with(String param, String value) throws IllegalAccessException;
+PipeBuilder with(String param, Object value) throws IllegalAccessException;
 
 /**
  * set an expr configuration to the current pipe in the context

Modified: 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java?rev=1801506&r1=1801505&r2=1801506&view=diff
==
--- 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/PipeBuilderImpl.java
 Mon Jul 10 17:39:14 2017
@@ -138,7 +138,7 @@ public class PipeBuilderImpl implements
 }
 
 @Override
-public PipeBuilder with(String param, String value) throws 
IllegalAccessException {
+public PipeBuilder with(String param, Object value) throws 
IllegalAccessException {
 checkCurrentStep();
 currentStep.properties.put(param, value);
 return this;

Nexus: Staging Repository Dropped

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:cancellation of the releaseDeployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.5)""userId" = "npeltier""ip" = "192.150.10.207"Details:The orgapachesling-1752 staging repository has been dropped.Action performed by Nicolas Peltier (npeltier)

svn commit: r1801499 - /sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java

[justin]

Author: justin
Date: Mon Jul 10 17:03:43 2017
New Revision: 1801499

URL: http://svn.apache.org/viewvc?rev=1801499&view=rev
Log:
fix testing errors when running Sling Models ITs with I18n bundle installed

Modified:

sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java

Modified: 
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java?rev=1801499&r1=1801498&r2=1801499&view=diff
==
--- 
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/exporter/FakeRequest.java
 Mon Jul 10 17:03:43 2017
@@ -35,10 +35,13 @@ class FakeRequest implements HttpServlet
 
 private final String path;
 
+private final StringBuffer requestUrl;
+
 private final Map attributes = new HashMap();
 
 FakeRequest(String path) {
 this.path = path;
+this.requestUrl = new StringBuffer("http://notarealhost";).append(path);
 }
 
 @Override
@@ -128,7 +131,7 @@ class FakeRequest implements HttpServlet
 
 @Override
 public StringBuffer getRequestURL() {
-return null;
+return requestUrl;
 }
 
 @Override
@@ -273,7 +276,7 @@ class FakeRequest implements HttpServlet
 
 @Override
 public Enumeration getLocales() {
-return null;
+return Collections.emptyEnumeration();
 }
 
 @Override

svn commit: r1801498 - /sling/trunk/bundles/extensions/models/integration-tests/pom.xml

[justin]

Author: justin
Date: Mon Jul 10 17:03:38 2017
New Revision: 1801498

URL: http://svn.apache.org/viewvc?rev=1801498&view=rev
Log:
use release version of testing libraries

Modified:
sling/trunk/bundles/extensions/models/integration-tests/pom.xml

Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1801498&r1=1801497&r2=1801498&view=diff
==
--- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Mon Jul 10 
17:03:38 2017
@@ -292,7 +292,7 @@
 
 org.apache.sling
 org.apache.sling.junit.remote
-1.0.11-SNAPSHOT
+1.0.12
 provided
 
 
@@ -304,7 +304,7 @@
 
 org.apache.sling
 org.apache.sling.testing.tools
-1.0.17-SNAPSHOT
+1.0.16
 provided
 
 

svn commit: r1015215 - /websites/production/sling/content/

[kwin]

Author: kwin
Date: Mon Jul 10 16:09:05 2017
New Revision: 1015215

Log:
Publishing svnmucc operation to sling site by kwin

Added:
websites/production/sling/content/
  - copied from r1015214, websites/staging/sling/trunk/content/

svn commit: r1015214 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/service-authentication.html

[buildbot]

Author: buildbot
Date: Mon Jul 10 16:08:54 2017
New Revision: 1015214

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 10 16:08:54 2017
@@ -1 +1 @@
-1801488
+1801489

Modified: 
websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html
==
--- 
websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html
 Mon Jul 10 16:08:54 2017
@@ -263,7 +263,7 @@ service. The additional Subservice Name
 Configuration¶
 Service User Mappings¶
 For each service/subservice name combination an according mapping needs to 
be provided. The mapping binds a service name/subservice name to a JCR system 
user.
-This is configured through an OSGi configuration for the factory configuration 
with PID 
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended
 https://issues.apache.org/jira/browse/SLING-3578";>SLING-3578. 
There you can set one configuration property named user.mapping 
getting a String array as value where each entry must stick to the following 
format:
+This is configured through an OSGi configuration for the factory configuration 
with PID 
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended
 (added in https://issues.apache.org/jira/browse/SLING-3578";>SLING-3578). There 
you can set one configuration property named user.mapping getting 
a String array as value where each entry must stick to the following format:
 [:]=
 
 
@@ -388,7 +388,7 @@ It supports the following configuration
 
 
   
-Rev. 1801488 by kwin on Mon, 10 Jul 2017 16:07:24 +
+Rev. 1801489 by kwin on Mon, 10 Jul 2017 16:08:43 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1801489 - /sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext

[kwin]

Author: kwin
Date: Mon Jul 10 16:08:43 2017
New Revision: 1801489

URL: http://svn.apache.org/viewvc?rev=1801489&view=rev
Log:
fix typo

Modified:

sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext

Modified: 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext?rev=1801489&r1=1801488&r2=1801489&view=diff
==
--- 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
 Mon Jul 10 16:08:43 2017
@@ -156,7 +156,7 @@ service. The additional Subservice Name
 ### Service User Mappings
 
 For each service/subservice name combination an according mapping needs to be 
provided. The mapping binds a service name/subservice name to a JCR system user.
-This is configured through an OSGi configuration for the factory configuration 
with PID 
`org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended` 
[SLING-3578](https://issues.apache.org/jira/browse/SLING-3578). There you can 
set one configuration property named `user.mapping` getting a String array as 
value where each entry must stick to the following format:
+This is configured through an OSGi configuration for the factory configuration 
with PID 
`org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended` (added 
in [SLING-3578](https://issues.apache.org/jira/browse/SLING-3578)). There you 
can set one configuration property named `user.mapping` getting a String array 
as value where each entry must stick to the following format:
 
 [:]=
 

svn commit: r1015213 - in /websites/staging/sling/trunk/content: ./ documentation/the-sling-engine/service-authentication.html

[buildbot]

Author: buildbot
Date: Mon Jul 10 16:07:47 2017
New Revision: 1015213

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 10 16:07:47 2017
@@ -1 +1 @@
-1801436
+1801488

Modified: 
websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html
==
--- 
websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/the-sling-engine/service-authentication.html
 Mon Jul 10 16:07:47 2017
@@ -222,9 +222,11 @@ such that system administrators are in f
 The implementation uses two fallbacks in case no mapping can be found for 
the given subServiceName
 
 Use user mapping for the serviceName only (not considering 
subServiceName)
-Use default user (if one is configured).
+Use default user (if one is configured in the OSGi configuration for PID 
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl).
+Use default mapping (if it is enabled in the OSGi configuration for PID 
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl) 
which looks up a user with id 
serviceuser--[--] (since 
Service User Mapper 1.3.0, https://issues.apache.org/jira/browse/SLING-6772";>SLING-6227).
 
-In addition a service named ServiceUserMapped is registered 
for each bundle and subservice name for which a service user mapping is 
configured (https://issues.apache.org/jira/browse/SLING-4312";>SLING-4312). By 
explicitly defining a (static) reference towards ServiceUserMapped 
one can defer starting the service until that service user mapping is 
available.
+In addition a service named ServiceUserMapped is registered 
for each bundle and subservice name for which a service user mapping is 
explicitly configured (https://issues.apache.org/jira/browse/SLING-4312";>SLING-4312).  By 
explicitly defining a (static) reference towards ServiceUserMapped 
one can defer starting the service until that service user mapping is available.
+Please note, that the two last default mappings are not represented as a 
ServiceUserMapped service and therefore the above mentioned reference does not 
work.
 ResourceResolverFactory¶
 The second part is support for service access to the Resource Tree. To this
 avail, the ResourceResolverFactory service is enhanced with a new 
factory
@@ -262,11 +264,11 @@ service. The additional Subservice Name
 Service User Mappings¶
 For each service/subservice name combination an according mapping needs to 
be provided. The mapping binds a service name/subservice name to a JCR system 
user.
 This is configured through an OSGi configuration for the factory configuration 
with PID 
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended
 https://issues.apache.org/jira/browse/SLING-3578";>SLING-3578. 
There you can set one configuration property named user.mapping 
getting a String array as value where each entry must stick to the following 
format:
-[:]=]
+[:]=
 
 
 
-The according user must exist at the point in time where 
ResourceResolverFactory.getServiceResourceResolver(...) or 
SlingRepository.loginService(...) is called. If you rely on one of 
those methods in your activate method of an OSGi component you 
should make sure that you defer starting your OSGi component until the 
according service user mapping is in place. For that you can reference the OSGi 
service ServiceUserMapped (https://issues.apache.org/jira/browse/SLING-4312";>SLING-4312), 
optionally with a target filter on property subServiceName (in 
case such a subservice name is used). The service 
ServiceUserMapped does not expose any methods but is only a marker 
interface exclusively used to defer starting of other OSGi components. However 
this waits only for the mapping configuration to be available, it does not wait 
for the service user itself to be available.
+The according user must exist at the point in time where 
ResourceResolverFactory.getServiceResourceResolver(...) or 
SlingRepository.loginService(...) is called. If you rely on one of 
those methods in your activate method of an OSGi component you 
should make sure that you defer starting your OSGi component until the 
according service user mapping is in place. For that you can reference the OSGi 
service ServiceUserMapped (see Section 
ServiceUserMapper above), optionally with a target filter on 
property subServiceName (in case such a subservi

svn commit: r1801488 - /sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext

[kwin]

Author: kwin
Date: Mon Jul 10 16:07:24 2017
New Revision: 1801488

URL: http://svn.apache.org/viewvc?rev=1801488&view=rev
Log:
SLING-6772 clean up documentation and document the fallbacks only in one place

Modified:

sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext

Modified: 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext?rev=1801488&r1=1801487&r2=1801488&view=diff
==
--- 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/the-sling-engine/service-authentication.mdtext
 Mon Jul 10 16:07:24 2017
@@ -108,9 +108,11 @@ The `ServiceUserMapper` defines the foll
 The implementation uses two fallbacks in case no mapping can be found for the 
given subServiceName
 
 1. Use user mapping for the serviceName only (not considering subServiceName)
-1. Use default user (if one is configured).
+1. Use default user (if one is configured in the OSGi configuration for PID `  
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl`).
+1. Use default mapping (if it is enabled in the OSGi configuration for PID `   
org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl`) which looks up 
a user with id `serviceuser--[--]` (since Service 
User Mapper 1.3.0, 
[SLING-6227](https://issues.apache.org/jira/browse/SLING-6772)).
 
-In addition a service named `ServiceUserMapped` is registered for each bundle 
and subservice name for which a service user mapping is configured 
([SLING-4312](https://issues.apache.org/jira/browse/SLING-4312)). By explicitly 
defining a (static) reference towards `ServiceUserMapped` one can defer 
starting the service until that service user mapping is available.
+In addition a service named `ServiceUserMapped` is registered for each bundle 
and subservice name for which a service user mapping is explicitly configured 
([SLING-4312](https://issues.apache.org/jira/browse/SLING-4312)).  By 
explicitly defining a (static) reference towards `ServiceUserMapped` one can 
defer starting the service until that service user mapping is available.
+Please note, that the two last default mappings are not represented as a 
ServiceUserMapped service and therefore the above mentioned reference does not 
work.
 
 ### `ResourceResolverFactory`
 
@@ -156,9 +158,9 @@ service. The additional Subservice Name
 For each service/subservice name combination an according mapping needs to be 
provided. The mapping binds a service name/subservice name to a JCR system user.
 This is configured through an OSGi configuration for the factory configuration 
with PID 
`org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended` 
[SLING-3578](https://issues.apache.org/jira/browse/SLING-3578). There you can 
set one configuration property named `user.mapping` getting a String array as 
value where each entry must stick to the following format:
 
-[:]=]
+[:]=
 
-The according user must exist at the point in time where 
`ResourceResolverFactory.getServiceResourceResolver(...)` or 
`SlingRepository.loginService(...)` is called. If you rely on one of those 
methods in your `activate` method of an OSGi component you should make sure 
that you defer starting your OSGi component until the according service user 
mapping is in place. For that you can reference the OSGi service 
`ServiceUserMapped` 
([SLING-4312](https://issues.apache.org/jira/browse/SLING-4312)), optionally 
with a target filter on property `subServiceName` (in case such a subservice 
name is used). The service `ServiceUserMapped` does not expose any methods but 
is only a marker interface exclusively used to defer starting of other OSGi 
components. However this waits only for the mapping configuration to be 
available, it does not wait for the service user itself to be available.
+The according user must exist at the point in time where 
`ResourceResolverFactory.getServiceResourceResolver(...)` or 
`SlingRepository.loginService(...)` is called. If you rely on one of those 
methods in your `activate` method of an OSGi component you should make sure 
that you defer starting your OSGi component until the according service user 
mapping is in place. For that you can reference the OSGi service 
`ServiceUserMapped` (see Section `ServiceUserMapper` above), optionally with a 
target filter on property `subServiceName` (in case such a subservice name is 
used). The service `ServiceUserMapped` does not expose any methods but is only 
a marker interface exclusively used to defer starting of other OSGi components. 
However this waits only for the mapping configuration to be available, it does 
not wait for the service user itself to be available.
 
 Example OSGi DS Component
 
@@ -174,8 +176,6 @

svn commit: r1801485 - in /sling/trunk/bundles/resourceresolver: pom.xml src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java src/main/java/org/apache/sling/reso

[pauls]

Author: pauls
Date: Mon Jul 10 15:49:58 2017
New Revision: 1801485

URL: http://svn.apache.org/viewvc?rev=1801485&view=rev
Log:
SLING-6981: Adjust ResourceResolverFactoryImpl and 
CommonsResourceResolverFactoryImpl to reflect SLING-6963 - Patch provided by 
Angela Schreiber.

Modified:
sling/trunk/bundles/resourceresolver/pom.xml

sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java

sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java

Modified: sling/trunk/bundles/resourceresolver/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/pom.xml?rev=1801485&r1=1801484&r2=1801485&view=diff
==
--- sling/trunk/bundles/resourceresolver/pom.xml (original)
+++ sling/trunk/bundles/resourceresolver/pom.xml Mon Jul 10 15:49:58 2017
@@ -114,7 +114,7 @@
 
 org.apache.sling
 org.apache.sling.serviceusermapper
-1.0.0
+1.3.3-SNAPSHOT
 
 
 org.slf4j

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1801485&r1=1801484&r2=1801485&view=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
 Mon Jul 10 15:49:58 2017
@@ -46,6 +46,7 @@ import org.apache.sling.resourceresolver
 import org.apache.sling.resourceresolver.impl.mapping.MapEntriesHandler;
 import org.apache.sling.resourceresolver.impl.mapping.Mapping;
 import 
org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker;
+import org.apache.sling.serviceusermapping.ServiceUserMapper;
 import org.apache.sling.spi.resource.provider.ResourceProvider;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -471,23 +472,29 @@ public class CommonResourceResolverFacto
 public Map getServiceUserAuthenticationInfo(final String 
subServiceName)
 throws LoginException {
 // get an administrative resource resolver
-// Ensure a mapped user name: If no user is defined for a bundle
+// Ensure a mapped user name or principal names: If no user/principal 
name(s)
+// is/are defined for a bundle
 // acting as a service, the user may be null. We can decide whether
 // this should yield guest access or no access at all. For now
 // no access is granted if there is no service user defined for
 // the bundle.
final Bundle bundle = this.activator.getBundleContext().getBundle();
-final String userName = 
this.activator.getServiceUserMapper().getServiceUserID(bundle, subServiceName);
-if (userName == null) {
-throw new LoginException("Cannot derive user name for bundle "
-+ bundle + " and sub service " + subServiceName);
+
+ServiceUserMapper mapper = this.activator.getServiceUserMapper();
+final Iterable principalNames = 
mapper.getServicePrincipalNames(bundle, subServiceName);
+final String userName = (principalNames == null) ? 
mapper.getServiceUserID(bundle, subServiceName) : null;
+if (principalNames == null && userName == null) {
+throw new LoginException("Cannot derive user name or principal 
names for bundle "
++ bundle + " and sub service " + subServiceName);
 }
 
 final Map authenticationInfo = new HashMap<>();
 // ensure proper user name and service bundle
 authenticationInfo.put(ResourceResolverFactory.SUBSERVICE, 
subServiceName);
-authenticationInfo.put(ResourceResolverFactory.USER, userName);
 authenticationInfo.put(ResourceProvider.AUTH_SERVICE_BUNDLE, bundle);
+if (userName != null) {
+authenticationInfo.put(ResourceResolverFactory.USER, userName);
+}
 
 return authenticationInfo;
 }

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java?rev=1801485&r1=1801484&r2=1801485&view=diff
==
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resource

svn commit: r1801484 - in /sling/trunk/bundles/jcr/resource: pom.xml src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java src/test/java/org/apache/sling/jcr/resource/intern

[pauls]

Author: pauls
Date: Mon Jul 10 15:48:49 2017
New Revision: 1801484

URL: http://svn.apache.org/viewvc?rev=1801484&view=rev
Log:
SLING-6974: Adjust JcrSystemUserValidator to reflect SLING-6963 - patch 
provided by Angela Schreiber.

Modified:
sling/trunk/bundles/jcr/resource/pom.xml

sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java

sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidatorTest.java

Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1801484&r1=1801483&r2=1801484&view=diff
==
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Mon Jul 10 15:48:49 2017
@@ -217,7 +217,7 @@
 
 org.apache.sling
 org.apache.sling.serviceusermapper
-1.1.0
+1.3.3-SNAPSHOT
 provided
 
 

Modified: 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java?rev=1801484&r1=1801483&r2=1801484&view=diff
==
--- 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrSystemUserValidator.java
 Mon Jul 10 15:48:49 2017
@@ -17,6 +17,8 @@
 package org.apache.sling.jcr.resource.internal;
 
 import java.lang.reflect.Method;
+import java.security.Principal;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -28,6 +30,7 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.serviceusermapping.ServicePrincipalsValidator;
 import org.apache.sling.serviceusermapping.ServiceUserValidator;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
@@ -41,18 +44,19 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of the {@link 
org.apache.sling.serviceusermapping.ServiceUserValidator}
- * interface that verifies that all registered service users are represented by
+ * and {@link org.apache.sling.serviceusermapping.ServicePrincipalsValidator}
+ * interfaces that verifies that all registered service users/principals are 
represented by
  * {@link org.apache.jackrabbit.api.security.user.User#isSystemUser() system 
users}
  * in the underlying JCR repository.
  *
  * @see org.apache.jackrabbit.api.security.user.User#isSystemUser()
  */
 @Designate(ocd = JcrSystemUserValidator.Config.class)
-@Component(service = ServiceUserValidator.class,
+@Component(service = {ServiceUserValidator.class, 
ServicePrincipalsValidator.class},
property = {
Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
})
-public class JcrSystemUserValidator implements ServiceUserValidator {
+public class JcrSystemUserValidator implements ServiceUserValidator, 
ServicePrincipalsValidator {
 
 @ObjectClassDefinition(
 name = "Apache Sling JCR System User Validator",
@@ -74,6 +78,7 @@ public class JcrSystemUserValidator impl
 private final Method isSystemUserMethod;
 
 private final Set validIds = new CopyOnWriteArraySet();
+private final Set validPrincipalNames = new 
CopyOnWriteArraySet();
 
 private boolean allowOnlySystemUsers;
 
@@ -142,6 +147,68 @@ public class JcrSystemUserValidator impl
 }
 }
 
+@Override
+public boolean isValid(Iterable servicePrincipalNames, String 
serviceName, String subServiceName) {
+if (servicePrincipalNames == null) {
+log.debug("The provided service principal names are null");
+return false;
+}
+if (!allowOnlySystemUsers) {
+log.debug("There is no enforcement of JCR system users, therefore 
service principal names '{}' are valid", servicePrincipalNames);
+return true;
+}
+Session administrativeSession = null;
+UserManager userManager = null;
+Set invalid = new HashSet<>();
+try {
+for (final String pName : servicePrincipalNames) {
+if (validPrincipalNames.contains(pName)) {
+log.debug("The provided service principal name '{}' has 
been already validated and is a known JCR system user", pName);
+} else {
+/*
+ * 

svn commit: r1801483 - in /sling/trunk/bundles/jcr/base: ./ src/main/java/org/apache/sling/jcr/base/ src/test/java/org/apache/sling/jcr/base/ src/test/java/org/apache/sling/jcr/base/internal/

[pauls]

Author: pauls
Date: Mon Jul 10 15:46:19 2017
New Revision: 1801483

URL: http://svn.apache.org/viewvc?rev=1801483&view=rev
Log:
SLING-6973: Adjust AbstractSlingRepository2 to reflect SLING-6963 - patch 
provided by Angela Schreiber.

Modified:
sling/trunk/bundles/jcr/base/pom.xml

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java

sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/package-info.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/MockSlingRepository2.java

sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/internal/WhitelistWiringTest.java

Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1801483&r1=1801482&r2=1801483&view=diff
==
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Mon Jul 10 15:46:19 2017
@@ -111,7 +111,7 @@
 
 org.apache.sling
 org.apache.sling.serviceusermapper
-1.0.0
+1.3.3-SNAPSHOT
 provided
 
 

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java?rev=1801483&r1=1801482&r2=1801483&view=diff
==
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository2.java
 Mon Jul 10 15:46:19 2017
@@ -18,6 +18,12 @@
  */
 package org.apache.sling.jcr.base;
 
+import java.security.Principal;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import javax.jcr.Credentials;
 import javax.jcr.GuestCredentials;
 import javax.jcr.LoginException;
@@ -27,6 +33,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.jcr.Value;
+import javax.security.auth.Subject;
 
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.serviceusermapping.ServiceUserMapper;
@@ -90,7 +97,7 @@ public abstract class AbstractSlingRepos
 if(usingBundle == null) {
 throw new IllegalArgumentException("usingBundle is null");
 }
- }
+}
 
 /**
  * @return The {@link AbstractSlingRepositoryManager} controlling this
@@ -138,6 +145,35 @@ public abstract class AbstractSlingRepos
  */
 protected abstract Session createAdministrativeSession(final String 
workspace) throws RepositoryException;
 
+
+/**
+ * Creates a new service-session. This method is used by {@link 
#loginService(String, String)}
+ * and {@link #impersonateFromService(String, Credentials, String)} to 
avoid
+ * code duplication.
+ *
+ * @param usingBundle The bundle using a service session.
+ * @param subServiceName The optional name of the subservice.
+ * @param workspaceName The JCR workspace name or {@code null}.
+ * @return A new service session or {@code null} if neither a user-name 
nor a
+ * principal names mapping has been defined.
+ * @throws RepositoryException If an error occurs while creating the 
service session.
+ */
+private Session createServiceSession(Bundle usingBundle, String 
subServiceName, String workspaceName) throws RepositoryException {
+final ServiceUserMapper serviceUserMapper = 
this.getSlingRepositoryManager().getServiceUserMapper();
+if (serviceUserMapper != null) {
+final Iterable principalNames = 
serviceUserMapper.getServicePrincipalNames(usingBundle, subServiceName);
+if (principalNames != null) {
+return createServiceSession(principalNames, workspaceName);
+}
+
+final String userName = 
serviceUserMapper.getServiceUserID(usingBundle, subServiceName);
+if (userName != null) {
+return createServiceSession(userName, workspaceName);
+}
+}
+return null;
+}
+
 /**
  * Creates a service-session for the service's {@code serviceUserName} by
  * impersonating the user from an administrative session.
@@ -170,6 +206,44 @@ public abstract class AbstractSlingRepos
 }
 }
 
+/**
+ * Creates a service-session for the service's {@code 
servicePrincipalNames}
+ * using a pre-authenticated {@link Subject}.
+ * 
+ * Implementations of this class may overwrite this method to meet 
additional
+ * needs wrt the the nature of the princip

svn commit: r1801482 - in /sling/trunk/bundles/extensions/serviceusermapper/src: main/java/org/apache/sling/serviceusermapping/ main/java/org/apache/sling/serviceusermapping/impl/ test/java/org/apache

[pauls]

Author: pauls
Date: Mon Jul 10 15:40:52 2017
New Revision: 1801482

URL: http://svn.apache.org/viewvc?rev=1801482&view=rev
Log:
SLING-6963: Add Service user declaration based on principal names - patch 
provided by Angela Schreiber.

Added:

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
Modified:

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserMapper.java

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/Mapping.java

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/MappingInventoryPrinter.java

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/package-info.java

sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/MappingTest.java

sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java

Added: 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java?rev=1801482&view=auto
==
--- 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
 (added)
+++ 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServicePrincipalsValidator.java
 Mon Jul 10 15:40:52 2017
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.serviceusermapping;
+
+import org.osgi.annotation.versioning.ConsumerType;
+
+/**
+ * The {@code ServicePrincipalsValidator} allows to implement validation of 
configured
+ * service user mappings.
+ */
+@ConsumerType
+public interface ServicePrincipalsValidator {
+
+/**
+ * Validates the configured service principal names.
+ *
+ * @param serviceUserId The principal names associated with the service.
+ * @param serviceName The name of the service
+ * @param subServiceName The optional sub service name.
+ * @return {@code true} if all configured service principal names are 
valid; {@code false} otherwise.
+ */
+boolean isValid(Iterable servicePrincipalNames, String 
serviceName, String subServiceName);
+}
\ No newline at end of file

Modified: 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserMapper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserMapper.java?rev=1801482&r1=1801481&r2=1801482&view=diff
==
--- 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserMapper.java
 (original)
+++ 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/ServiceUserMapper.java
 Mon Jul 10 15:40:52 2017
@@ -71,4 +71,19 @@ public interface ServiceUserMapper {
  * optional {@code serviceInfo}.
  */
 String getServiceUserID(Bundle bundle, String subServiceName);
+
+/**
+ * Returns the principal names to access the data store on behalf of the
+ * service.
+ *
+ * @param bundle The bundle implementing the service request access to 
resources.
+ * @param subServiceName Name of the sub service. This parameter is 
optional
+ *   and may be

Jenkins build is back to normal : sling-launchpad-builder-1.8 #10582

[Apache Jenkins Server]

See 

svn commit: r1801441 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

[pauls]

Author: pauls
Date: Mon Jul 10 10:34:51 2017
New Revision: 1801441

URL: http://svn.apache.org/viewvc?rev=1801441&view=rev
Log:
Update to Apache Felix SSLFilter 1.2.2

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1801441&r1=1801440&r2=1801441&view=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Jul 10 
10:34:51 2017
@@ -91,7 +91,7 @@
 org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
 
 [artifacts startLevel=10]
-org.apache.felix/org.apache.felix.http.sslfilter/1.1.0
+org.apache.felix/org.apache.felix.http.sslfilter/1.2.2
 org.apache.felix/org.apache.felix.scr/2.0.8
 org.apache.felix/org.apache.felix.metatype/1.1.2
 org.apache.tika/tika-core/1.14

svn commit: r1801440 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

[pauls]

Author: pauls
Date: Mon Jul 10 10:34:16 2017
New Revision: 1801440

URL: http://svn.apache.org/viewvc?rev=1801440&view=rev
Log:
Update to resource resolver 1.5.26

Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1801440&r1=1801439&r2=1801440&view=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Jul 10 
10:34:16 2017
@@ -59,7 +59,7 @@
 org.apache.sling/org.apache.sling.launchpad.content/2.0.12
 org.apache.sling/org.apache.sling.models.api/1.3.4
 org.apache.sling/org.apache.sling.models.impl/1.4.2
-org.apache.sling/org.apache.sling.resourceresolver/1.5.24
+org.apache.sling/org.apache.sling.resourceresolver/1.5.26
 org.apache.sling/org.apache.sling.serviceusermapper/1.3.2
 org.apache.sling/org.apache.sling.servlets.get/2.1.26
 org.apache.sling/org.apache.sling.servlets.post/2.3.20

svn commit: r1015201 - /websites/production/sling/content/

[pauls]

Author: pauls
Date: Mon Jul 10 10:30:13 2017
New Revision: 1015201

Log:
Apache Sling Resource Resolver 1.5.26

Added:
websites/production/sling/content/
  - copied from r1015200, websites/staging/sling/trunk/content/

svn commit: r1015200 - in /websites/staging/sling/trunk/content: ./ downloads.html news.html

[buildbot]

Author: buildbot
Date: Mon Jul 10 10:29:07 2017
New Revision: 1015200

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 10 10:29:07 2017
@@ -1 +1 @@
-1800431
+1801436

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Mon Jul 10 10:29:07 2017
@@ -1144,9 +1144,9 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Resource Resolver
-1.5.24
-Bundle 
(http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.24.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.24.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.24-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.24-source-release.zip.md5";>md5)
+1.5.26
+Bundle 
(http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.26.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.26.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.md5";>md5)
 
 
 Rewriter
@@ -1556,7 +1556,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1800271 by asanso on Thu, 29 Jun 2017 12:14:43 +
+Rev. 1801435 by pauls on Mon, 10 Jul 2017 10:28:40 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Modified: websites/staging/sling/trunk/content/news.html
==
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Mon Jul 10 10:29:07 2017
@@ -116,6 +116,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
 
+New Releases: Apache Sling Resource Resolver 1.5.26 (July 10th, 2017)
 New Releases: Apache Sling Auth Core 1.4.0 (June 29th, 2017)
 New Releases: Apache Sling Event 4.2.4, JCR Content Parser 1.2.4, File 
System Resource Provider 2.1.6, File System Resource Provider 1.4.6 (June 26th, 
2017)
 New Releases: Apache Sling Security 1.1.4 (June 21st, 2017)
@@ -606,7 +607,7 @@ Apache Sling Scripting Sightly JS Use Pr
 Apache Sling has graduated into a top level project! (June 17, 2009)
 
   
-Rev. 1800271 by asanso on Thu, 29 Jun 2017 12:14:43 +
+Rev. 1801435 by pauls on Mon, 10 Jul 2017 10:28:40 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1801435 - in /sling/site/trunk/content: downloads.list news.mdtext

[pauls]

Author: pauls
Date: Mon Jul 10 10:28:40 2017
New Revision: 1801435

URL: http://svn.apache.org/viewvc?rev=1801435&view=rev
Log:
Apache Sling Resource Resolver 1.5.26

Modified:
sling/site/trunk/content/downloads.list
sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1801435&r1=1801434&r2=1801435&view=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Mon Jul 10 10:28:40 2017
@@ -164,7 +164,7 @@ Resource Collection|org.apache.sling.res
 Resource Inventory|org.apache.sling.resource.inventory|1.0.8
 Resource Merger|org.apache.sling.resourcemerger|1.3.4
 Resource Presence|org.apache.sling.resource.presence|0.0.2
-Resource Resolver|org.apache.sling.resourceresolver|1.5.24
+Resource Resolver|org.apache.sling.resourceresolver|1.5.26
 Rewriter|org.apache.sling.rewriter|1.2.0
 Failing Server-Side Tests|org.apache.sling.testing.samples.failingtests|1.0.6
 Sample Integration 
Tests|org.apache.sling.testing.samples.integrationtests|1.0.6

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1801435&r1=1801434&r2=1801435&view=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Mon Jul 10 10:28:40 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Releases: Apache Sling Resource Resolver 1.5.26 (July 10th, 2017)
 * New Releases: Apache Sling Auth Core 1.4.0 (June 29th, 2017)
 * New Releases: Apache Sling Event 4.2.4, JCR Content Parser 1.2.4, File 
System Resource Provider 2.1.6, File System Resource Provider 1.4.6 (June 26th, 
2017)
 * New Releases: Apache Sling Security 1.1.4 (June 21st, 2017)

svn commit: r20390 - /release/sling/

[pauls]

Author: pauls
Date: Mon Jul 10 10:20:35 2017
New Revision: 20390

Log:
Add the Apache Sling Resource Resolver 1.5.26 release.

Added:
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip   
(with props)

release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.asc

release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.md5

release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.sha1
release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar   (with 
props)
release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar.asc
release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar.md5
release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar.sha1
release/sling/org.apache.sling.resourceresolver-1.5.26.jar   (with props)
release/sling/org.apache.sling.resourceresolver-1.5.26.jar.asc
release/sling/org.apache.sling.resourceresolver-1.5.26.jar.md5
release/sling/org.apache.sling.resourceresolver-1.5.26.jar.sha1
release/sling/org.apache.sling.resourceresolver-1.5.26.pom
release/sling/org.apache.sling.resourceresolver-1.5.26.pom.asc
release/sling/org.apache.sling.resourceresolver-1.5.26.pom.md5
release/sling/org.apache.sling.resourceresolver-1.5.26.pom.sha1
Removed:
release/sling/org.apache.sling.resourceresolver-1.5.24-source-release.zip

release/sling/org.apache.sling.resourceresolver-1.5.24-source-release.zip.asc

release/sling/org.apache.sling.resourceresolver-1.5.24-source-release.zip.md5

release/sling/org.apache.sling.resourceresolver-1.5.24-source-release.zip.sha1
release/sling/org.apache.sling.resourceresolver-1.5.24-sources.jar
release/sling/org.apache.sling.resourceresolver-1.5.24-sources.jar.asc
release/sling/org.apache.sling.resourceresolver-1.5.24-sources.jar.md5
release/sling/org.apache.sling.resourceresolver-1.5.24-sources.jar.sha1
release/sling/org.apache.sling.resourceresolver-1.5.24.jar
release/sling/org.apache.sling.resourceresolver-1.5.24.jar.asc
release/sling/org.apache.sling.resourceresolver-1.5.24.jar.md5
release/sling/org.apache.sling.resourceresolver-1.5.24.jar.sha1
release/sling/org.apache.sling.resourceresolver-1.5.24.pom
release/sling/org.apache.sling.resourceresolver-1.5.24.pom.asc
release/sling/org.apache.sling.resourceresolver-1.5.24.pom.md5
release/sling/org.apache.sling.resourceresolver-1.5.24.pom.sha1

Added: release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.asc
==
--- 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.asc 
(added)
+++ 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.asc 
Mon Jul 10 10:20:35 2017
@@ -0,0 +1,6 @@
+-BEGIN PGP SIGNATURE-
+
+iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWVzwUgAKCRCQVII6hZpy
+Nw53AJ9sZCgUxSw7MgT5jpPNpCYd2sgJagCfc01qX8cJ2ZZNTedDcZ+nbbjWFfI=
+=aoTY
+-END PGP SIGNATURE-

Added: 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.md5
==
--- 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.md5 
(added)
+++ 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.md5 
Mon Jul 10 10:20:35 2017
@@ -0,0 +1 @@
+c01675a71c6ed14dc981497d5825c997
\ No newline at end of file

Added: 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.sha1
==
--- 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.sha1 
(added)
+++ 
release/sling/org.apache.sling.resourceresolver-1.5.26-source-release.zip.sha1 
Mon Jul 10 10:20:35 2017
@@ -0,0 +1 @@
+986bab64a678612c73fe4b3cc4fa46eec73a1d1b
\ No newline at end of file

Added: release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.resourceresolver-1.5.26-sources.jar.asc
==
--- release/sling/org.apache.sling.resourceresolver-1.5.26-sour

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Resource Resolver 1.5.26Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.5)""userId" = "pauls""ip" = "193.105.139.131"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26-source-release.zip.asc(SHA1: fa36f1265a9ec900c89c4e871dac11a9d0ddc13c)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26-sources.jar(SHA1: d3763125573399fe5124fdbbe70a194d3c3f742e)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26.jar.asc(SHA1: bd4e288db83ad6ff17050eb62e0c0e39f67f336d)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26-source-release.zip(SHA1: 986bab64a678612c73fe4b3cc4fa46eec73a1d1b)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26.pom.asc(SHA1: 3cc60ebae5d3ccc76b99b321e99d1aac68400362)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26.jar(SHA1: 838a32607ece4a4931e26226370ef0b849c4d70a)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26.pom(SHA1: ef4da6059000a9a974bf930bd52c426d2d3ce5e6)/org/apache/sling/org.apache.sling.resourceresolver/1.5.26/org.apache.sling.resourceresolver-1.5.26-sources.jar.asc(SHA1: c9da41cae921522f567eaed244d3d054cd75ae7d)Action performed by Karl Pauls (pauls)

svn commit: r20388 - /release/sling/

[stefanegli]

Author: stefanegli
Date: Mon Jul 10 08:25:40 2017
New Revision: 20388

Log:
Removing Apache Sling Discovery Oak 1.2.18

Removed:
release/sling/org.apache.sling.discovery.oak-1.2.18-javadoc.jar
release/sling/org.apache.sling.discovery.oak-1.2.18-javadoc.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.18-javadoc.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.18-javadoc.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.18-source-release.zip
release/sling/org.apache.sling.discovery.oak-1.2.18-source-release.zip.asc
release/sling/org.apache.sling.discovery.oak-1.2.18-source-release.zip.md5
release/sling/org.apache.sling.discovery.oak-1.2.18-source-release.zip.sha1
release/sling/org.apache.sling.discovery.oak-1.2.18-sources.jar
release/sling/org.apache.sling.discovery.oak-1.2.18-sources.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.18-sources.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.18-sources.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.18.jar
release/sling/org.apache.sling.discovery.oak-1.2.18.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.18.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.18.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.18.pom
release/sling/org.apache.sling.discovery.oak-1.2.18.pom.asc
release/sling/org.apache.sling.discovery.oak-1.2.18.pom.md5
release/sling/org.apache.sling.discovery.oak-1.2.18.pom.sha1

svn commit: r20387 - /release/sling/

[stefanegli]

Author: stefanegli
Date: Mon Jul 10 08:24:39 2017
New Revision: 20387

Log:
Removing Apache Sling Discovery Base 2.0.0

Removed:
release/sling/org.apache.sling.discovery.base-2.0.0-javadoc.jar
release/sling/org.apache.sling.discovery.base-2.0.0-javadoc.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.0-javadoc.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.0-javadoc.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.0-source-release.zip
release/sling/org.apache.sling.discovery.base-2.0.0-source-release.zip.asc
release/sling/org.apache.sling.discovery.base-2.0.0-source-release.zip.md5
release/sling/org.apache.sling.discovery.base-2.0.0-source-release.zip.sha1
release/sling/org.apache.sling.discovery.base-2.0.0-sources.jar
release/sling/org.apache.sling.discovery.base-2.0.0-sources.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.0-sources.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.0-sources.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.0-tests.jar
release/sling/org.apache.sling.discovery.base-2.0.0-tests.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.0-tests.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.0-tests.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.0.jar
release/sling/org.apache.sling.discovery.base-2.0.0.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.0.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.0.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.0.pom
release/sling/org.apache.sling.discovery.base-2.0.0.pom.asc
release/sling/org.apache.sling.discovery.base-2.0.0.pom.md5
release/sling/org.apache.sling.discovery.base-2.0.0.pom.sha1

svn commit: r20386 - /release/sling/

[stefanegli]

Author: stefanegli
Date: Mon Jul 10 08:16:01 2017
New Revision: 20386

Log:
Release Apache Sling Discovery Oak 1.2.20

Added:
release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar   (with 
props)
release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip   
(with props)
release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip.asc
release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip.md5
release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip.sha1
release/sling/org.apache.sling.discovery.oak-1.2.20-sources.jar   (with 
props)
release/sling/org.apache.sling.discovery.oak-1.2.20-sources.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.20-sources.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.20-sources.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.20.jar   (with props)
release/sling/org.apache.sling.discovery.oak-1.2.20.jar.asc
release/sling/org.apache.sling.discovery.oak-1.2.20.jar.md5
release/sling/org.apache.sling.discovery.oak-1.2.20.jar.sha1
release/sling/org.apache.sling.discovery.oak-1.2.20.pom   (with props)
release/sling/org.apache.sling.discovery.oak-1.2.20.pom.asc
release/sling/org.apache.sling.discovery.oak-1.2.20.pom.md5
release/sling/org.apache.sling.discovery.oak-1.2.20.pom.sha1

Added: release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.asc
==
--- release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.asc Mon Jul 
10 08:16:01 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJZW4lVAAoJEFDQukICp5ZtZsIP/0XY5QBKNMzGpyHv1c6UIlzQ
+fewt/HQzgefPotjKVZuMJmHb/iNq+ubCDBP78Kbw1aDrcxhsxCXEsqOa0opu3hgT
+4AriJPxCMmK3AnkmWKRg8QEB3G6E9A/NUCS/ZzORDhMrKch0NC9U3uA3CsPYB6wM
+uOm+fQ/+yArRwNw9d9ftgw6bhPEhzB7PNXAcO2CPtuzhgrQGciriVbd5Oq8K6ppL
+FFFE2WcfGDY0+dk8xl8OGHsQoN6zvQfzzLlqgpuaT6x2pO9awCdYwH5/T7Jbc+Ab
+URivGuMqVMRwCmKWjVISJUro6orNthFlcUUYw5nD+IdWMvOsIaExBRKfIgGIqzEm
+yB1S6iZMYlNWMd8GZPcKUFuZM6ESQKkHDuKFWJ403Gx89AINcb+ZX89IQj1mRYGG
+gThav+cgAzRn2GLAvlnW9rKF8BFWdQpADkE4poy2eHcSF9uZt1g6MoF5debfSc6/
+72SZgEJup2RTd93H6D4T5PqvRupqzfdO1ImOmDmXblxvRwGK1vhz1pfzzzw3DVAS
+xs59jnDYQJlLf3wgX9aLlskXPfahM9pkBEYE+uUouUk3hbhZkhMK9FjgM124RHl2
+tNwu7CYYzfG8oqEaTSKjS5pBTjQW6J6gUmO0TndZaCAR/trV7wU3W2L5zuutq3mf
+8FTFvqMOkpJZF6lCHhwG
+=S1/w
+-END PGP SIGNATURE-

Added: release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.md5
==
--- release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.md5 Mon Jul 
10 08:16:01 2017
@@ -0,0 +1 @@
+e8eeabcdc6a59b510b027e776c2afda8
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.sha1
==
--- release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.sha1 Mon 
Jul 10 08:16:01 2017
@@ -0,0 +1 @@
+9da1058c59f01407426bb275a20f2f700c6bbaa3
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip.asc
==
--- release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip.asc 
(added)
+++ release/sling/org.apache.sling.discovery.oak-1.2.20-source-release.zip.asc 
Mon Jul 10 08:16:01 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJZW4lVAAoJEFDQukICp5ZtlVQP+wVOJhIhna4o4OLz/wCkCnSq
+rfx9c4bmCfhqCLEZSsvSBVwC/XADB2h/JzdVSEoeXbmcFZto+LILv6/iMSI/Zo7p
+uS

svn commit: r20385 - /release/sling/

[stefanegli]

Author: stefanegli
Date: Mon Jul 10 08:14:13 2017
New Revision: 20385

Log:
Release Apache Sling Discovery Base 2.0.4

Added:
release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar   (with 
props)
release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip   
(with props)
release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip.asc
release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip.md5
release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip.sha1
release/sling/org.apache.sling.discovery.base-2.0.4-sources.jar   (with 
props)
release/sling/org.apache.sling.discovery.base-2.0.4-sources.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.4-sources.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.4-sources.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.4-tests.jar   (with props)
release/sling/org.apache.sling.discovery.base-2.0.4-tests.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.4-tests.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.4-tests.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.4.jar   (with props)
release/sling/org.apache.sling.discovery.base-2.0.4.jar.asc
release/sling/org.apache.sling.discovery.base-2.0.4.jar.md5
release/sling/org.apache.sling.discovery.base-2.0.4.jar.sha1
release/sling/org.apache.sling.discovery.base-2.0.4.pom   (with props)
release/sling/org.apache.sling.discovery.base-2.0.4.pom.asc
release/sling/org.apache.sling.discovery.base-2.0.4.pom.md5
release/sling/org.apache.sling.discovery.base-2.0.4.pom.sha1

Added: release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.asc
==
--- release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.asc Mon Jul 
10 08:14:13 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - https://gpgtools.org
+
+iQIcBAABCgAGBQJZW4QgAAoJEFDQukICp5ZtWM8P/j4qyw9YPtVTQm6DReZSRXYI
+uv5Xs8yYCMH+MCs1OXfD7MTS+g/K8YU7ZIz9bmN6tAlEoblVkE39ztcnfTx2gdT6
+WmxUrulwefC4wHfrEsVJ1qpwjygNf9zsr4UpKdumyP9I1PW29zcZY13UwpQmPIlo
+0J9ThbnBesAyFKFfuDoKiyxgCbhgQS0GPE2kFrfrRAZQ6LHrlyeh2xeRaihjCUEI
+0bcKea0fXJv7kTfHhM+cGmJJTSGrsuxTbjkvkSSuR0J+mpyueWNhiR1JdhmLf1qi
+O2/ci5CVDTZzdORXI9AIKqGk8H3nHp1OjBkkWaqTtlWImB+7w/0oJ31ulSGhZQhL
+cSRTIM52Tg5alE/+y6iu4hCFILDnLKpJOLf/zWWTAbf7C/Mj5ID9pX+3xDialRzK
+6F0S63EY649r4IZe0NHnPB0FTctyQzIxsnhZBLRpMkpBRD+pEwVKJ4fNacJL4+yn
+l49W/ZFv/2TPJ8vfq5nLyWA1YMFz2LlR8rQLhUcwWU0vb8BJ82kUGyhsKLZMD7Ul
+FO3A3d5TmILBydwkrPvH6vfXT78JIYYdpDLvFYhFY1WcRsRSCRo+5olMCT8+qdO7
++k8zX607sGabUpUM6f0ImofbGDz+YQTayah+Ur1tI3U/rpLQrTML5bY8ZciYsXNl
+SFSbgkHQK6KuRSPosU9z
+=IE5D
+-END PGP SIGNATURE-

Added: release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.md5
==
--- release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.md5 Mon Jul 
10 08:14:13 2017
@@ -0,0 +1 @@
+67d2454efaeb340c5a1415da4122bb19
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.sha1
==
--- release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.discovery.base-2.0.4-javadoc.jar.sha1 Mon 
Jul 10 08:14:13 2017
@@ -0,0 +1 @@
+146d2472f8bbfae46358f299a81cd239af035143
\ No newline at end of file

Added: release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip.asc
==
--- release/sling/org.apache.sling.discovery.base-2.0.4-source-release.zip.asc 
(added)
+++ release/sling/org.apache.sling.disco

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Release Apache Sling Discovery Base 2.0.4 and Discovery Oak 1.2.20Deployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Mac OS X 10.10.5)""userId" = "stefanegli""ip" = "192.147.117.11"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-source-release.zip(SHA1: 830ded132de61de787038d736384e3d62f6ee0bc)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-tests.jar.asc(SHA1: f580551d9b51dfa0495c0613f4b148ae11d335db)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-sources.jar(SHA1: b3106a198011140b65a3e4984e65a5818ed145b6)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-javadoc.jar(SHA1: 146d2472f8bbfae46358f299a81cd239af035143)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4.pom(SHA1: 91dbeadbaa0bd582a247aecdcfee3f4d3d836485)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-source-release.zip.asc(SHA1: f593e33b024fdde63a7b0dcb862d76134980aeff)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-tests.jar(SHA1: 12a13fbff92b9f44978e4b5e52699113aa3afe0e)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-javadoc.jar.asc(SHA1: 753d81cf713811e498cddef19676ecee9e4807fc)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4-sources.jar.asc(SHA1: f00d6ebbaf66dd8a94725a4ca8329ffd650e3326)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4.pom.asc(SHA1: 776caf6a96c35779a859a85bccaba620a53f5b02)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4.jar.asc(SHA1: f7cc65441d895beedb350a7917a443c3af43a314)/org/apache/sling/org.apache.sling.discovery.base/2.0.4/org.apache.sling.discovery.base-2.0.4.jar(SHA1: ee97fd59485f4de50eb87409a4c97ff83a1df466)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20.pom.asc(SHA1: 427679192110266d8c85e464f0ce65875525035a)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20.pom(SHA1: 477ce8eb51db587a2bdffe28897399a17a9363e3)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20-javadoc.jar(SHA1: 9da1058c59f01407426bb275a20f2f700c6bbaa3)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20-sources.jar.asc(SHA1: 4e1c39843d9db455979a3835f98bd99c45e28f17)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20-javadoc.jar.asc(SHA1: 5130b6e1eb7f45c89fe3a034558c24d40fdf9738)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20.jar.asc(SHA1: ee598524a35e57ad681ed18af1fb511eb0a863e4)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20.jar(SHA1: 689f1ea3621489a0c4051380a9e30fef3e7510cb)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20-source-release.zip.asc(SHA1: 279a39b730284d74b8b11ef442bcb729cf5605c1)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20-sources.jar(SHA1: c1f48aec66f7d9d02657e9d1e88d8b809d1bd751)/org/apache/sling/org.apache.sling.discovery.oak/1.2.20/org.apache.sling.discovery.oak-1.2.20-source-release.zip(SHA1: 3c7f9f8e240918e6e48d94194fd3f0e7eceeef9d)Action performed by Stefan Egli (stefanegli)