svn commit: r1806051 - in /sling/trunk/bundles/commons/metrics-rrd4j/src: main/java/org/apache/sling/commons/metrics/rrd4j/impl/ test/java/org/apache/sling/commons/metrics/rrd4j/impl/

[rombert]

Author: rombert
Date: Thu Aug 24 14:51:33 2017
New Revision: 1806051

URL: http://svn.apache.org/viewvc?rev=1806051&view=rev
Log:
SLING-7074 - RRD4J improve configuration handling

Submitted-By: Alex Deparvu

Added:

sling/trunk/bundles/commons/metrics-rrd4j/src/test/java/org/apache/sling/commons/metrics/rrd4j/impl/InvalidParamsTest.java
Modified:

sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/CodahaleMetricsReporter.java

sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java

Modified: 
sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/CodahaleMetricsReporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/CodahaleMetricsReporter.java?rev=1806051&r1=1806050&r2=1806051&view=diff
==
--- 
sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/CodahaleMetricsReporter.java
 (original)
+++ 
sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/CodahaleMetricsReporter.java
 Thu Aug 24 14:51:33 2017
@@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import static 
org.apache.sling.commons.metrics.rrd4j.impl.RRD4JReporter.DEFAULT_PATH;
 import static 
org.apache.sling.commons.metrics.rrd4j.impl.RRD4JReporter.DEFAULT_STEP;
 
 @Component(
@@ -119,7 +120,7 @@ public class CodahaleMetricsReporter imp
 "available, otherwise relative to the current working 
" +
 "directory."
 )
-String path() default "metrics/metrics.rrd";
+String path() default DEFAULT_PATH;
 }
 
 private MetricRegistry metricRegistry = new MetricRegistry();
@@ -128,31 +129,44 @@ public class CodahaleMetricsReporter imp
 void activate(BundleContext context, Configuration config) throws 
Exception {
 LOG.info("Starting RRD4J Metrics reporter");
 configuration = config;
-rrd = new File(config.path());
-if (!rrd.isAbsolute()) {
-String home = context.getProperty("sling.home");
-if (home != null) {
-rrd = new File(home, rrd.getPath());
-}
-}
-
+rrd = getSafePath(context, config);
 reporter = RRD4JReporter.forRegistry(metricRegistry)
-.convertRatesTo(TimeUnit.SECONDS)
-.convertDurationsTo(TimeUnit.MICROSECONDS)
 .withPath(rrd)
 .withDatasources(config.datasources())
 .withArchives(config.archives())
 .withStep(config.step())
 .build();
-reporter.start(config.step(), TimeUnit.SECONDS);
-LOG.info("Started RRD4J Metrics reporter. Writing to " + rrd);
+if (reporter != null) {
+reporter.start(config.step(), TimeUnit.SECONDS);
+LOG.info("Started RRD4J Metrics reporter: {}.", reporter);
+} else {
+LOG.warn("Illegal config will not start the RRD reporter. 
[path={}, datasources={}, archives={}, step={}].",
+rrd.getPath(), config.datasources(), config.archives(), 
config.step());
+}
+}
+
+private static File getSafePath(BundleContext context, Configuration 
config) {
+String path = config.path();
+if (path == null || path.isEmpty()) {
+path = DEFAULT_PATH;
+}
+File rrd = new File(path);
+if (!rrd.isAbsolute()) {
+String home = context.getProperty("sling.home");
+if (home != null) {
+rrd = new File(home, rrd.getPath());
+}
+}
+return rrd;
 }
 
 @Deactivate
 void deactivate() {
 LOG.info("Stopping RRD4J Metrics reporter");
-reporter.stop();
-reporter = null;
+if (reporter != null) {
+reporter.stop();
+reporter = null;
+}
 configuration = null;
 rrd = null;
 LOG.info("Stopped RRD4J Metrics reporter");

Modified: 
sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java?rev=1806051&r1=1806050&r2=1806051&view=diff
==
--- 
sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JReporter.java
 (original)
+++ 
sling/trunk/bundles/commons/metrics-rrd4j/src/main/java/org/apache/sling/commons/metrics/rrd4j/impl/RRD4JR

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #1468

[Apache Jenkins Server]

See 

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1531

[Apache Jenkins Server]

See 

svn commit: r1806050 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java

[rombert]

Author: rombert
Date: Thu Aug 24 14:35:24 2017
New Revision: 1806050

URL: http://svn.apache.org/viewvc?rev=1806050&view=rev
Log:
SLING-3224 - GetAclTest integration test fails due to incorrect
privilege expansion in AbstractGetAclServlet

Removed correct test this time.

Modified:

sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java?rev=1806050&r1=1806049&r2=1806050&view=diff
==
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
 Thu Aug 24 14:35:24 2017
@@ -39,7 +39,6 @@ import org.apache.sling.commons.testing.
 import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -216,7 +215,7 @@ public class GetAclTest {
 * Test for SLING-2600, Effective ACL servlet returns incorrect 
information
 */
@Test 
-   public void testEffectiveAclMergeForUser_MorePrivilegesGrantedOnChild() 
throws IOException, JsonException {
+   public void 
testEffectiveAclMergeForUser_FewerPrivilegesGrantedOnChild() throws 
IOException, JsonException {
testUserId = H.createTestUser();

String testFolderUrl = H.createTestFolder("{ 
\"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", 
\"child\" : { \"childPropOne\" : true } }");
@@ -226,7 +225,7 @@ public class GetAclTest {
 //1. create an initial set of privileges
List postParams = new ArrayList();
postParams.add(new NameValuePair("principalId", testUserId));
-   postParams.add(new NameValuePair("privilege@jcr:write", 
"granted"));
+   postParams.add(new NameValuePair("privilege@jcr:all", 
"granted"));

Credentials creds = new UsernamePasswordCredentials("admin", 
"admin");
H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);
@@ -235,7 +234,7 @@ public class GetAclTest {

postParams = new ArrayList();
postParams.add(new NameValuePair("principalId", testUserId));
-   postParams.add(new NameValuePair("privilege@jcr:all", 
"granted"));
+   postParams.add(new NameValuePair("privilege@jcr:write", 
"granted"));

 postUrl = testFolderUrl + "/child.modifyAce.html";
H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);
@@ -270,8 +269,8 @@ public class GetAclTest {
/**
 * Test for SLING-2600, Effective ACL servlet returns incorrect 
information
 */
-   @Test
-   public void 
testEffectiveAclMergeForUser_SubsetOfPrivilegesDeniedOnChild() throws 
IOException, JsonException {
+   @Test 
+   public void testEffectiveAclMergeForUser_MorePrivilegesGrantedOnChild() 
throws IOException, JsonException {
testUserId = H.createTestUser();

String testFolderUrl = H.createTestFolder("{ 
\"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", 
\"child\" : { \"childPropOne\" : true } }");
@@ -281,14 +280,16 @@ public class GetAclTest {
 //1. create an initial set of privileges
List postParams = new ArrayList();
postParams.add(new NameValuePair("principalId", testUserId));
-   postParams.add(new NameValuePair("privilege@jcr:all", 
"granted"));
+   postParams.add(new NameValuePair("privilege@jcr:write", 
"granted"));

Credentials creds = new UsernamePasswordCredentials("admin", 
"admin");
H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);

+   H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);
+   
postParams = new ArrayList();
postParams.add(new NameValuePair("principalId", testUserId));
-   postParams.add(new NameValuePair("privilege@jcr:write", 
"denied"));
+   postParams.add(new NameValuePair("privilege@jcr:all", 
"granted"));

 postUrl = testFolderUrl + "/child.modi

Jenkins build became unstable: sling-launchpad-testing-war-1.8 #1467

[Apache Jenkins Server]

See 

Jenkins build became unstable: sling-launchpad-testing-1.8 #1530

[Apache Jenkins Server]

See 

svn commit: r1806048 - in /sling/trunk/bundles/jcr/jackrabbit-accessmanager: ./ src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/ src/main/java/org/apache/sling/jcr/jackrabbit/accessma

[rombert]

Author: rombert
Date: Thu Aug 24 13:44:15 2017
New Revision: 1806048

URL: http://svn.apache.org/viewvc?rev=1806048&view=rev
Log:
SLING-3224 - GetAclTest integration test fails due to incorrect privilege 
expansion in AbstractGetAclServlet

Extracted a PrivilegesHelper from the AbstractGetAclServlet and added fix + 
tests.

Added:

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelper.java
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/sling/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/sling/jcr/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/sling/jcr/jackrabbit/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelperTest.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml

sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java

Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml?rev=1806048&r1=1806047&r2=1806048&view=diff
==
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml Thu Aug 24 
13:44:15 2017
@@ -76,13 +76,13 @@
 
 org.apache.sling
 org.apache.sling.api
-2.0.8
+2.11.0
 provided
 
 
 org.apache.jackrabbit
 jackrabbit-api
-2.0.0
+2.12.0
 provided
 
 
@@ -112,5 +112,19 @@
 1.0-alpha-1
 provided
 
+
+junit
+junit
+
+
+org.apache.sling
+org.apache.sling.testing.sling-mock-oak
+2.0.2
+test
+
+
+org.slf4j
+slf4j-simple
+
 
 

Added: 
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelper.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelper.java?rev=1806048&view=auto
==
--- 
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelper.java
 (added)
+++ 
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelper.java
 Thu Aug 24 13:44:15 2017
@@ -0,0 +1,181 @@
+/*
+ * 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.jcr.jackrabbit.accessmanager.impl;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.Privilege;
+
+import org.apache.sling.jcr.base.util.AccessControlUtil;
+
+/**
+ * Contains utility methods related to handling privileges 
+ *
+ */
+public abstract class PrivilegesHelper {
+
+   

svn commit: r1806049 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java

[rombert]

Author: rombert
Date: Thu Aug 24 13:44:24 2017
New Revision: 1806049

URL: http://svn.apache.org/viewvc?rev=1806049&view=rev
Log:
SLING-3224 - GetAclTest integration test fails due to incorrect privilege 
expansion in AbstractGetAclServlet

Removed failing test due to it being fully covered in the module tests.

Modified:

sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java?rev=1806049&r1=1806048&r2=1806049&view=diff
==
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java
 Thu Aug 24 13:44:24 2017
@@ -216,61 +216,6 @@ public class GetAclTest {
 * Test for SLING-2600, Effective ACL servlet returns incorrect 
information
 */
@Test 
-   public void 
testEffectiveAclMergeForUser_FewerPrivilegesGrantedOnChild() throws 
IOException, JsonException {
-   testUserId = H.createTestUser();
-   
-   String testFolderUrl = H.createTestFolder("{ 
\"jcr:primaryType\": \"nt:unstructured\", \"propOne\" : \"propOneValue\", 
\"child\" : { \"childPropOne\" : true } }");
-   
-String postUrl = testFolderUrl + ".modifyAce.html";
-
-//1. create an initial set of privileges
-   List postParams = new ArrayList();
-   postParams.add(new NameValuePair("principalId", testUserId));
-   postParams.add(new NameValuePair("privilege@jcr:all", 
"granted"));
-   
-   Credentials creds = new UsernamePasswordCredentials("admin", 
"admin");
-   H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);
-   
-   H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);
-   
-   postParams = new ArrayList();
-   postParams.add(new NameValuePair("principalId", testUserId));
-   postParams.add(new NameValuePair("privilege@jcr:write", 
"granted"));
-   
-postUrl = testFolderUrl + "/child.modifyAce.html";
-   H.assertAuthenticatedPostStatus(creds, postUrl, 
HttpServletResponse.SC_OK, postParams, null);
-
-   
-   //fetch the JSON for the eacl to verify the settings.
-   String getUrl = testFolderUrl + "/child.eacl.json";
-
-   String json = H.getAuthenticatedContent(creds, getUrl, 
HttpTest.CONTENT_TYPE_JSON, null, HttpServletResponse.SC_OK);
-   assertNotNull(json);
-   JsonObject jsonObject = JsonUtil.parseObject(json);
-   
-   JsonObject aceObject = jsonObject.getJsonObject(testUserId);
-   assertNotNull(aceObject);
-
-   String principalString = aceObject.getString("principal");
-   assertEquals(testUserId, principalString);
-   
-   JsonArray grantedArray = aceObject.getJsonArray("granted");
-   assertNotNull(grantedArray);
-   assertEquals(1, grantedArray.size());
-   Set grantedPrivilegeNames = new HashSet();
-   for (int i=0; i < grantedArray.size(); i++) {
-   grantedPrivilegeNames.add(grantedArray.getString(i));
-   }
-   H.assertPrivilege(grantedPrivilegeNames,true,"jcr:all");
-
-   Object deniedArray = aceObject.get("denied");
-   assertNull(deniedArray);
-   }
-
-   /**
-* Test for SLING-2600, Effective ACL servlet returns incorrect 
information
-*/
-   @Test 
public void testEffectiveAclMergeForUser_MorePrivilegesGrantedOnChild() 
throws IOException, JsonException {
testUserId = H.createTestUser();

@@ -326,7 +271,6 @@ public class GetAclTest {
 * Test for SLING-2600, Effective ACL servlet returns incorrect 
information
 */
@Test
-   @Ignore // TODO: fails on Oak
public void 
testEffectiveAclMergeForUser_SubsetOfPrivilegesDeniedOnChild() throws 
IOException, JsonException {
testUserId = H.createTestUser();

@@ -342,8 +286,6 @@ public class GetAclTest {
Credentials creds = new UsernamePasswordCredentials("admin", 
"admin");
H.assertAuthenticatedPostStatus(creds, postUrl

Jenkins build is back to stable : sling-bundles-scripting-sightly-testing-1.8 #97

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-tooling-trunk-1.8 #377

[Apache Jenkins Server]

See 

Jenkins build is back to normal : sling-bundles-scripting-sightly-js-use-provider-1.8 #45

[Apache Jenkins Server]

See 

svn commit: r1806038 - in /sling/trunk/bundles/scripting/sightly: compiler/pom.xml engine/pom.xml java-compiler/pom.xml testing/pom.xml testing/src/main/provisioning/model.txt testing/src/test/java/La

[radu]

Author: radu
Date: Thu Aug 24 13:10:03 2017
New Revision: 1806038

URL: http://svn.apache.org/viewvc?rev=1806038&view=rev
Log:
SLING-7084 - Coverage report is not generated correctly for HTL modules

* switched to slingstart-maven-plugin 1.7.7-SNAPSHOT, until 1.7.8 is released
* updated JaCoCo version to 0.7.9
* based tests on released Apache Sling Launchpad 9
* increased LaunchpadReadyIT timeouts from 20 to 60 seconds

Modified:
sling/trunk/bundles/scripting/sightly/compiler/pom.xml
sling/trunk/bundles/scripting/sightly/engine/pom.xml
sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml
sling/trunk/bundles/scripting/sightly/testing/pom.xml

sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt

sling/trunk/bundles/scripting/sightly/testing/src/test/java/LaunchpadReadyIT.java

Modified: sling/trunk/bundles/scripting/sightly/compiler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/compiler/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==
--- sling/trunk/bundles/scripting/sightly/compiler/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/compiler/pom.xml Thu Aug 24 13:10:03 
2017
@@ -51,7 +51,7 @@
 
 
 4.1
-
0.7.6.201602180812
+0.7.9
 
 
 

Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==
--- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Thu Aug 24 13:10:03 
2017
@@ -50,7 +50,7 @@
 
 
 
-
0.7.6.201602180812
+0.7.9
 
 
 

Modified: sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==
--- sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/java-compiler/pom.xml Thu Aug 24 
13:10:03 2017
@@ -48,7 +48,7 @@
 
 
 
-
0.7.6.201602180812
+0.7.9
 
 
 

Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1806038&r1=1806037&r2=1806038&view=diff
==
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Thu Aug 24 13:10:03 
2017
@@ -68,7 +68,7 @@
 -->
 
 
-
0.7.6.201602180812
+0.7.9
 
 
1.0.11-SNAPSHOT
 
1.0.11-SNAPSHOT
@@ -148,7 +148,7 @@
 
 org.apache.sling
 slingstart-maven-plugin
-1.7.0
+1.7.7-SNAPSHOT
 true
 
 
@@ -203,6 +203,23 @@
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+generate-sources
+
+add-source
+
+
+
+
${project.build.directory}/generated-sources
+
+
+
+
+
+
 org.apache.maven.plugins
 maven-dependency-plugin
 2.10
@@ -214,17 +231,19 @@
 org.apache.sling.scripting.sightly.js.provider,
 
org.apache.sling.scripting.sightly.models.provider
 
-
true
+false
 
 
 
-copy-compiled-classes
+copy-sources
 generate-resources
 
 unpack-dependencies
 
 
-
${project.build.directory}/classes
+sources
+
true
+
${project.build.directory}/ge

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

[cziegeler]

Author: cziegeler
Date: Thu Aug 24 12:39:25 2017
New Revision: 1806034

URL: http://svn.apache.org/viewvc?rev=1806034&view=rev
Log:
Update to Scripting JSP 2.3.2

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

Modified: sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt?rev=1806034&r1=1806033&r2=1806034&view=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt Thu Aug 
24 12:39:25 2017
@@ -23,7 +23,7 @@
 org.apache.sling/org.apache.sling.scripting.api/2.2.0
 org.apache.sling/org.apache.sling.scripting.core/2.0.46
 org.apache.sling/org.apache.sling.scripting.javascript/3.0.0
-org.apache.sling/org.apache.sling.scripting.jsp/2.3.0
+org.apache.sling/org.apache.sling.scripting.jsp/2.3.2
 org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.0
 org.apache.sling/org.apache.sling.scripting.el-api/1.0.0
 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.6

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

[buildbot]

Author: buildbot
Date: Thu Aug 24 11:27:59 2017
New Revision: 1017223

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 Thu Aug 24 11:27:59 2017
@@ -1 +1 @@
-1805423
+1806029

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Thu Aug 24 11:27:59 2017
@@ -1246,9 +1246,9 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Scripting JSP
-2.3.0
-Bundle (http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.0.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.0.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.0-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.0-source-release.zip.md5";>md5)
+2.3.2
+Bundle (http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.2.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.2.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.md5";>md5)
 
 
 Scripting JST
@@ -1556,7 +1556,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1805313 by rombert on Thu, 17 Aug 2017 16:17:53 +
+Rev. 1806029 by cziegeler on Thu, 24 Aug 2017 11:27:31 +
   

 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 Thu Aug 24 11:27:59 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 Release: Apache Sling Scripting JSP 2.3.2 (August 24th, 2017)
 New Releases: Apache Sling Rewriter 1.2.2, Apache Sling Launchpad Base 
5.6.6-2.6.22 (August 17th, 2017)
 New Release: Apache Sling Event 4.2.6 (August 16th, 2017)
 New Release: Apache Sling Default POST Servlets 2.3.22 (August 14th, 
2017)
@@ -618,7 +619,7 @@ Apache Sling Scripting Sightly JS Use Pr
 Apache Sling has graduated into a top level project! (June 17, 2009)
 
   
-Rev. 1805313 by rombert on Thu, 17 Aug 2017 16:17:53 +
+Rev. 1806029 by cziegeler on Thu, 24 Aug 2017 11:27:31 +
   

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

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

[cziegeler]

Author: cziegeler
Date: Thu Aug 24 11:27:31 2017
New Revision: 1806029

URL: http://svn.apache.org/viewvc?rev=1806029&view=rev
Log:
Scripting JSP 2.3.2

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=1806029&r1=1806028&r2=1806029&view=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Thu Aug 24 11:27:31 2017
@@ -175,7 +175,7 @@ Scripting Core|org.apache.sling.scriptin
 Scripting EL API Wrapper|org.apache.sling.scripting.el-api|1.0.0
 Scripting Java|org.apache.sling.scripting.java|2.1.2
 Scripting JavaScript|org.apache.sling.scripting.javascript|3.0.0
-Scripting JSP|org.apache.sling.scripting.jsp|2.3.0
+Scripting JSP|org.apache.sling.scripting.jsp|2.3.2
 Scripting JSP API Wrapper|org.apache.sling.scripting.jsp-api|1.0.0
 Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.6
 Scripting JST|org.apache.sling.scripting.jst|2.0.6

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1806029&r1=1806028&r2=1806029&view=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Thu Aug 24 11:27:31 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Release: Apache Sling Scripting JSP 2.3.2 (August 24th, 2017)
 * New Releases: Apache Sling Rewriter 1.2.2, Apache Sling Launchpad Base 
5.6.6-2.6.22 (August 17th, 2017)
 * New Release: Apache Sling Event 4.2.6 (August 16th, 2017)
 * New Release: Apache Sling Default POST Servlets 2.3.22 (August 14th, 2017)

svn commit: r21288 - /release/sling/

[cziegeler]

Author: cziegeler
Date: Thu Aug 24 11:26:40 2017
New Revision: 21288

Log:
Scripting JSP 2.3.2

Added:
release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip   
(with props)
release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.asc
release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.md5
release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.sha1
release/sling/org.apache.sling.scripting.jsp-2.3.2-sources.jar   (with 
props)
release/sling/org.apache.sling.scripting.jsp-2.3.2-sources.jar.asc
release/sling/org.apache.sling.scripting.jsp-2.3.2-sources.jar.md5
release/sling/org.apache.sling.scripting.jsp-2.3.2-sources.jar.sha1
release/sling/org.apache.sling.scripting.jsp-2.3.2.jar   (with props)
release/sling/org.apache.sling.scripting.jsp-2.3.2.jar.asc
release/sling/org.apache.sling.scripting.jsp-2.3.2.jar.md5
release/sling/org.apache.sling.scripting.jsp-2.3.2.jar.sha1
release/sling/org.apache.sling.scripting.jsp-2.3.2.pom
release/sling/org.apache.sling.scripting.jsp-2.3.2.pom.asc
release/sling/org.apache.sling.scripting.jsp-2.3.2.pom.md5
release/sling/org.apache.sling.scripting.jsp-2.3.2.pom.sha1
Removed:
release/sling/org.apache.sling.scripting.jsp-2.3.0-source-release.zip
release/sling/org.apache.sling.scripting.jsp-2.3.0-source-release.zip.asc
release/sling/org.apache.sling.scripting.jsp-2.3.0-source-release.zip.md5
release/sling/org.apache.sling.scripting.jsp-2.3.0-source-release.zip.sha1
release/sling/org.apache.sling.scripting.jsp-2.3.0-sources.jar
release/sling/org.apache.sling.scripting.jsp-2.3.0-sources.jar.asc
release/sling/org.apache.sling.scripting.jsp-2.3.0-sources.jar.md5
release/sling/org.apache.sling.scripting.jsp-2.3.0-sources.jar.sha1
release/sling/org.apache.sling.scripting.jsp-2.3.0.jar
release/sling/org.apache.sling.scripting.jsp-2.3.0.jar.asc
release/sling/org.apache.sling.scripting.jsp-2.3.0.jar.md5
release/sling/org.apache.sling.scripting.jsp-2.3.0.jar.sha1
release/sling/org.apache.sling.scripting.jsp-2.3.0.pom
release/sling/org.apache.sling.scripting.jsp-2.3.0.pom.asc
release/sling/org.apache.sling.scripting.jsp-2.3.0.pom.md5
release/sling/org.apache.sling.scripting.jsp-2.3.0.pom.sha1

Added: release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.asc
==
--- release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.asc 
(added)
+++ release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.asc 
Thu Aug 24 11:26:40 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCgAGBQJZmqmAAAoJED/PUp/y8noGFokP/0jMLXZJg/uB9a53WZrbKz07
+FCfq0JPGHSFiH3oPLgbL10gVardftW4hRnBi5a1tm5wFu/rRfWsEBZjtCyFwgvd9
+e3Xqz1XEncS2I5QR3mg7CqjhaMbMN3a6ohtg7KDN9JjYtWdVTD5mhoZW0B6kG41Z
+2mQfjsRAUBADfnsHutx9o6YgFkITnU6jWBW2M6klGHk/Dby5uvWy5J75CUjj7Po1
+93s9EFDMIAXVgDJ/B2yfMkA4Zzl9zpWfHNtNnuGbUJsP11qXN77b/FCjx0H5fSIK
+73Yb+44Mayfj1sWJ5Po6yUV98v10vXtoY5JuoERsZo8e6rf8gXv1sFlJ6ZASKlAo
+tfsFGMxj8m1inVWtEBcluqy08PH4d+3/u3yVEi2RJXtUQwzRdRopenTgPVaR65nU
+dspuermrti52MCcR2cbRQkagFK2K4WkOzy5+FvKsSs+2MkaQi80cmxrFLOsXgLei
+7lbDowuHvBa6b2AIiN6gK6upwvQm1TizNxz+UZXpGsIE4OoR28qdut6k7uK2/8LK
+R8KDM3bBl8hsWE1b3IIthotXIIHvCAF/tOdA5siCc+FaH/Uzf41TXzyJRCsmRx7B
+9nmj2QFFFXBnt7Moxq+1UFBiYCym3RIXFO4tBfnLSfhL87Ni3iIc3wAqgoK1VD79
+bi/hWaS/pVMzogcZxmiC
+=LGtE
+-END PGP SIGNATURE-

Added: release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.md5
==
--- release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.md5 
(added)
+++ release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.md5 
Thu Aug 24 11:26:40 2017
@@ -0,0 +1 @@
+dc4b7008b3d7a4d7086458e16d6ab1b7
\ No newline at end of file

Added: 
release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.sha1
==
--- release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.sha1 
(added)
+++ release/sling/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.sha1 
Thu Aug 24 11:26:40 2017
@@ -0,0 +1 @@
+f97e516fcfef5784f1f3d9ec0e1af36493fc0892
\ No newline at end of file

Added: release/sling/org.apache.sling.scripting.jsp-2.3.2-sources.jar
==
Binary file - no diff

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.7.0_80; Mac OS X 10.12.6)""userId" = "cziegeler""ip" = "91.16.6.110"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2-sources.jar.asc(SHA1: fde4e8a997ddb66447a90375d74c2f3e476a4aea)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2-source-release.zip.asc(SHA1: f290ab717333fd2f02c7c9db4df410c534cece2c)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2.jar.asc(SHA1: 83c7ee577a2974e18d56eeb375ea5dab826ba357)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2-sources.jar(SHA1: c0337d6db5736f7ce9294305593efe477cdfdcfa)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2-source-release.zip(SHA1: f97e516fcfef5784f1f3d9ec0e1af36493fc0892)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2.pom(SHA1: a1d0caea125571cc68d2935bf278cdd809fc919c)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2.jar(SHA1: e501afdd2deb867a8a64acc257d32de22373a334)/org/apache/sling/org.apache.sling.scripting.jsp/2.3.2/org.apache.sling.scripting.jsp-2.3.2.pom.asc(SHA1: 2b6879785ae72b9d9192d331f331cd830e44300c)Action performed by Carsten Ziegeler (cziegeler)

Jenkins build is unstable: sling-tooling-trunk-1.8 #376

[Apache Jenkins Server]

See 

svn commit: r1806027 - /sling/trunk/testing/org.apache.sling.testing.paxexam/README.md

[olli]

Author: olli
Date: Thu Aug 24 11:06:19 2017
New Revision: 1806027

URL: http://svn.apache.org/viewvc?rev=1806027&view=rev
Log:
improve README

Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/README.md

Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/README.md
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/README.md?rev=1806027&r1=1806026&r2=1806027&view=diff
==
--- sling/trunk/testing/org.apache.sling.testing.paxexam/README.md (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/README.md Thu Aug 24 
11:06:19 2017
@@ -17,17 +17,28 @@ Getting Started
 
 Add required dependencies:
 
-
-  junit
-  junit
-  test
-
+
 
   org.apache.sling
   org.apache.sling.testing.paxexam
   ${org.apache.sling.testing.paxexam.version}
   provided
 
+
+
+
+  org.apache.felix
+  org.apache.felix.framework
+  5.6.6
+  test
+
+
+
+
+  junit
+  junit
+  test
+
 
   org.ops4j.pax.exam
   pax-exam
@@ -74,6 +85,7 @@ Configure the build artifact (*bundle*)
   
 
 
+  true
   
 
   bundle.filename

svn commit: r1806025 - in /sling/trunk/tooling/maven/slingstart-maven-plugin: pom.xml src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java

[radu]

Author: radu
Date: Thu Aug 24 11:00:19 2017
New Revision: 1806025

URL: http://svn.apache.org/viewvc?rev=1806025&view=rev
Log:
SLING-7083 - The StopMojo should block until the process is finished

* allowed the mojo to uniformly block until the instances it tries to stop
are either stopped through the control listener or through sending the
terminate signal
* enforced Java 8, since its java.util.concurrent.Process implementation
provides built-in feature for blocking until a process is terminated

Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml?rev=1806025&r1=1806024&r2=1806025&view=diff
==
--- sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml Thu Aug 24 
11:00:19 2017
@@ -33,6 +33,7 @@
 
 3.0.5
 
${project.artifactId}-archives/${project.artifactId}-LATEST
+8
 
 
 
@@ -52,6 +53,27 @@
 
 
 
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+
+enforce-java
+
+enforce
+
+
+
+
+${project.name} must be compiled 
with Java 1.8 or higher.
+
1.${sling.java.version}.0
+
+
+
+
+
+
+
+
 org.codehaus.plexus
 plexus-component-metadata
 1.5.5

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java?rev=1806025&r1=1806024&r2=1806025&view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
 Thu Aug 24 11:00:19 2017
@@ -29,6 +29,7 @@ import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
@@ -294,20 +295,9 @@ public class LauncherCallable implements
 final Process process = cfg.getProcess();
 
 if (!destroy) {
-// as shutdown might block forever, we use a timeout
-final long now = System.currentTimeMillis();
-final long end = now + twoMinutes;
-
 LOG.debug("Waiting for process to stop...");
-
-while (isAlive(process) && (System.currentTimeMillis() < 
end)) {
-try {
-Thread.sleep(2500);
-} catch (InterruptedException e) {
-// ignore
-}
-}
-if (isAlive( process)) {
+process.waitFor(twoMinutes, TimeUnit.MILLISECONDS);
+if (process.isAlive()) {
 LOG.debug("Process timeout out after 2 minutes");
 destroy = true;
 } else {
@@ -318,6 +308,7 @@ public class LauncherCallable implements
 if (destroy) {
 LOG.debug("Destroying process...");
 process.destroy();
+process.waitFor(twoMinutes, TimeUnit.MILLISECONDS);
 LOG.debug("Process destroyed");
 }
 
@@ -328,19 +319,10 @@ public class LauncherCallable implements
 }
 }
 
-private static boolean isAlive(Process process) {
-try {
-process.exitValue();
-return false;
-} catch (IllegalThreadStateException e) {
-return true;
-}
-}
-
 private static File getControlPortFile(final File directory) {
 final File launchpadDir = new File(directory, 
LaunchpadEnvironment.WORK_DIR_NAME);
 final File confDir = new File(launchpadDir, "conf");
 fin

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

[radu]

Author: radu
Date: Thu Aug 24 11:00:13 2017
New Revision: 1806024

URL: http://svn.apache.org/viewvc?rev=1806024&view=rev
Log:
releng: updated sightly dependencies to last released versions

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

Modified: sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt?rev=1806024&r1=1806023&r2=1806024&view=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt Thu Aug 
24 11:00:13 2017
@@ -27,8 +27,8 @@
 org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.0
 org.apache.sling/org.apache.sling.scripting.el-api/1.0.0
 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.6
-org.apache.sling/org.apache.sling.scripting.sightly/1.0.34
-org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.8
+org.apache.sling/org.apache.sling.scripting.sightly/1.0.36
+org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.10
 org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.10
 org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.22
 org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.6

svn commit: r1806016 - in /sling/trunk/contrib/extensions/sling-pipes: pom.xml src/test/java/org/apache/sling/pipes/it/ src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java src/test/java/org/

[olli]

Author: olli
Date: Thu Aug 24 09:38:39 2017
New Revision: 1806016

URL: http://svn.apache.org/viewvc?rev=1806016&view=rev
Log:
SLING-7012 Pipes miss some integration tests

adding IT support and initial IT from Nicolas

Added:

sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/

sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java

sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/PlumberTestIT.java
Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml

Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1806016&r1=1806015&r2=1806016&view=diff
==
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Aug 24 09:38:39 2017
@@ -37,6 +37,7 @@
 
   
 8
+4.11.0
   
 
   
@@ -63,6 +64,38 @@
   
 
   
+  
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+  
+
+  integration-test
+  verify
+
+  
+
+
+  true
+  
+
+  bundle.filename
+  ${basedir}/target/${project.build.finalName}.jar
+
+  
+
+  
+  
+org.apache.servicemix.tooling
+depends-maven-plugin
+
+  
+
+  generate-depends-file
+
+  
+
+  
 
   
 
@@ -153,6 +186,25 @@
   2.7.4
   compile
 
+
+  org.apache.geronimo.specs
+  geronimo-json_1.0_spec
+  1.0-alpha-1
+  provided
+
+
+  org.apache.sling
+  org.apache.sling.commons.johnzon
+  1.0.0
+  test
+
+
+
+  org.apache.felix
+  org.apache.felix.framework
+  5.6.6
+  test
+
 
 
   junit
@@ -172,15 +224,39 @@
   test
 
 
-  org.apache.geronimo.specs
-  geronimo-json_1.0_spec
-  1.0-alpha-1
-  provided
+  org.ops4j.pax.exam
+  pax-exam
+  ${org.ops4j.pax.exam.version}
+  test
+
+
+  org.ops4j.pax.exam
+  pax-exam-cm
+  ${org.ops4j.pax.exam.version}
+  test
+
+
+  org.ops4j.pax.exam
+  pax-exam-container-forked
+  ${org.ops4j.pax.exam.version}
+  test
+
+
+  org.ops4j.pax.exam
+  pax-exam-junit4
+  ${org.ops4j.pax.exam.version}
+  test
+
+
+  org.ops4j.pax.exam
+  pax-exam-link-mvn
+  ${org.ops4j.pax.exam.version}
+  test
 
 
   org.apache.sling
-  org.apache.sling.commons.johnzon
-  1.0.0
+  org.apache.sling.testing.paxexam
+  0.0.4
   test
 
   

Added: 
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java?rev=1806016&view=auto
==
--- 
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
 (added)
+++ 
sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/it/PipesTestSupport.java
 Thu Aug 24 09:38:39 2017
@@ -0,0 +1,90 @@
+/*
+ * 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.pipes.it;
+
+import javax.inject.Inject;
+
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.pipes.Plumber;
+import org.apache.sling.testing.paxexam.TestSupport;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.util.Filter;
+
+import static 
org.apache.sling.testing.paxexam.SlingOptions.slingExtensionDistribution;
+import static 
org.apache.sling.testing.paxexam.

svn commit: r1806010 - /sling/trunk/bundles/commons/metrics-rrd4j/pom.xml

[rombert]

Author: rombert
Date: Thu Aug 24 08:50:25 2017
New Revision: 1806010

URL: http://svn.apache.org/viewvc?rev=1806010&view=rev
Log:
SLING-7077 - Reduce size of RRD4J metrics reporter

Submitted-By: Marcel Reutegger

Modified:
sling/trunk/bundles/commons/metrics-rrd4j/pom.xml

Modified: sling/trunk/bundles/commons/metrics-rrd4j/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics-rrd4j/pom.xml?rev=1806010&r1=1806009&r2=1806010&view=diff
==
--- sling/trunk/bundles/commons/metrics-rrd4j/pom.xml (original)
+++ sling/trunk/bundles/commons/metrics-rrd4j/pom.xml Thu Aug 24 08:50:25 2017
@@ -60,7 +60,7 @@
 sun.nio.ch;resolution:=optional,
 *
 
-rrd4j
+
rrd4j;inline=com/**|org/rrd4j/ConsolFun*|org/rrd4j/DsType*|org/rrd4j/core/**|org/rrd4j/data/**
 
 
 

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

[olli]

Author: olli
Date: Thu Aug 24 08:49:18 2017
New Revision: 1806009

URL: http://svn.apache.org/viewvc?rev=1806009&view=rev
Log:
SLING-7082 Use Commons Lang 3

Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml

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

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

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

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

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

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

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

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

Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1806009&r1=1806008&r2=1806009&view=diff
==
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Aug 24 08:49:18 2017
@@ -124,9 +124,9 @@
   provided
 
 
-  commons-lang
-  commons-lang
-  2.5
+  org.apache.commons
+  commons-lang3
+  3.5
   provided
 
 

Modified: 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java?rev=1806009&r1=1806008&r2=1806009&view=diff
==
--- 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
 (original)
+++ 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java
 Thu Aug 24 08:49:18 2017
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;

Modified: 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java?rev=1806009&r1=1806008&r2=1806009&view=diff
==
--- 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java
 (original)
+++ 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/AuthorizablePipe.java
 Thu Aug 24 08:49:18 2017
@@ -23,7 +23,7 @@ import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.UserManager;

Modified: 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/CustomJsonWriter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/CustomJsonWriter.java?rev=1806009&r1=1806008&r2=1806009&view=diff
==
--- 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/CustomJsonWriter.java
 (original)
+++ 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/CustomJsonWriter.java
 Thu Aug 24 08:49:18 2017
@@ -16,7 +16,7 @@
  */
 package org.apache.sling.pipes.internal;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: 
sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/internal/JsonPipe.java?rev=1806009&r1=1806008&r2=1806009&view=diff
===

svn commit: r1806006 - /sling/trunk/contrib/extensions/sling-pipes/pom.xml

[olli]

Author: olli
Date: Thu Aug 24 08:41:12 2017
New Revision: 1806006

URL: http://svn.apache.org/viewvc?rev=1806006&view=rev
Log:
adjust Servlet API coordinates

Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml

Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1806006&r1=1806005&r2=1806006&view=diff
==
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Aug 24 08:41:12 2017
@@ -81,8 +81,7 @@
 
 
   javax.servlet
-  servlet-api
-  2.5
+  javax.servlet-api
   provided
 
 

svn commit: r1806004 - /sling/trunk/contrib/extensions/sling-pipes/pom.xml

[olli]

Author: olli
Date: Thu Aug 24 08:38:49 2017
New Revision: 1806004

URL: http://svn.apache.org/viewvc?rev=1806004&view=rev
Log:
remove versions from managed dependencies

Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml

Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1806004&r1=1806003&r2=1806004&view=diff
==
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Aug 24 08:38:49 2017
@@ -93,7 +93,6 @@
 
   javax.jcr
   jcr
-  2.0
   provided
 
 
@@ -105,7 +104,6 @@
 
   org.slf4j
   slf4j-api
-  1.6.4
   provided
 
 
@@ -160,7 +158,6 @@
 
   junit
   junit
-  4.11
   test
 
 

svn commit: r1806003 - /sling/trunk/contrib/extensions/sling-pipes/pom.xml

[olli]

Author: olli
Date: Thu Aug 24 08:35:38 2017
New Revision: 1806003

URL: http://svn.apache.org/viewvc?rev=1806003&view=rev
Log:
use Sling Parent 31

Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml

Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1806003&r1=1806002&r2=1806003&view=diff
==
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Aug 24 08:35:38 2017
@@ -24,7 +24,7 @@
   
 org.apache.sling
 sling
-30
+31
 
   
 

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Servlets Resolver 2.4.14Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.7.0_80; Mac OS X 10.12.6)""userId" = "cziegeler""ip" = "193.104.215.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14.pom(SHA1: acd02abe87c9d7c665b8684ba2a6bd7328855e4e)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14-javadoc.jar(SHA1: 8fcf6f808c8d9eade70558a5015868226b11a4d0)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14.pom.asc(SHA1: 2f65b84ea1f53934f85db81fb7fa8b4d8076bcc3)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14-sources.jar.asc(SHA1: 2c6b912247008570e01f4ec0f4b4debbff7c4198)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14-javadoc.jar.asc(SHA1: 269e1d5029e1eb53a738d4e1cded04d17ed5bc82)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14-source-release.zip(SHA1: 01dcd6676c0de84a863d2d789ddf80531c1a581c)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14-sources.jar(SHA1: e2aa0fd7c0442a7139378fac6a0b62d25531954f)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14.jar.asc(SHA1: f295d3e3d9044f3d20f15a577cda9d4575a670fe)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14.jar(SHA1: 7bda077e604ef8dc54d7ecf4ddff2dc2a4ed4f1b)/org/apache/sling/org.apache.sling.servlets.resolver/2.4.14/org.apache.sling.servlets.resolver-2.4.14-source-release.zip.asc(SHA1: f9a6798872fee855883c67a8284d62a67c60228c)Action performed by Carsten Ziegeler (cziegeler)

svn commit: r1805999 - /sling/tags/org.apache.sling.servlets.resolver-2.4.14/

[cziegeler]

Author: cziegeler
Date: Thu Aug 24 08:29:34 2017
New Revision: 1805999

URL: http://svn.apache.org/viewvc?rev=1805999&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.servlets.resolver-2.4.14

Added:
sling/tags/org.apache.sling.servlets.resolver-2.4.14/
  - copied from r1805998, sling/trunk/bundles/servlets/resolver/

svn commit: r1805998 - /sling/trunk/bundles/servlets/resolver/pom.xml

[cziegeler]

Author: cziegeler
Date: Thu Aug 24 08:29:19 2017
New Revision: 1805998

URL: http://svn.apache.org/viewvc?rev=1805998&view=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.servlets.resolver-2.4.14

Modified:
sling/trunk/bundles/servlets/resolver/pom.xml

Modified: sling/trunk/bundles/servlets/resolver/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=1805998&r1=1805997&r2=1805998&view=diff
==
--- sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ sling/trunk/bundles/servlets/resolver/pom.xml Thu Aug 24 08:29:19 2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.servlets.resolver
 bundle
-2.4.13-SNAPSHOT
+2.4.14
 
 Apache Sling Servlet Resolver
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/resolver
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/resolver
-
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlets.resolver-2.4.14
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlets.resolver-2.4.14
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlets.resolver-2.4.14
 
 
 

svn commit: r1806000 - /sling/trunk/bundles/servlets/resolver/pom.xml

[cziegeler]

Author: cziegeler
Date: Thu Aug 24 08:29:36 2017
New Revision: 1806000

URL: http://svn.apache.org/viewvc?rev=1806000&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/servlets/resolver/pom.xml

Modified: sling/trunk/bundles/servlets/resolver/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=1806000&r1=1805999&r2=1806000&view=diff
==
--- sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ sling/trunk/bundles/servlets/resolver/pom.xml Thu Aug 24 08:29:36 2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.servlets.resolver
 bundle
-2.4.14
+2.4.15-SNAPSHOT
 
 Apache Sling Servlet Resolver
 
@@ -37,9 +37,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlets.resolver-2.4.14
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.servlets.resolver-2.4.14
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.servlets.resolver-2.4.14
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/resolver
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/resolver
+
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver
 
 
 

svn commit: r1805996 - /sling/trunk/contrib/extensions/sling-pipes/pom.xml

[olli]

Author: olli
Date: Thu Aug 24 08:13:24 2017
New Revision: 1805996

URL: http://svn.apache.org/viewvc?rev=1805996&view=rev
Log:
adjust OSGi Core coordinates

Modified:
sling/trunk/contrib/extensions/sling-pipes/pom.xml

Modified: sling/trunk/contrib/extensions/sling-pipes/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/pom.xml?rev=1805996&r1=1805995&r2=1805996&view=diff
==
--- sling/trunk/contrib/extensions/sling-pipes/pom.xml (original)
+++ sling/trunk/contrib/extensions/sling-pipes/pom.xml Thu Aug 24 08:13:24 2017
@@ -87,8 +87,7 @@
 
 
   org.osgi
-  org.osgi.core
-  6.0.0
+  osgi.core
   provided