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

[Apache Jenkins Server]

See 

svn commit: r1806875 - in /sling/trunk/tooling/maven: ./ javaversion-maven-plugin/ javaversion-maven-plugin/src/ javaversion-maven-plugin/src/main/ javaversion-maven-plugin/src/main/java/ javaversion-

[rombert]

Author: rombert
Date: Thu Aug 31 22:07:41 2017
New Revision: 1806875

URL: http://svn.apache.org/viewvc?rev=1806875&view=rev
Log:
SLING-7072 - Build failure with Java 9 - unable to create javax script
engine for javascript

Added a basic javaversion-maven-plugin

Added:
sling/trunk/tooling/maven/javaversion-maven-plugin/
sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml
sling/trunk/tooling/maven/javaversion-maven-plugin/src/
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/resources/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/resources/META-INF/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/resources/META-INF/m2e/

sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
Modified:
sling/trunk/tooling/maven/pom.xml

Added: sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml?rev=1806875&view=auto
==
--- sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml (added)
+++ sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml Thu Aug 31 
22:07:41 2017
@@ -0,0 +1,107 @@
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+4.0.0
+
+
+org.apache.sling
+sling
+31
+
+
+
+javaversion-maven-plugin
+maven-plugin
+0.0.1-SNAPSHOT
+Java version Maven plugin
+
+
+3.0.5
+
+6
+
+
+
+
+
+org.apache.maven
+maven-plugin-api
+${maven.version}
+
+
+org.apache.maven
+maven-core
+${maven.version}
+
+
+org.apache.maven.plugin-tools
+maven-plugin-annotations
+3.4
+provided
+
+
+
+
+
+
+org.codehaus.plexus
+plexus-component-metadata
+1.5.5
+
+
+generate-metadata
+
+generate-metadata
+
+
+
+
+
+org.apache.maven.plugins
+maven-plugin-plugin
+
+
+mojo-descriptor
+process-classes
+
+descriptor
+
+
+
+generated-helpmojo
+
+helpmojo
+
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-plugin-plugin
+
+
+
+

Added: 
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java?rev=1806875&view=auto
==
--- 
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
 (added)
+++ 
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
 Thu Aug 31 22:07:41 2017
@@ -0,0 +1,71 @@
+/*
+ * 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 

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

[Apache Jenkins Server]

See 

svn commit: r1806791 - in /sling/whiteboard/cziegeler/feature: ./ src/main/java/org/apache/sling/feature/ src/test/java/org/apache/sling/feature/

[cziegeler]

Author: cziegeler
Date: Thu Aug 31 13:21:28 2017
New Revision: 1806791

URL: http://svn.apache.org/viewvc?rev=1806791&view=rev
Log:
Remove copy of version and version range class

Removed:

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/Version.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/VersionRange.java
Modified:
sling/whiteboard/cziegeler/feature/pom.xml

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java

sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java

Modified: sling/whiteboard/cziegeler/feature/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/pom.xml?rev=1806791&r1=1806790&r2=1806791&view=diff
==
--- sling/whiteboard/cziegeler/feature/pom.xml (original)
+++ sling/whiteboard/cziegeler/feature/pom.xml Thu Aug 31 13:21:28 2017
@@ -65,6 +65,10 @@
 1.0-alpha-1
 provided
 
+
+org.osgi
+osgi.core
+
 
   
 

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java?rev=1806791&r1=1806790&r2=1806791&view=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/ArtifactId.java
 Thu Aug 31 13:21:28 2017
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.feature;
 
+import org.osgi.framework.Version;
+
 /**
  * An artifact identifier.
  *

Modified: 
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java?rev=1806791&r1=1806790&r2=1806791&view=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
 Thu Aug 31 13:21:28 2017
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
+import org.osgi.framework.Version;
 
 public class ArtifactIdTest {
 

Build failed in Jenkins: sling-launchpad-builder-1.8 #10601

[Apache Jenkins Server]

See 


Changes:

[pauls] Update to latest launchpad.base 5.6.8-2.6.24

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H16 (couchdbtest ubuntu xenial) in workspace 

Checking out a fresh workspace because there's no workspace at 

Cleaning local Directory .
Checking out https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder at 
revision '2017-08-31T13:18:30.866 +'
A .gitignore
A src
A src/test
A src/test/java
A src/test/java/org
A src/test/java/org/apache
A src/test/java/org/apache/sling
A src/test/java/org/apache/sling/launchpad
A src/test/java/org/apache/sling/launchpad/package-info.java
A src/test/java/org/apache/sling/launchpad/SmokeIT.java
A src/test/java/org/apache/sling/launchpad/LaunchpadReadyRule.java
A src/main
A src/main/provisioning
AUsrc/main/provisioning/standalone.txt
A src/main/provisioning/repoinit.txt
AUsrc/main/provisioning/oak.txt
AUsrc/main/provisioning/sling-event.txt
A src/main/provisioning/sling-models-jacksonexporter.txt
AUsrc/main/provisioning/sling.txt
AUsrc/main/provisioning/launchpad.txt
AUsrc/main/provisioning/sling-discovery.txt
A src/main/provisioning/composum.txt
A src/main/provisioning/scripting.txt
AUsrc/main/provisioning/boot.txt
AUsrc/main/provisioning/sling-caconfig.txt
A src/main/provisioning/sling-validation.txt
A pom.xml
A README.txt
AUset-sling-snapshots.sh
 U.
At revision 1806790

Parsing POMs
Established TCP socket on 40741
maven33-agent.jar already up to date
maven33-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-launchpad-builder-1.8] $ /home/jenkins/tools/java/latest1.8/bin/java 
-Xmx2g -Xms256m -cp 
/home/jenkins/jenkins-slave/maven33-agent.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/tools/maven/apache-maven-3.3.9/conf/logging
 jenkins.maven3.agent.Maven33Main /home/jenkins/tools/maven/apache-maven-3.3.9 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven33-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 40741
<===[JENKINS REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 
-Dmaven.repo.local=/home/jenkins/jenkins-slave/maven-repositories/0 -U clean 
deploy
[INFO] Scanning for projects...
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/slingstart-maven-plugin/1.7.6/slingstart-maven-plugin-1.7.6.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/org/apache/sling/slingstart-maven-plugin/1.7.6/slingstart-maven-plugin-1.7.6.pom
 (10 KB at 29.9 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/slingstart-maven-plugin/1.7.6/slingstart-maven-plugin-1.7.6.jar
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar
 (0 B at 0.0 KB/sec)
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/org/apache/sling/slingstart-maven-plugin/1.7.6/slingstart-maven-plugin-1.7.6.jar
 (111 KB at 1302.0 KB/sec)
[INFO] Extended Maven classpath (scope 'provided') by the dependencies 
extracted from the Sling model.
[INFO] 
[INFO] 
[INFO] Building Apache Sling Launchpad Application Builder 10-SNAPSHOT
[INFO] 
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom
[WARNING] The POM for 
org.apache.sling:org.apache.sling.launchpad.base:jar:5.6.8-2.6.24 is missing, 
no dependency information available
[WARNING] The POM for 
org.apache.sling:org.apache.sling.launchpad.base:jar:app:5.6.8-2.6.24 is 
missing, no dependency information available
[WARNING] The POM for 
org.apache.sling:org.apache.sling.launchpad.base:war:webapp:5.6.8-2.6.24 is 
missing, no dependency information available
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar
[INFO] Downloading: 
https

svn commit: r1806790 - /sling/whiteboard/cziegeler/feature/readme.md

[cziegeler]

Author: cziegeler
Date: Thu Aug 31 13:02:58 2017
New Revision: 1806790

URL: http://svn.apache.org/viewvc?rev=1806790&view=rev
Log:
Update section about start levels

Modified:
sling/whiteboard/cziegeler/feature/readme.md

Modified: sling/whiteboard/cziegeler/feature/readme.md
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/readme.md?rev=1806790&r1=1806789&r2=1806790&view=diff
==
--- sling/whiteboard/cziegeler/feature/readme.md (original)
+++ sling/whiteboard/cziegeler/feature/readme.md Thu Aug 31 13:02:58 2017
@@ -116,6 +116,10 @@ A feature itself has no special support
 
 For bundles there is no default start level - a default start level is not 
defined in the OSGi spec. And in addition, it is a little bit confusing when 
looking at the model when there is a list of artifacts without a start level. 
Which start level do these have? Its better to be explicit.
 
+In the current PoC, a bundle needs to be explicitely assigned to a start 
level. This seems to be only working if you know all the features in advance 
and how they are structured. On the other hand there needs to be a way to 
define the start order of bundles within a feature. Therefore we can use the 
start level information as an ordering information for the bundles within a 
feature. Bundles within the same start level are started in any order.
+
+Proposal: We use the format as it is today, but interpret the start level 
value different: instead of directly mapping it to a start level in the OSGi 
framework, it defines just the startup order of bundles within a feature. 
Features are then started in respect of their dependency information. Even if a 
feature has no requirement with respect to start ordering of their bundles, it 
has to define a start level (to act as a container for the bundles). It can use 
any positive number, suggested is to use "1"
+
 # Configurations belonging to Bundles
 
 In most cases, configurations belong to a bundle. The most common use case is 
a configuration for a (DS) component. Therefore instead of having a separate 
configurations section, it is more intuitiv to specify configurations as part 
of a bundle. The benefit of this approach is, that it can easily be decided if 
a configuration is to be used: if exactly that bundle is used, the 
configurations are used; otherwise they are not.

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

[pauls]

Author: pauls
Date: Thu Aug 31 13:00:30 2017
New Revision: 1806789

URL: http://svn.apache.org/viewvc?rev=1806789&view=rev
Log:
Update to latest launchpad.base 5.6.8-2.6.24

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

Modified: sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt?rev=1806789&r1=1806788&r2=1806789&view=diff
==
--- sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/launchpad.txt Thu Aug 
31 13:00:30 2017
@@ -20,4 +20,4 @@
 # Only a single artifact is allowed within this feature.
 #
 [feature name=:launchpad]
-org.apache.sling/org.apache.sling.launchpad.base/5.6.6-2.6.22
+org.apache.sling/org.apache.sling.launchpad.base/5.6.8-2.6.24

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

[pauls]

Author: pauls
Date: Thu Aug 31 12:42:45 2017
New Revision: 1017520

Log:
Apache Sling Launchpad Base 5.6.8-2.6.24

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

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

[buildbot]

Author: buildbot
Date: Thu Aug 31 12:41:16 2017
New Revision: 1017519

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 31 12:41:16 2017
@@ -1 +1 @@
-1806694
+1806788

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 31 12:41:16 2017
@@ -952,9 +952,9 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Launchpad Base
-5.6.6-2.6.22
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.md5";>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.md5";>md5)
+5.6.8-2.6.24
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.md5";>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.asc";>asc,
 http://www.apache.org/dist/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.md5";>md5)
 
 
 Launchpad Content
@@ -1556,7 +1556,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1806469 by tomekr on Mon, 28 Aug 2017 16:03:45 +
+Rev. 1806788 by pauls on Thu, 31 Aug 2017 12:40:50 +
   

 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 31 12:41:16 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 Launchpad Base 5.6.8-2.6.24 (August 31st, 
2017)
 New Release: Apache Sling Provisioning Model 1.8.4, Apache Sling 
Slingstart Maven Plugin 1.7.8 (August 28th, 2017)
 New Release: Apache Sling Servlets Resolver 2.4.14 (August 28th, 2017)
 New Release: Apache Sling Commons Scheduler 2.7.0 (August 25th, 2017)
@@ -622,7 +623,7 @@ Apache Sling Scripting Sightly JS Use Pr
 Apache Sling has graduated into a top level project! (June 17, 2009)
 
   
-Rev. 1806469 by tomekr on Mon, 28 Aug 2017 16:03:45 +
+Rev. 1806788 by pauls on Thu, 31 Aug 2017 12:40:50 +
   

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

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

[pauls]

Author: pauls
Date: Thu Aug 31 12:40:50 2017
New Revision: 1806788

URL: http://svn.apache.org/viewvc?rev=1806788&view=rev
Log:
Apache Sling Launchpad Base 5.6.8-2.6.24

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=1806788&r1=1806787&r2=1806788&view=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Thu Aug 31 12:40:50 2017
@@ -130,7 +130,7 @@ JUnit Tests Teleporter|org.apache.sling.
 JUnit Health Checks|org.apache.sling.junit.healthcheck|1.0.6
 Karaf repoinit|org.apache.sling.karaf-repoinit|0.2.0
 Launchpad API|org.apache.sling.launchpad.api|1.1.0
-Launchpad Base|org.apache.sling.launchpad.base|5.6.6-2.6.22
+Launchpad Base|org.apache.sling.launchpad.base|5.6.8-2.6.24
 Launchpad Base - Application 
Launcher|org.apache.sling.launchpad.base|5.6.0-2.6.16|app
 Launchpad Base - Web 
Launcher|org.apache.sling.launchpad.base|5.6.0-2.6.16|webapp|war
 Launchpad Content|org.apache.sling.launchpad.content|2.0.12

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1806788&r1=1806787&r2=1806788&view=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Thu Aug 31 12:40:50 2017
@@ -1,5 +1,6 @@
 Title: News
 
+* New Release: Apache Sling Launchpad Base 5.6.8-2.6.24 (August 31st, 2017)
 * New Release: Apache Sling Provisioning Model 1.8.4, Apache Sling Slingstart 
Maven Plugin 1.7.8 (August 28th, 2017)
 * New Release: Apache Sling Servlets Resolver 2.4.14 (August 28th, 2017)
 * New Release: Apache Sling Commons Scheduler 2.7.0 (August 25th, 2017)
@@ -506,4 +507,4 @@ Apache Sling Scripting Sightly JS Use Pr
 * Apache Sling has graduated into a top level project! (June 17, 2009)
 
 
-  [1]: http://s.apache.org/CVE-2012-2138
+  [1]: http://s.apache.org/CVE-2012-2138
\ No newline at end of file

Nexus: Promotion Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Launchpad Base 5.6.8-2.6.24Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.6)""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.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war(SHA1: 169029e4172eca72f076d7570c70e9528a900920)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar(SHA1: 552d9ef876ae16ab729966629bb11f5a97467317)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar(SHA1: d9fbdc7c1eacbf91d396972d5d21e469e39975cf)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc(SHA1: 278492ec17305cf20330609453326954cfdee798)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.asc(SHA1: 0253e172031e3f959129ef9433eb4857855ac2d7)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar(SHA1: 8dc39e0a0bc8e4e0ea0d575b004155477e7fa3ed)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.asc(SHA1: 8daf019e66f0a64886edb7352ae2486f08c96c50)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.asc(SHA1: 45ac248358774d49f124158a7fcc253f9f4ddb3a)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.asc(SHA1: 146392c384bcd5caa5fc265a079937d156495ffd)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom(SHA1: 9bbb14d64cf141de1a62d55c6392c57cb76e97d5)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.asc(SHA1: f99e065ca12c68979a42d266aff9205bf533260c)/org/apache/sling/org.apache.sling.launchpad.base/5.6.8-2.6.24/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip(SHA1: b59792df100131633b801fef614908d9b5d3ebe8)Action performed by Karl Pauls (pauls)

svn commit: r21380 - /release/sling/

[pauls]

Author: pauls
Date: Thu Aug 31 12:35:17 2017
New Revision: 21380

Log:
Add the Apache Sling Launchpad Base 5.6.8-2.6.24 release.

Added:
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar   (with 
props)
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.md5
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.sha1

release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip   
(with props)

release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.asc

release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.md5

release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-source-release.zip.sha1
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar   
(with props)
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.asc
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.md5
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-sources.jar.sha1
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war   
(with props)
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.asc
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.md5
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-webapp.war.sha1
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar   (with 
props)
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.asc
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.md5
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.jar.sha1
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.asc
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.md5
release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24.pom.sha1
Removed:
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar.asc
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar.md5
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-app.jar.sha1

release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip

release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.asc

release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.md5

release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-source-release.zip.sha1
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar.asc
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar.md5
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-sources.jar.sha1
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war.asc
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war.md5
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22-webapp.war.sha1
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.asc
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.md5
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.jar.sha1
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom.asc
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom.md5
release/sling/org.apache.sling.launchpad.base-5.6.6-2.6.22.pom.sha1

Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc
==
--- release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc 
(added)
+++ release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.asc Thu 
Aug 31 12:35:17 2017
@@ -0,0 +1,6 @@
+-BEGIN PGP SIGNATURE-
+
+iF0EABECAB0WIQQ+l5eSKeAd+rl3S7yQVII6hZpyNwUCWaQ2IwAKCRCQVII6hZpy
+N9sJAKCXuXRDG9HAr+P5igHbsIu+2y+XFgCfV6B4Tn4EJADPqgN4DL/5nOQKiok=
+=XFa4
+-END PGP SIGNATURE-

Added: release/sling/org.apache.sling.launchpad.base-5.6.8-2.6.24-app.jar.md5
==
--- release/

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Scripting _javascript_ 3.0.2, Apache Sling Scripting HTL JS Use Provider 1.0.24Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_131; Mac OS X 10.13)""userId" = "radu""ip" = "193.104.215.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24-source-release.zip.asc(SHA1: be61ff6de14f643bb7d3c184dc59ce26d8db22b2)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24.jar(SHA1: 5e686d09ab5adf7557bb517d1df653ea7264d50f)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24.pom(SHA1: 6d3d8e91af5e3442d71e336d0d34d9dae202904a)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24.pom.asc(SHA1: d297c83c89b3c8149a7eb1f8c79c64fd80a15c2a)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24.jar.asc(SHA1: b672d2d43fee5bd3dbb48883e2d26e608b5e2d7b)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24-sources.jar.asc(SHA1: 2cb0ec548647b710079b6ba4d02772cb4ab471fa)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24-source-release.zip(SHA1: 0878222fa8a0247afadef5094a364ba3fb0d74ba)/org/apache/sling/org.apache.sling.scripting.sightly.js.provider/1.0.24/org.apache.sling.scripting.sightly.js.provider-1.0.24-sources.jar(SHA1: a523cec715958d68d556bd99e09b275fcb33fcd2)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2.jar(SHA1: f6b2a575c016dd8d96f04f2c799123bb834e062f)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2-sources.jar.asc(SHA1: 58818277550f324490a1762721d9bb7308fa2d32)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2.pom(SHA1: db331af2dc3a07909317d792fa581e0c17d539c8)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2-javadoc.jar(SHA1: e0b6bb5bbad2f863f4d7caac033145b89b857d35)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2.pom.asc(SHA1: d5b13672436e5f8eb37c759481fd6620ebf5a488)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2-source-release.zip.asc(SHA1: 397aaa335febc3841d057be5a6dd9f849bc68083)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2-sources.jar(SHA1: 27e39b72977b4205075351491aa571a5ec3ebc56)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2-source-release.zip(SHA1: f802863f6cec9a3b9f5e7da069e7150b41fb6f18)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2.jar.asc(SHA1: e9dcdd86eae7a71489371e37d84af4b8da54b3ed)/org/apache/sling/org.apache.sling.scripting._javascript_/3.0.2/org.apache.sling.scripting._javascript_-3.0.2-javadoc.jar.asc(SHA1: 59b5bf7ba31ca252b2cc226153119389f812af9a)Action performed by Radu Cotescu (radu)

svn commit: r1806777 - /sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24/

[radu]

Author: radu
Date: Thu Aug 31 09:30:29 2017
New Revision: 1806777

URL: http://svn.apache.org/viewvc?rev=1806777&view=rev
Log:
[maven-release-plugin] copy for tag 
org.apache.sling.scripting.sightly.js.provider-1.0.24

Added:
sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24/
  - copied from r1806776, 
sling/trunk/bundles/scripting/sightly/js-use-provider/

svn commit: r1806778 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

[radu]

Author: radu
Date: Thu Aug 31 09:30:32 2017
New Revision: 1806778

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

Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1806778&r1=1806777&r2=1806778&view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Thu Aug 31 
09:30:32 2017
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.scripting.sightly.js.provider
-1.0.24
+1.0.25-SNAPSHOT
 bundle
 
 Apache Sling Scripting HTL JavaScript Use Provider
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24
-
http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
+
http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
 
 
 

svn commit: r1806776 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

[radu]

Author: radu
Date: Thu Aug 31 09:30:16 2017
New Revision: 1806776

URL: http://svn.apache.org/viewvc?rev=1806776&view=rev
Log:
[maven-release-plugin] prepare release 
org.apache.sling.scripting.sightly.js.provider-1.0.24

Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1806776&r1=1806775&r2=1806776&view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Thu Aug 31 
09:30:16 2017
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.scripting.sightly.js.provider
-1.0.23-SNAPSHOT
+1.0.24
 bundle
 
 Apache Sling Scripting HTL JavaScript Use Provider
@@ -43,9 +43,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
-
http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24
+
http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.24
 
 
 
@@ -71,7 +71,7 @@
 
/libs/sling/sightly/js;path:=/SLING-INF/libs/sling/sightly/js
 
 io.sightly; 
filter:="(&(version>=1.0)(!(version>=2.0)))",
-
osgi.implementation;filter:="(&(osgi.implementation=org.apache.sling.scripting.javascript.rhinoscriptengine)(version>=1.7.7.1)(!(version>=2.0.0)))"
+
osgi.implementation;filter:="(&(osgi.implementation=org.apache.sling.scripting.javascript.rhinoscriptengine)(version>=1.7.7.1)(!(version>=2.0.0)))"
 
 
 
@@ -142,14 +142,14 @@
 org.apache.sling
 org.apache.sling.scripting.sightly
 
-1.0.35-SNAPSHOT
+1.0.34
 provided
 
 
 org.apache.sling
 
org.apache.sling.scripting.sightly.compiler.java
 
-1.0.11-SNAPSHOT
+1.0.10
 provided
 
 

Jenkins build became unstable: sling-bundles-scripting-sightly-testing-1.8 #101

[Apache Jenkins Server]

See 

svn commit: r1806772 - /sling/tags/org.apache.sling.scripting.javascript-3.0.2/

[radu]

Author: radu
Date: Thu Aug 31 09:08:42 2017
New Revision: 1806772

URL: http://svn.apache.org/viewvc?rev=1806772&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.scripting.javascript-3.0.2

Added:
sling/tags/org.apache.sling.scripting.javascript-3.0.2/
  - copied from r1806771, sling/trunk/bundles/scripting/javascript/

svn commit: r1806773 - /sling/trunk/bundles/scripting/javascript/pom.xml

[radu]

Author: radu
Date: Thu Aug 31 09:08:45 2017
New Revision: 1806773

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

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1806773&r1=1806772&r2=1806773&view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Aug 31 09:08:45 2017
@@ -29,16 +29,16 @@
 
 
 org.apache.sling.scripting.javascript
-3.0.2
+3.0.3-SNAPSHOT
 bundle
 
 Apache Sling Scripting JavaScript Support
 Support for JavaScript scripting
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-3.0.2
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-3.0.2
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-3.0.2
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
+
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript
 
 
 

svn commit: r1806771 - /sling/trunk/bundles/scripting/javascript/pom.xml

[radu]

Author: radu
Date: Thu Aug 31 09:08:29 2017
New Revision: 1806771

URL: http://svn.apache.org/viewvc?rev=1806771&view=rev
Log:
[maven-release-plugin] prepare release 
org.apache.sling.scripting.javascript-3.0.2

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1806771&r1=1806770&r2=1806771&view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Aug 31 09:08:29 2017
@@ -29,16 +29,16 @@
 
 
 org.apache.sling.scripting.javascript
-3.0.1-SNAPSHOT
+3.0.2
 bundle
 
 Apache Sling Scripting JavaScript Support
 Support for JavaScript scripting
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript
-
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-3.0.2
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-3.0.2
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-3.0.2
 
 
 

svn commit: r1806768 - in /sling/trunk/bundles/scripting: javascript/pom.xml sightly/js-use-provider/pom.xml sightly/testing/src/main/provisioning/model.txt

[radu]

Author: radu
Date: Thu Aug 31 08:54:10 2017
New Revision: 1806768

URL: http://svn.apache.org/viewvc?rev=1806768&view=rev
Log:
SLING-7093 - The JavaScript Use Provider should define an explicit dependency 
to the o.a.s.scripting.javascript bundle

* defined capabilities headers in both bundles

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml
sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

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

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1806768&r1=1806767&r2=1806768&view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Aug 31 08:54:10 2017
@@ -62,6 +62,9 @@
 
 
org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/PropertiesUtil.*"
 
+
+
osgi.implementation;osgi.implementation="org.apache.sling.scripting.javascript.rhinoscriptengine";version:Version="1.7.7.1"
+
 <_removeheaders>
   Embed-Dependency,
   Private-Package,

Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1806768&r1=1806767&r2=1806768&view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Thu Aug 31 
08:54:10 2017
@@ -69,7 +69,10 @@
 true
 
 
/libs/sling/sightly/js;path:=/SLING-INF/libs/sling/sightly/js
-io.sightly; 
filter:="(&(version>=1.0)(!(version>=2.0)))"
+
+io.sightly; 
filter:="(&(version>=1.0)(!(version>=2.0)))",
+
osgi.implementation;filter:="(&(osgi.implementation=org.apache.sling.scripting.javascript.rhinoscriptengine)(version>=1.7.7.1)(!(version>=2.0.0)))"
+
 
 
 

Modified: 
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1806768&r1=1806767&r2=1806768&view=diff
==
--- 
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt 
(original)
+++ 
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt 
Thu Aug 31 08:54:10 2017
@@ -24,6 +24,7 @@
   org.apache.sling/org.apache.sling.scripting.sightly.compiler
   org.apache.sling/org.apache.sling.scripting.sightly.compiler.java
   org.apache.sling/org.apache.sling.scripting.sightly
+  org.apache.sling/org.apache.sling.scripting.javascript/3.0.1-SNAPSHOT
   org.apache.sling/org.apache.sling.scripting.sightly.js.provider
   org.apache.sling/org.apache.sling.scripting.sightly.models.provider
   org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.5-SNAPSHOT

svn commit: r1806769 - /sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java

[radu]

Author: radu
Date: Thu Aug 31 08:54:17 2017
New Revision: 1806769

URL: http://svn.apache.org/viewvc?rev=1806769&view=rev
Log:
SLING-7094 - The script factories in the JS Use Provider are not always 
installed in the correct order

* switched to a LinkedHashMap for storing the factories and the namespaces they 
define

Modified:

sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java

Modified: 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java?rev=1806769&r1=1806768&r2=1806769&view=diff
==
--- 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java
 Thu Aug 31 08:54:17 2017
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
@@ -86,7 +87,8 @@ public class SlyBindingsValuesProvider {
 @AttributeDefinition(
 name = "Script Factories",
 description = "Script factories to load in the bindings map. 
The entries should be in the form " +
-"'namespace:/path/from/repository'."
+"'namespace:/path/from/repository'. If the factories 
depend on each other, add them in the correct order of their" +
+" dependency chain."
 
 )
 String[] org_apache_sling_scripting_sightly_js_bindings() default 
"sightly:" + SlyBindingsValuesProvider.SLING_NS_PATH;
@@ -157,7 +159,7 @@ public class SlyBindingsValuesProvider {
 configuration.org_apache_sling_scripting_sightly_js_bindings(),
 new String[]{SLING_NS_PATH}
 );
-scriptPaths = new HashMap<>(factories.length);
+scriptPaths = new LinkedHashMap<>(factories.length);
 for (String f : factories) {
 String[] parts = f.split(":");
 if (parts.length == 2) {