Nexus: Promotion Completed

2017-09-01 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.6)""userId" = "npeltier""ip" = "83.112.205.10"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4-javadoc.jar(SHA1: 34f0bd2b2e9d503b8afcf9626eac7ade873d0c0e)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4-sources.jar(SHA1: e01a123b6a4b189e50a16eee0d6c6f0fee69956e)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4.pom.asc(SHA1: b68e18a75bd3be2481a2ee483c2bc13f438b2a59)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4-sources.jar.asc(SHA1: a294bc53af81814e986f72d3393dccf58cff2a9a)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4-source-release.zip.asc(SHA1: a7dbe10c22b9e8dd93e1af009b89945de7a685b9)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4-javadoc.jar.asc(SHA1: 67b5066f3809f2e60f8a197b4163a187b4f179e1)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4-source-release.zip(SHA1: 3ae9a9b6c7460cb7b565e490d0d3637242fe7e1e)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4.pom(SHA1: efae164ca605f5e5d63b7a59b725134cb7e5284e)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4.jar.asc(SHA1: ae5b96fdc8b0190c4186f983983adb298d7cae89)/org/apache/sling/org.apache.sling.pipes/1.0.4/org.apache.sling.pipes-1.0.4.jar(SHA1: f3b9b16ed4c60191b690cbba46ed048833befd13)Action performed by Oliver Lietz (olli)

svn commit: r21403 - /release/sling/

2017-09-01 Thread olli 
Author: olli
Date: Fri Sep  1 17:36:26 2017
New Revision: 21403

Log:
Pipes 1.0.4

Added:
release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar   (with props)
release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.asc
release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.md5
release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.sha1
release/sling/org.apache.sling.pipes-1.0.4-source-release.zip   (with props)
release/sling/org.apache.sling.pipes-1.0.4-source-release.zip.asc
release/sling/org.apache.sling.pipes-1.0.4-source-release.zip.md5
release/sling/org.apache.sling.pipes-1.0.4-source-release.zip.sha1
release/sling/org.apache.sling.pipes-1.0.4-sources.jar   (with props)
release/sling/org.apache.sling.pipes-1.0.4-sources.jar.asc
release/sling/org.apache.sling.pipes-1.0.4-sources.jar.md5
release/sling/org.apache.sling.pipes-1.0.4-sources.jar.sha1
release/sling/org.apache.sling.pipes-1.0.4.jar   (with props)
release/sling/org.apache.sling.pipes-1.0.4.jar.asc
release/sling/org.apache.sling.pipes-1.0.4.jar.md5
release/sling/org.apache.sling.pipes-1.0.4.jar.sha1
release/sling/org.apache.sling.pipes-1.0.4.pom
release/sling/org.apache.sling.pipes-1.0.4.pom.asc
release/sling/org.apache.sling.pipes-1.0.4.pom.md5
release/sling/org.apache.sling.pipes-1.0.4.pom.sha1
Removed:
release/sling/org.apache.sling.pipes-0.0.10-javadoc.jar
release/sling/org.apache.sling.pipes-0.0.10-javadoc.jar.asc
release/sling/org.apache.sling.pipes-0.0.10-javadoc.jar.md5
release/sling/org.apache.sling.pipes-0.0.10-javadoc.jar.sha1
release/sling/org.apache.sling.pipes-0.0.10-source-release.zip
release/sling/org.apache.sling.pipes-0.0.10-source-release.zip.asc
release/sling/org.apache.sling.pipes-0.0.10-source-release.zip.md5
release/sling/org.apache.sling.pipes-0.0.10-source-release.zip.sha1
release/sling/org.apache.sling.pipes-0.0.10-sources.jar
release/sling/org.apache.sling.pipes-0.0.10-sources.jar.asc
release/sling/org.apache.sling.pipes-0.0.10-sources.jar.md5
release/sling/org.apache.sling.pipes-0.0.10-sources.jar.sha1
release/sling/org.apache.sling.pipes-0.0.10.jar
release/sling/org.apache.sling.pipes-0.0.10.jar.asc
release/sling/org.apache.sling.pipes-0.0.10.jar.md5
release/sling/org.apache.sling.pipes-0.0.10.jar.sha1
release/sling/org.apache.sling.pipes-0.0.10.pom
release/sling/org.apache.sling.pipes-0.0.10.pom.asc
release/sling/org.apache.sling.pipes-0.0.10.pom.md5
release/sling/org.apache.sling.pipes-0.0.10.pom.sha1

Added: release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar
==
Binary file - no diff available.

Propchange: release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar
--
svn:mime-type = application/octet-stream

Added: release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.asc
==
--- release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.asc (added)
+++ release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.asc Fri Sep  1 
17:36:26 2017
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+
+iQEzBAABCgAdFiEEG0BFGC9fXj7BhdFMGu76mQETVa4FAlmlziIACgkQGu76mQET
+Va5K6QgAoZ6T4E55bUOFV8QxTk6s4SaNCmo2kiUYjuInsC8Ip8IHGHbllyWZ1hJt
+Nkv68puPt4RnDp9f73iAyHNuk/8wFrS2nCj9oxuLsnH7SSNPOYqkUStPRpBLWXdS
+jzDfrtzqegZG5hOPQTKZkW7AonStSmDDmTRtqEUqngAYF0yM5uQQ7rBX8l4uCy0x
+CELqdMLrcGKrUBq4hMiKNWmCCDi7qIrllIBcpfgsNXAaFQVGS0PpcQT9dHsPv6M1
+30cafZJrRKRxFfDhtPJw4PL1FEw9V7ssouERvVcpUvLBRaf0Q7MrP2qxPCCgVja4
+oClotI1n5mjs/CJArlexB/GHwEC8Tw==
+=CbG5
+-END PGP SIGNATURE-

Added: release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.md5
==
--- release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.md5 (added)
+++ release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.md5 Fri Sep  1 
17:36:26 2017
@@ -0,0 +1 @@
+3e0c99fc7eebc3e7880b695027460361
\ No newline at end of file

Added: release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.sha1
==
--- release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.sha1 (added)
+++ release/sling/org.apache.sling.pipes-1.0.4-javadoc.jar.sha1 Fri Sep  1 
17:36:26 2017
@@ -0,0 +1 @@
+34f0bd2b2e9d503b8afcf9626eac7ade873d0c0e
\ No newline at end of file

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

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

Added:

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

2017-09-01 Thread cziegeler 
Author: cziegeler
Date: Fri Sep  1 15:27:34 2017
New Revision: 1806981

URL: http://svn.apache.org/viewvc?rev=1806981=rev
Log:
Introduce builder context

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=1806981=1806980=1806981=diff
==
--- sling/whiteboard/cziegeler/feature/readme.md (original)
+++ sling/whiteboard/cziegeler/feature/readme.md Fri Sep  1 15:27:34 2017
@@ -101,6 +101,8 @@ Once a feature is processed, included re
 * repoinit is just aggregated (appended)
 * artifact extensions are handled like bundles
 
+While includes must not be used for assembling an application, they provide an 
important concept for manipulating existing features. For example to replace a 
bundle in an existing feature and deliver this modified feature.
+
 # Extensions
 
 An extension has a unique name and a type which can either be text, JSON or 
artifacts. Depending on the type, inheritance is performed like this:

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

2017-09-01 Thread npeltier 
Author: npeltier
Date: Fri Sep  1 15:17:06 2017
New Revision: 1017566

Log:
Publishing svnmucc operation to sling site by npeltier

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

svn commit: r1806977 - in /sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process: BuilderContext.java FeatureExtensionHandler.java

2017-09-01 Thread cziegeler 
Author: cziegeler
Date: Fri Sep  1 15:16:05 2017
New Revision: 1806977

URL: http://svn.apache.org/viewvc?rev=1806977=rev
Log:
Introduce builder context

Modified:

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java?rev=1806977=1806976=1806977=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
 Fri Sep  1 15:16:05 2017
@@ -19,6 +19,10 @@ package org.apache.sling.feature.process
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Builder context holds services used by {@link ApplicationBuilder}
+ * and {@link FeatureBuilder}.
+ */
 public class BuilderContext {
 
 private final FeatureProvider provider;

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java?rev=1806977=1806976=1806977=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java
 Fri Sep  1 15:16:05 2017
@@ -18,6 +18,10 @@ package org.apache.sling.feature.process
 
 import org.apache.sling.feature.Feature;
 
+/**
+ * A feature extension handler can merge a feature of a particular type
+ * and also post process the final assembled feature.
+ */
 public interface FeatureExtensionHandler {
 
 /**

svn commit: r1806976 - /sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java

2017-09-01 Thread cziegeler 
Author: cziegeler
Date: Fri Sep  1 15:14:42 2017
New Revision: 1806976

URL: http://svn.apache.org/viewvc?rev=1806976=rev
Log:
Introduce builder context

Added:

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
   (with props)

Added: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java?rev=1806976=auto
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
 (added)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
 Fri Sep  1 15:14:42 2017
@@ -0,0 +1,63 @@
+/*
+ * 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.feature.process;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BuilderContext {
+
+private final FeatureProvider provider;
+
+private final List featureExtensionHandlers = new 
ArrayList<>();
+
+/**
+ * Assemble the full feature by processing all includes.
+ *
+ * @param feature The feature to start
+ * @param provider A provider providing the included features
+ * @param extensionMergers Optional feature mergers
+ * @return The assembled feature.
+ * @throws IllegalArgumentException If feature or provider is {@code null}
+ * @throws IllegalStateException If an included feature can't be provided 
or merged.
+ */
+public BuilderContext(final FeatureProvider provider) {
+if ( provider == null ) {
+throw new IllegalArgumentException("Provider must not be null");
+}
+this.provider = provider;
+}
+
+FeatureProvider getFeatureProvider() {
+return this.provider;
+}
+
+List getFeatureExtensionHandlers() {
+return this.featureExtensionHandlers;
+}
+
+public BuilderContext add(final FeatureExtensionHandler handler) {
+featureExtensionHandlers.add(handler);
+return this;
+}
+
+BuilderContext clone(final FeatureProvider featureProvider) {
+final BuilderContext ctx = new BuilderContext(featureProvider);
+ctx.featureExtensionHandlers.addAll(featureExtensionHandlers);
+return ctx;
+}
+}

Propchange: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
--
svn:eol-style = native

Propchange: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderContext.java
--
svn:keywords = author date id revision rev url

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

2017-09-01 Thread cziegeler 
Author: cziegeler
Date: Fri Sep  1 15:14:31 2017
New Revision: 1806975

URL: http://svn.apache.org/viewvc?rev=1806975=rev
Log:
Introduce builder context

Modified:

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java

sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java?rev=1806975=1806974=1806975=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
 Fri Sep  1 15:14:31 2017
@@ -39,29 +39,29 @@ public class ApplicationBuilder {
  * is ignored.
  *
  * @param app The optional application to use as a base.
- * @param provider The provider to resolve features.
+ * @param context The builder context
  * @param featureIds The feature ids
  * @return The application
- * throws IllegalArgumentException If provider or featureIds is {@code 
null}
+ * throws IllegalArgumentException If context or featureIds is {@code null}
  * throws IllegalStateException If the provided ids are invalid, or the 
feature can't be provided
  */
 public static Application assemble(final Application app,
-final FeatureProvider provider,
+final BuilderContext context,
 final String... featureIds) {
-if ( featureIds == null || provider == null ) {
-throw new IllegalArgumentException("Features and/or provider must 
not be null");
+if ( featureIds == null || context == null ) {
+throw new IllegalArgumentException("Features and/or context must 
not be null");
 }
 
 final Feature[] features = new Feature[featureIds.length];
 int index = 0;
 for(final String id : featureIds) {
-features[index] = provider.provide(ArtifactId.fromMvnId(id));
+features[index] = 
context.getFeatureProvider().provide(ArtifactId.fromMvnId(id));
 if ( features[index] == null ) {
 throw new IllegalStateException("Unable to find included 
feature " + id);
 }
 index++;
 }
-return assemble(app, provider, features);
+return assemble(app, context, features);
 }
 
 /**
@@ -72,18 +72,18 @@ public class ApplicationBuilder {
  * is ignored.
  *
  * @param app The optional application to use as a base.
- * @param provider The provider to resolve features.
+ * @param context The builder context
  * @param features The features
  * @return The application
- * throws IllegalArgumentException If provider or featureIds is {@code 
null}
+ * throws IllegalArgumentException If context or featureIds is {@code null}
  * throws IllegalStateException If a feature can't be provided
  */
 public static Application assemble(
 Application app,
-final FeatureProvider provider,
+final BuilderContext context,
 final Feature... features) {
-if ( features == null || provider == null ) {
-throw new IllegalArgumentException("Features and/or provider must 
not be null");
+if ( features == null || context == null ) {
+throw new IllegalArgumentException("Features and/or context must 
not be null");
 }
 
 if ( app == null ) {
@@ -117,7 +117,7 @@ public class ApplicationBuilder {
 for(final Map.Entry entry : 
upgrades.entrySet()) {
 final Feature assembled = FeatureBuilder.assemble(entry.getKey(),
 entry.getValue(),
-provider);
+context);
 // update feature to assembled feature
 sortedFeatureList.remove(entry.getKey());
 sortedFeatureList.add(assembled);
@@ -128,7 +128,7 @@ public class ApplicationBuilder {
 
 // assemble
 for(final Feature f : sortedFeatureList) {
-final Feature assembled = FeatureBuilder.assemble(f, new 
FeatureProvider() {
+final Feature assembled = FeatureBuilder.assemble(f, 
context.clone(new FeatureProvider() {
 
 @Override
 public Feature provide(final ArtifactId id) {
@@ -142,9 +142,9 @@ public class ApplicationBuilder {

svn commit: r1806972 - in /sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process: ApplicationBuilder.java BuilderUtil.java FeatureBuilder.java FeatureExtensionHandler.java

2017-09-01 Thread cziegeler 
Author: cziegeler
Date: Fri Sep  1 15:02:41 2017
New Revision: 1806972

URL: http://svn.apache.org/viewvc?rev=1806972=rev
Log:
Add feature extension handler

Added:

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureExtensionHandler.java
   (with props)
Modified:

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/FeatureBuilder.java

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java?rev=1806972=1806971=1806972=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/ApplicationBuilder.java
 Fri Sep  1 15:02:41 2017
@@ -16,16 +16,16 @@
  */
 package org.apache.sling.feature.process;
 
-import org.apache.sling.feature.Application;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Feature;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+
 /**
  * Build an application based on features.
  */
@@ -156,6 +156,6 @@ public class ApplicationBuilder {
 BuilderUtil.mergeBundles(target.getBundles(), source.getBundles(), 
BuilderUtil.ArtifactMerge.HIGHEST);
 BuilderUtil.mergeConfigurations(target.getConfigurations(), 
source.getConfigurations());
 BuilderUtil.mergeFrameworkProperties(target.getFrameworkProperties(), 
source.getFrameworkProperties());
-BuilderUtil.mergeExtensions(target.getExtensions(), 
source.getExtensions(), BuilderUtil.ArtifactMerge.HIGHEST);
+BuilderUtil.mergeExtensions(target, source, 
BuilderUtil.ArtifactMerge.HIGHEST);
 }
 }

Modified: 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java?rev=1806972=1806971=1806972=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/process/BuilderUtil.java
 Fri Sep  1 15:02:41 2017
@@ -16,27 +16,29 @@
  */
 package org.apache.sling.feature.process;
 
+import java.io.StringReader;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonStructure;
+import javax.json.JsonValue;
+import javax.json.JsonValue.ValueType;
+
+import org.apache.sling.feature.Application;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Bundles;
 import org.apache.sling.feature.Capability;
 import org.apache.sling.feature.Configuration;
 import org.apache.sling.feature.Configurations;
 import org.apache.sling.feature.Extension;
-import org.apache.sling.feature.Extensions;
+import org.apache.sling.feature.Feature;
 import org.apache.sling.feature.KeyValueMap;
 import org.apache.sling.feature.Requirement;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonStructure;
-import javax.json.JsonValue;
-import javax.json.JsonValue.ValueType;
-import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Utility methods for the builders
  */
@@ -114,80 +116,118 @@ class BuilderUtil {
 }
 }
 
-// extensions (add/merge)
-static void mergeExtensions(final Extensions target,
-final Extensions source,
+// default merge for extensions
+static void mergeExtensions(final Extension target,
+final Extension source,
 final ArtifactMerge artifactMergeAlg) {
-for(final Extension ext : source) {
+switch ( target.getType() ) {
+case TEXT : // simply append
+target.setText(target.getText() + "\n" + 
source.getText());
+break;
+case JSON : final JsonStructure struct1;
+try ( final StringReader reader = new 
StringReader(target.getJSON()) ) {
+

svn commit: r1017563 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/sling-pipes.html

2017-09-01 Thread buildbot 
Author: buildbot
Date: Fri Sep  1 15:00:17 2017
New Revision: 1017563

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)
websites/staging/sling/trunk/content/documentation/bundles/sling-pipes.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep  1 15:00:17 2017
@@ -1 +1 @@
-1806960
+1806970

Modified: 
websites/staging/sling/trunk/content/documentation/bundles/sling-pipes.html
==
--- websites/staging/sling/trunk/content/documentation/bundles/sling-pipes.html 
(original)
+++ websites/staging/sling/trunk/content/documentation/bundles/sling-pipes.html 
Fri Sep  1 15:00:17 2017
@@ -166,7 +166,7 @@ h2:hover > .headerlink, h3:hover > .head
 Plumber can provider a PipeBuilder with newPipe(ResourceResolver 
resolver) API, that gives a fluent 
 API to quickly configure and run pipes.
 e.g. 
-`plumber.newPipe(resolver).xpath(//element(*,nt:unstructured)[@sling:resourceType=to/delete]).rm().run();`
+plumber.newPipe(resolver).xpath(//element(*,nt:unstructured)[@sling:resourceType=to/delete]).rm().run();
 
 
 
@@ -182,7 +182,10 @@ e.g. 
 conf(Object...) add an extra configuration node with 
key/value properties/values
 
 note that that configuration part has shortcuts for some pipes. Typically, 
above sample is a shorter equivalent of 
-plumber.newPipe(resolver).pipe('slingPipes/xpath').expr('//element(*,nt:unstructured)[@sling:resourceType='to/delete']").pipe('slingPipes/rm').run();
+plumber.newPipe(resolver).pipe(slingPipes/xpath).expr(//element(*,nt:unstructured)[@sling:resourceType=to/delete]).pipe(slingPipes/rm).run();
+
+
+
 when available, shortcuts will be specified next to each pipe type 
documentation.
 Once you are happy with the pipe you have created, you can terminate the 
builder with following command:
 
@@ -205,7 +208,10 @@ e.g. 
 
 which will return you the path of the resources that have been through the 
output of the configured pipe.
 In the eventuality of a long execution (synchronous or asynchronous), you 
can retrieve the status of a pipe, by executing
-GET /etc/pipes/mySamplePipe.status.json
+GET /etc/pipes/mySamplePipe**.status**.json
+
+
+
 Request Parameter binding
 you can add as bindings parameter a json object of global 
bindings you want to add for the execution of the pipe
 e.g.
@@ -227,7 +233,10 @@ object are expressions and can reuse eac
 
 
 will returns something similar to
-{"size":2, "items":[{'user':'John 
Smith','path':'/home/users/q/q123jk1UAZS'},{'user':'John 
Doe','path':'/home/users/q/q153jk1UAZS'}]}
+{size:2, 
items:[{user:John Smith,path:/home/users/q/q123jk1UAZS},{user:John Doe,path:/home/users/q/q153jk1UAZS}]}
+
+
+
 Request Parameter dryRun
 if parameter dryRun is set to true, and the executed pipe is supposed to 
modify content, it will log (at best it can) the change it would have 
done, without doing anything
 Request Parameter size
@@ -367,7 +376,7 @@ is the path of the current resource of p
 sample configurations
 slingQuery | write
 write repository user prefix Ms/Mr depending on gender
-  
.newPipe(resolver).xpath(/jcr:root/home/users//element(*,rep:Users))
+  
plumber.newPipe(resolver).xpath(/jcr:root/home/users//element(*,rep:Users))
   .$(nt:unstructured#profile)
   .write(fullName,${(profile.gender === female ? Ms  + profile.fullName 
: Mr  + profile.fullName)})
   .run()
@@ -376,7 +385,7 @@ is the path of the current resource of p
 
 slingQuery | 
multiProperty | authorizable | write
 move badge-user relation ship from badge-users MV property to a 
user-badges MV property
- 
.newPipe(resolver).echo(/etc/badges/jcr:content/par)
+ 
plumber.newPipe(resolver).echo(/etc/badges/jcr:content/par)
  
.$([sling:resourceType=myApp/components/badge]).name(badge)
  .pipe(slingPipes/multiProperty).path(${path.badge}/profiles).name(profile)
  .auth(${profile}).name(user)
@@ -386,75 +395,37 @@ is the path of the current resource of p
 
 
 
-xpath | json | write
-this use case is for completing repository profiles with external system's 
data (that has an json api)
-{
-  jcr:primaryType: nt:unstructured,
-  jcr:description: this pipe retrieves json info from an 
external system and writes them to the user profile, uses moment.js, it
-  distributes modified resources using publish distribution agent,
-  sling:resourceType: slingPipes/container,
-  distribution.agent: publish,
-  additionalScripts: /etc/source/moment.js,
-  conf: {
-jcr:primaryType: sling:OrderedFolder,
-profile: {
-  jcr:primaryType: sling:OrderedFolder,
-  expr: 
/jcr:root/home/users//element(profile,nt:unstructured)[@uid],
-  jcr:description: query all user profile nodes,
-  sling:resourceType: slingPipes/xpath
-},
-json: {
-  jcr:primaryType: sling:OrderedFolder,
-  expr:

svn commit: r1806970 - /sling/site/trunk/content/documentation/bundles/sling-pipes.mdtext

2017-09-01 Thread npeltier 
Author: npeltier
Date: Fri Sep  1 14:59:54 2017
New Revision: 1806970

URL: http://svn.apache.org/viewvc?rev=1806970=rev
Log:
[sling pipes] update samples & formatting

Modified:
sling/site/trunk/content/documentation/bundles/sling-pipes.mdtext

Modified: sling/site/trunk/content/documentation/bundles/sling-pipes.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/sling-pipes.mdtext?rev=1806970=1806969=1806970=diff
==
--- sling/site/trunk/content/documentation/bundles/sling-pipes.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/sling-pipes.mdtext Fri Sep  
1 14:59:54 2017
@@ -56,7 +56,7 @@ Plumber can provider a PipeBuilder with
 API to quickly configure and run pipes.
 e.g. 
 
-
`plumber.newPipe(resolver).xpath('//element(*,nt:unstructured)[@sling:resourceType='to/delete']").rm().run();`
+
plumber.newPipe(resolver).xpath('//element(*,nt:unstructured)[@sling:resourceType='to/delete']").rm().run();
 
 will search for resource of type `to/delete` and remove them.
 
@@ -72,7 +72,7 @@ PipeBuilder basically will automatically
 
 note that that configuration part has shortcuts for some pipes. Typically, 
above sample is a shorter equivalent of 
 
-`plumber.newPipe(resolver).pipe('slingPipes/xpath').expr('//element(*,nt:unstructured)[@sling:resourceType='to/delete']").pipe('slingPipes/rm').run();`
+
plumber.newPipe(resolver).pipe('slingPipes/xpath').expr('//element(*,nt:unstructured)[@sling:resourceType='to/delete']").pipe('slingPipes/rm').run();
 
 when available, shortcuts will be specified next to each pipe type 
documentation.
 
@@ -98,7 +98,7 @@ which will return you the path of the re
 
 In the eventuality of a long execution (synchronous or asynchronous), you can 
retrieve the status of a pipe, by executing
 
-GET /etc/pipes/mySamplePipe**.status**.json
+GET /etc/pipes/mySamplePipe**.status**.json
 
 # Request Parameter `binding`
 
@@ -125,7 +125,7 @@ e.g.
 
 will returns something similar to
 
-{"size":2, "items":[{'user':'John 
Smith','path':'/home/users/q/q123jk1UAZS'},{'user':'John 
Doe','path':'/home/users/q/q153jk1UAZS'}]}
+{"size":2, "items":[{'user':'John 
Smith','path':'/home/users/q/q123jk1UAZS'},{'user':'John 
Doe','path':'/home/users/q/q153jk1UAZS'}]}
 
 # Request Parameter `dryRun`
 if parameter dryRun is set to true, and the executed pipe is supposed to 
modify content, it will log (at best it can) the change it *would* have done, 
without doing anything
@@ -282,7 +282,7 @@ global bindings can be set at pipe execu
 # slingQuery | write
 write repository user prefix Ms/Mr depending on gender
 
-  .newPipe(resolver).xpath('/jcr:root/home/users//element(*,rep:Users)')
+  
plumber.newPipe(resolver).xpath('/jcr:root/home/users//element(*,rep:Users)')
   .$('nt:unstructured#profile')
   .write("fullName","${(profile.gender === 'female' ? 'Ms ' + 
profile.fullName : 'Mr ' + profile.fullName)}")
   .run()
@@ -290,7 +290,7 @@ write repository user prefix Ms/Mr depen
 # slingQuery | multiProperty | authorizable | write
 move badge<->user relation ship from badge->users MV property to a 
user->badges MV property
 
- .newPipe(resolver).echo('/etc/badges/jcr:content/par')
+ plumber.newPipe(resolver).echo('/etc/badges/jcr:content/par')
  .$('[sling:resourceType=myApp/components/badge]').name('badge')
  
.pipe('slingPipes/multiProperty').path('${path.badge}/profiles').name('profile')
  .auth('${profile}').name('user')
@@ -299,72 +299,37 @@ move badge<->user relation ship from bad
  .run()
 
 
-### xpath | json | write
-this use case is for completing repository profiles with external system's 
data (that has an json api)
+# echo | $ | $ | echo | json | write
+this use case is for completing repository website with external system's data 
(that has an json api),
+it does 
 
-{
-  "jcr:primaryType": "nt:unstructured",
-  "jcr:description": "this pipe retrieves json info from an external 
system and writes them to the user profile, uses moment.js, it
-  distributes modified resources using publish distribution agent",
-  "sling:resourceType": "slingPipes/container",
-  "distribution.agent": "publish",
-  "additionalScripts": "/etc/source/moment.js",
-  "conf": {
-"jcr:primaryType": "sling:OrderedFolder",
-"profile": {
-  "jcr:primaryType": "sling:OrderedFolder",
-  "expr": 
"/jcr:root/home/users//element(profile,nt:unstructured)[@uid]",
-  "jcr:description": "query all user profile nodes",
-  "sling:resourceType": "slingPipes/xpath"
-},
-"json": {
-  "jcr:primaryType": "sling:OrderedFolder",
-  "expr": "${(profile.uid ? 
'https://my.external.system.corp.com/profiles/' + profile.uid.substr(0,2) + '/' 
+ profile.uid + '.json' : '')",
-  "jcr:description": "retrieves json

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

2017-09-01 Thread Apache Jenkins Server 
See

svn commit: r1806965 - /sling/trunk/bundles/scripting/sightly/testing/pom.xml

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 14:17:33 2017
New Revision: 1806965

URL: http://svn.apache.org/viewvc?rev=1806965=rev
Log:
releng: updated dependencies after staging releases

Modified:
sling/trunk/bundles/scripting/sightly/testing/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/testing/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/pom.xml?rev=1806965=1806964=1806965=diff
==
--- sling/trunk/bundles/scripting/sightly/testing/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/testing/pom.xml Fri Sep  1 14:17:33 
2017
@@ -72,8 +72,8 @@
 
 
1.0.13-SNAPSHOT
 
1.0.13-SNAPSHOT
-
1.0.39-SNAPSHOT
-
1.0.23-SNAPSHOT
+
1.0.41-SNAPSHOT
+
1.0.25-SNAPSHOT
 
1.0.7-SNAPSHOT

Nexus: Staging Completed

2017-09-01 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDescription:Apache Sling Scripting HTL Engine 1.0.40Deployer 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/1.0.40/org.apache.sling.scripting.sightly-1.0.40-sources.jar.asc(SHA1: 361408b98fc3301a79d36718cd3042e3a37fc317)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40-sources.jar(SHA1: 5837f04015339f0c4a31b9df57f291c7d5d744ca)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40.pom.asc(SHA1: 7b92c0474e0bb3a7a571566f02138ae051044f9a)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40-javadoc.jar.asc(SHA1: 4db98702b783747a2dce4b6c5c0554b29df66368)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40-javadoc.jar(SHA1: c4bbaad40c571c8abf4dbbb22784aba4f2e29950)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40-source-release.zip.asc(SHA1: 6a582362b1850c8f353074b99a532f190783c4af)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40.jar.asc(SHA1: 107f2fcc8866509fa6df5ddda9e69fbf3266dac8)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40.pom(SHA1: 1d9b8b5755ab2f37d917cd314555c9cae04f2a69)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40-source-release.zip(SHA1: 49d66b80ea71774ce6f133819c61556065bf798c)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.40/org.apache.sling.scripting.sightly-1.0.40.jar(SHA1: d842b523468b15c9b1df17b74a3a0206e94fc838)Action performed by Radu Cotescu (radu)

svn commit: r1806963 - /sling/trunk/bundles/scripting/sightly/engine/pom.xml

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:43:31 2017
New Revision: 1806963

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

Modified:
sling/trunk/bundles/scripting/sightly/engine/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1806963=1806962=1806963=diff
==
--- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Fri Sep  1 13:43:31 
2017
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.scripting.sightly
-1.0.40
+1.0.41-SNAPSHOT
 bundle
 
 Apache Sling Scripting HTL Engine
@@ -44,9 +44,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.40
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.40
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly-1.0.40
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine
+
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine

svn commit: r1806962 - /sling/tags/org.apache.sling.scripting.sightly-1.0.40/

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:43:28 2017
New Revision: 1806962

URL: http://svn.apache.org/viewvc?rev=1806962=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.scripting.sightly-1.0.40

Added:
sling/tags/org.apache.sling.scripting.sightly-1.0.40/
  - copied from r1806961, sling/trunk/bundles/scripting/sightly/engine/

svn commit: r1806961 - /sling/trunk/bundles/scripting/sightly/engine/pom.xml

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:43:15 2017
New Revision: 1806961

URL: http://svn.apache.org/viewvc?rev=1806961=rev
Log:
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly-1.0.40

Modified:
sling/trunk/bundles/scripting/sightly/engine/pom.xml

Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1806961=1806960=1806961=diff
==
--- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Fri Sep  1 13:43:15 
2017
@@ -33,7 +33,7 @@
 
 
 org.apache.sling.scripting.sightly
-1.0.39-SNAPSHOT
+1.0.40
 bundle
 
 Apache Sling Scripting HTL Engine
@@ -44,9 +44,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine
-
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.40
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.40
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly-1.0.40
 
 
 
@@ -166,13 +166,13 @@
 
 org.apache.sling
 
org.apache.sling.scripting.sightly.compiler
-1.0.13-SNAPSHOT
+1.0.12
 provided
 
 
 org.apache.sling
 
org.apache.sling.scripting.sightly.compiler.java
-1.0.13-SNAPSHOT
+1.0.12
 provided

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

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:30:22 2017
New Revision: 1017557

Log:
Publishing svnmucc operation to sling site by radu

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

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

2017-09-01 Thread buildbot 
Author: buildbot
Date: Fri Sep  1 13:13:53 2017
New Revision: 1017555

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 Fri Sep  1 13:13:53 2017
@@ -1 +1 @@
-1806788
+1806960

Modified: websites/staging/sling/trunk/content/downloads.html
==
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Fri Sep  1 13:13:53 2017
@@ -1198,21 +1198,21 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 Scripting HTL Compiler
-1.0.10
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.jar.md5;>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-source-release.zip.md5;>md5)
+1.0.12
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.jar.md5;>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip.md5;>md5)
 
 
 Scripting HTL Engine
-1.0.36
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.36.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.36.jar.md5;>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.36-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.36-source-release.zip.md5;>md5)
+1.0.38
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.38.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.38.jar.md5;>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.38-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly-1.0.38-source-release.zip.md5;>md5)
 
 
 Scripting HTL Java Compiler
-1.0.10
-Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.jar.md5;>md5)
-Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-source-release.zip.md5;>md5)
+1.0.12
+Bundle
 (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar.md5;>md5)
+Source
 ZIP (http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip.asc;>asc,
 http://www.apache.org/dist/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip.md5;>md5)
 
 
 Scripting HTL JavaScript Use Provider
@@ -1556,7 +1556,7 @@ h2:hover > .headerlink, h3:hover > .head
 
 
   
-Rev. 1806788 by pauls on Thu, 31 Aug 2017 12:40:50 +
+Rev. 1806960 by radu on Fri, 1 Sep 2017 13:13:29 +
   

 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 Fri Sep  1 13:13:53 2017
@@ -116,6 +116,7 @@ h2:hover > .headerlink, h3:hover > .head
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, 
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, 
dt:hover > .elementid-permalink { visibility: visible }
 
+New Releases: Apache Sling Scripting HTL Compiler 1.0.12, Apache Sling 
Scripting HTL Java Compiler 1.0.12, Apache Sling Scripting HTL Engine 1.0.38 
(September 1st, 2017)
 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

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

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:13:29 2017
New Revision: 1806960

URL: http://svn.apache.org/viewvc?rev=1806960=rev
Log:
Release Apache Sling Scripting HTL Compiler 1.0.12, Apache Sling Scripting HTL 
Java Compiler 1.0.12, Apache Sling Scripting HTL Engine 1.0.38

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=1806960=1806959=1806960=diff
==
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Fri Sep  1 13:13:29 2017
@@ -180,9 +180,9 @@ Scripting JSP API Wrapper|org.apache.sli
 Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.6
 Scripting JST|org.apache.sling.scripting.jst|2.0.6
 Scripting Groovy|org.apache.sling.scripting.groovy|1.0.2
-Scripting HTL Compiler|org.apache.sling.scripting.sightly.compiler|1.0.10
-Scripting HTL Java 
Compiler|org.apache.sling.scripting.sightly.compiler.java|1.0.10
-Scripting HTL Engine|org.apache.sling.scripting.sightly|1.0.36
+Scripting HTL Compiler|org.apache.sling.scripting.sightly.compiler|1.0.12
+Scripting HTL Java 
Compiler|org.apache.sling.scripting.sightly.compiler.java|1.0.12
+Scripting HTL Engine|org.apache.sling.scripting.sightly|1.0.38
 Scripting HTL JavaScript Use 
Provider|org.apache.sling.scripting.sightly.js.provider|1.0.22
 Scripting HTL Sling Models Use 
Provider|org.apache.sling.scripting.sightly.models.provider|1.0.6
 Scripting HTL REPL|org.apache.sling.scripting.sightly.repl|1.0.4

Modified: sling/site/trunk/content/news.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1806960=1806959=1806960=diff
==
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Fri Sep  1 13:13:29 2017
@@ -1,5 +1,5 @@
 Title: News
-
+* New Releases: Apache Sling Scripting HTL Compiler 1.0.12, Apache Sling 
Scripting HTL Java Compiler 1.0.12, Apache Sling Scripting HTL Engine 1.0.38 
(September 1st, 2017)
 * 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)
@@ -507,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
\ No newline at end of file
+  [1]: http://s.apache.org/CVE-2012-2138

Nexus: Promotion Completed

2017-09-01 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDeployer 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 promoted to the "Releases" [id=releases] repository/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38-source-release.zip(SHA1: eb6288ae2c2ec3eceddd13892adcef2b2f9e2b2c)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38-javadoc.jar(SHA1: 077dd13ab673845b578e669ee47826236ed846fe)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38-javadoc.jar.asc(SHA1: 9b486a97b29fa735d7679df5d3cfa9c2d1bb5166)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38.jar(SHA1: a6b8d45201d92709c578a666bac0fd45061b2d3c)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38.jar.asc(SHA1: 3fbf944a96d6689657946241947a302acc12518a)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38.pom.asc(SHA1: 19aa545d15f09d82401967c03588680c25912849)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38-sources.jar(SHA1: 20d94417038853389a8296a33de5d8ef1bf2d2cc)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38.pom(SHA1: 597c8d32758e1b6d52436c1fd91e760eb171de5d)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38-sources.jar.asc(SHA1: 5786707a92b0b77016cae69b420e0f04678a6ff2)/org/apache/sling/org.apache.sling.scripting.sightly/1.0.38/org.apache.sling.scripting.sightly-1.0.38-source-release.zip.asc(SHA1: 82aa9b7d4dfb9a9edc8c894dd81679f950476ab1)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12-javadoc.jar.asc(SHA1: 67a96cb99af3117f1e3f7adf748823f804fb3ebf)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12.pom.asc(SHA1: 2a516cc906e7611359a7137952a105cea066f4ec)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar.asc(SHA1: c62e9d96a8c3cd8e21b91a2fdede030790908825)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar(SHA1: ed39dc43a6aed787afc35b43f8fb25feadfbcc91)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12-javadoc.jar(SHA1: 2eb375109114874a6c41c9071c837348d7321aba)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip(SHA1: 9d5809861c7aeb8f812abc54b4fe2e8951b0b40e)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip.asc(SHA1: 5edb9e8ac0c5b22402b0898f46dba61677aec2ac)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12-sources.jar.asc(SHA1: 2e17d33679f4c3dfb055516d894cffb4e1fb88e8)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12-sources.jar(SHA1: 60b6b3f15340370042123dc608070de9b9232376)/org/apache/sling/org.apache.sling.scripting.sightly.compiler.java/1.0.12/org.apache.sling.scripting.sightly.compiler.java-1.0.12.pom(SHA1: eaef3681d638829bffab606cef4bf2322c1478f4)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12-sources.jar.asc(SHA1: 919270215a6037a3f0d561389235d2bb14a5655a)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12.pom(SHA1: 88de07a66fb50e19d30742e2a3fbc8e74bf3b76e)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip.asc(SHA1: 9d759958d6320423abb45aed66054542d7af5db5)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12.jar.asc(SHA1: 5d61c0ec03c7ada02bca36d930905f14110c0153)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12-javadoc.jar(SHA1: 2fe29f76119fe24f285e77c3fbdaa563240ace70)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12.pom.asc(SHA1: fea86e95ac03c920d49b55593415ebf044a1b8bb)/org/apache/sling/org.apache.sling.scripting.sightly.compiler/1.0.12/org.apache.sling.scripting.sightly.compiler-1.0.12.jar(SHA1:

svn commit: r21395 - /release/sling/

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:08:33 2017
New Revision: 21395

Log:
Release Apache Sling Scripting HTL Compiler 1.0.12, Apache Sling Scripting HTL 
Java Compiler 1.0.12, Apache Sling Scripting HTL Engine 1.0.38

Removed:
release/sling/org.apache.sling.scripting.sightly-1.0.36-javadoc.jar
release/sling/org.apache.sling.scripting.sightly-1.0.36-javadoc.jar.asc
release/sling/org.apache.sling.scripting.sightly-1.0.36-javadoc.jar.md5
release/sling/org.apache.sling.scripting.sightly-1.0.36-javadoc.jar.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.36-source-release.zip

release/sling/org.apache.sling.scripting.sightly-1.0.36-source-release.zip.asc

release/sling/org.apache.sling.scripting.sightly-1.0.36-source-release.zip.md5

release/sling/org.apache.sling.scripting.sightly-1.0.36-source-release.zip.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.36-sources.jar
release/sling/org.apache.sling.scripting.sightly-1.0.36-sources.jar.asc
release/sling/org.apache.sling.scripting.sightly-1.0.36-sources.jar.md5
release/sling/org.apache.sling.scripting.sightly-1.0.36-sources.jar.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.36.jar
release/sling/org.apache.sling.scripting.sightly-1.0.36.jar.asc
release/sling/org.apache.sling.scripting.sightly-1.0.36.jar.md5
release/sling/org.apache.sling.scripting.sightly-1.0.36.jar.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.36.pom
release/sling/org.apache.sling.scripting.sightly-1.0.36.pom.asc
release/sling/org.apache.sling.scripting.sightly-1.0.36.pom.md5
release/sling/org.apache.sling.scripting.sightly-1.0.36.pom.sha1
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-javadoc.jar

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-javadoc.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-javadoc.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-javadoc.jar.sha1

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-source-release.zip

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-source-release.zip.asc

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-source-release.zip.md5

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-source-release.zip.sha1
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-sources.jar

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-sources.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-sources.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10-sources.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.jar
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.jar.asc
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.jar.md5
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.pom
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.pom.asc
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.pom.md5
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.10.pom.sha1

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-javadoc.jar

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-javadoc.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-javadoc.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-javadoc.jar.sha1

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-source-release.zip

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-source-release.zip.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-source-release.zip.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-source-release.zip.sha1

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-sources.jar

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-sources.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-sources.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10-sources.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.jar

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.pom

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.10.pom.asc

svn commit: r21394 - /release/sling/

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 13:03:35 2017
New Revision: 21394

Log:
Release Apache Sling Scripting HTL Compiler 1.0.12, Apache Sling Scripting HTL 
Java Compiler 1.0.12, Apache Sling Scripting HTL Engine 1.0.38

Added:
release/sling/org.apache.sling.scripting.sightly-1.0.38-javadoc.jar   (with 
props)
release/sling/org.apache.sling.scripting.sightly-1.0.38-javadoc.jar.asc
release/sling/org.apache.sling.scripting.sightly-1.0.38-javadoc.jar.md5
release/sling/org.apache.sling.scripting.sightly-1.0.38-javadoc.jar.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.38-source-release.zip  
 (with props)

release/sling/org.apache.sling.scripting.sightly-1.0.38-source-release.zip.asc

release/sling/org.apache.sling.scripting.sightly-1.0.38-source-release.zip.md5

release/sling/org.apache.sling.scripting.sightly-1.0.38-source-release.zip.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.38-sources.jar   (with 
props)
release/sling/org.apache.sling.scripting.sightly-1.0.38-sources.jar.asc
release/sling/org.apache.sling.scripting.sightly-1.0.38-sources.jar.md5
release/sling/org.apache.sling.scripting.sightly-1.0.38-sources.jar.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.38.jar   (with props)
release/sling/org.apache.sling.scripting.sightly-1.0.38.jar.asc
release/sling/org.apache.sling.scripting.sightly-1.0.38.jar.md5
release/sling/org.apache.sling.scripting.sightly-1.0.38.jar.sha1
release/sling/org.apache.sling.scripting.sightly-1.0.38.pom
release/sling/org.apache.sling.scripting.sightly-1.0.38.pom.asc
release/sling/org.apache.sling.scripting.sightly-1.0.38.pom.md5
release/sling/org.apache.sling.scripting.sightly-1.0.38.pom.sha1

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-javadoc.jar   
(with props)

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-javadoc.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-javadoc.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-javadoc.jar.sha1

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip
   (with props)

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip.asc

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip.md5

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-source-release.zip.sha1

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-sources.jar   
(with props)

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-sources.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-sources.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12-sources.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.jar   
(with props)
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.jar.asc
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.jar.md5
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.pom
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.pom.asc
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.pom.md5
release/sling/org.apache.sling.scripting.sightly.compiler-1.0.12.pom.sha1

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-javadoc.jar
   (with props)

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-javadoc.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-javadoc.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-javadoc.jar.sha1

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip
   (with props)

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-source-release.zip.sha1

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-sources.jar
   (with props)

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-sources.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-sources.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12-sources.jar.sha1
release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar   
(with props)

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar.asc

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar.md5

release/sling/org.apache.sling.scripting.sightly.compiler.java-1.0.12.jar.sha1

svn commit: r1806946 - /sling/trunk/launchpad/testing/pom.xml

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 12:29:00 2017
New Revision: 1806946

URL: http://svn.apache.org/viewvc?rev=1806946=rev
Log:
launchpad/testing: move to parent pom 31

Modified:
sling/trunk/launchpad/testing/pom.xml

Modified: sling/trunk/launchpad/testing/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=1806946=1806945=1806946=diff
==
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Fri Sep  1 12:29:00 2017
@@ -23,7 +23,7 @@
 
 org.apache.sling
 sling
-26
+31
 
 
 
@@ -93,7 +93,6 @@
 
 org.apache.sling
 slingstart-maven-plugin
-1.7.0
 true
 
 
@@ -212,6 +211,16 @@
  
org.apache.sling.launchpad.integration-tests
  1.0.5-SNAPSHOT
  test
+ 
+ 
+ org.osgi
+ org.osgi.core
+ 
+ 
+ org.apache.felix
+ org.apache.felix.framework
+ 
+ 
 
 
 
@@ -223,7 +232,6 @@
 
 javax.jcr
 jcr
-2.0
 test
 
 
@@ -253,17 +261,16 @@
 
   junit
   junit
-  4.11
   test
 
 
 org.osgi
-org.osgi.core
+osgi.core
 test
 
 
 org.osgi
-org.osgi.compendium
+osgi.cmpn
 test

svn commit: r1806931 - in /sling/trunk/bundles/scripting/sightly/engine/src: main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/ test/java/org/apache/sling/scripting/sightly/impl/engine/

2017-09-01 Thread radu 
Author: radu
Date: Fri Sep  1 11:10:34 2017
New Revision: 1806931

URL: http://svn.apache.org/viewvc?rev=1806931=rev
Log:
SLING-7097 - The SlingRuntimeObjectModel should adapt a target object to 
ValueMap as a last resort

* delegate first to the super class in SlingRuntimeObjectModel#getProperty
* added tests for all possible Adaptable interactions

Added:

sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/

sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModelTest.java
Modified:

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModel.java

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModel.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModel.java?rev=1806931=1806930=1806931=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModel.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModel.java
 Fri Sep  1 11:10:34 2017
@@ -26,17 +26,14 @@ public class SlingRuntimeObjectModel ext
 
 @Override
 protected Object getProperty(Object target, Object propertyObj) {
-Object result = null;
-if (target instanceof Adaptable) {
+Object result = super.getProperty(target, propertyObj);
+if (result == null && target instanceof Adaptable) {
 ValueMap valueMap = ((Adaptable) target).adaptTo(ValueMap.class);
 if (valueMap != null) {
 String property = toString(propertyObj);
 result = valueMap.get(property);
 }
 }
-if (result == null) {
-result = super.getProperty(target, propertyObj);
-}
 return result;
 }
 

Added: 
sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModelTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModelTest.java?rev=1806931=auto
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModelTest.java
 (added)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SlingRuntimeObjectModelTest.java
 Fri Sep  1 11:10:34 2017
@@ -0,0 +1,86 @@
+/***
+ * 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.scripting.sightly.impl.engine.runtime;
+
+import java.util.HashMap;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import org.apache.sling.api.adapter.Adaptable;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.ValueMapDecorator;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class SlingRuntimeObjectModelTest {
+
+private static final String VALUE_MAP_VALUE = "ValueMap value";
+private static final String METHOD_VALUE = "Method value";
+private SlingRuntimeObjectModel slingRuntimeObjectModel = new 
SlingRuntimeObjectModel();
+
+@Test
+public void getPropertyFromAdaptableWithField() throws Exception {
+assertEquals("Expected public fields to have priority over ValueMap 
adaptable's properties.", FieldTestMockAdaptable.test,
+

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

2017-09-01 Thread Apache Jenkins Server 
See

Build failed in Jenkins: sling-parent-1.8 #5

2017-09-01 Thread Apache Jenkins Server 
See 


Changes:

[rombert] [maven-release-plugin] prepare for next development iteration

[rombert] [maven-release-plugin] prepare release sling-32

[rombert] SLING-7072 - Build failure with Java 9 - unable to create javax script
engine for javascript

Replace the maven-antrun-plugin snippet with the javaversion-maven-plugin
in the parent pom.

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-eu2 (ubuntu trusty) 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/parent at revision 
'2017-09-01T09:52:50.132 +'
AUNOTICE
AULICENSE
AUpom.xml
 U.
At revision 1806921

Parsing POMs
Modules changed, recalculating dependency graph
Established TCP socket on 39153
maven33-agent.jar already up to date
maven33-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-parent-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 39153
<===[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] 
[INFO] 
[INFO] Building Apache Sling (Parent) 33-SNAPSHOT
[INFO] 
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0.pom
[WARNING] The POM for org.apache.sling:javaversion-maven-plugin:jar:1.0.0 is 
missing, no dependency information available
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0.jar
[JENKINS] Archiving disabled
[INFO] 
[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 2.359 s
[INFO] Finished at: 2017-09-01T09:53:58+00:00
[JENKINS] Archiving disabled
[INFO] Final Memory: 13M/282M
[INFO] 
[ERROR] Plugin org.apache.sling:javaversion-maven-plugin:1.0.0 or one of its 
dependencies could not be resolved: Could not find artifact 
org.apache.sling:javaversion-maven-plugin:jar:1.0.0 in central 
(https://repo.maven.apache.org/maven2) -> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e 
switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please 
read the following articles:
[ERROR] [Help 1] 
http://cwiki.apache.org/confluence/display/MAVEN/PluginResolutionException
channel stopped
Recording test results

Nexus: Staging Completed

2017-09-01 Thread Nexus Repository Manager 
Message from: https://repository.apache.orgDescription:Apache Sling Parent 32, Apache Sling Java Version Maven Plugin 1.0.0Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_144; Linux 4.12.9-0-default)""userId" = "rombert""ip" = "193.105.140.131"Details:The following artifacts have been staged/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0.jar(SHA1: d09bc2d9ffa9136058daf1b1516d7b74885d7d78)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0-sources.jar(SHA1: 5546e3a96fece7814788604d55db5188283eca54)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0-sources.jar.asc(SHA1: 5813a079ed9dd44a9c71a83ce723b4b41d47e20f)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0.pom(SHA1: 1214c6a23faea190c1a8c1c9d4cac24f7f63e0a9)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0-source-release.zip.asc(SHA1: ac96152213462cf553353387f33e9b72a5ea81a6)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0.jar.asc(SHA1: 7d618963fc44cd187da119f4085725c5a4564d4f)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0.pom.asc(SHA1: dc4fc25bd3c60d7ef31f5253b837ef489cab55ee)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0-source-release.zip(SHA1: 7d7279273da5e5cf2c4066cb4cb20abd5fd25340)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0-javadoc.jar(SHA1: d5119167b2f49e3c3b2775af27d12a3a0c5effd1)/org/apache/sling/javaversion-maven-plugin/1.0.0/javaversion-maven-plugin-1.0.0-javadoc.jar.asc(SHA1: f08102f55b6ba183bd2ff09767ff424e7b03512e)/org/apache/sling/sling/32/sling-32.pom.asc(SHA1: 20397e2bb2c2090caca60c9b9e994bd3db644fc2)/org/apache/sling/sling/32/sling-32-source-release.zip.asc(SHA1: 43bd1cfe903353167d209562f9e2d69b72c97cae)/org/apache/sling/sling/32/sling-32-source-release.zip(SHA1: b180cd4cdddb05a1f5d085fcde13ad9cf1c51486)/org/apache/sling/sling/32/sling-32.pom(SHA1: fddf48645f7de054350f101e688fe688646769a5)Action performed by Robert Munteanu (rombert)

svn commit: r1806914 - /sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:40:01 2017
New Revision: 1806914

URL: http://svn.apache.org/viewvc?rev=1806914=rev
Log:
[maven-release-plugin] prepare release javaversion-maven-plugin-1.0.0

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

Modified: 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=1806914=1806913=1806914=diff
==
--- sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml Fri Sep  1 
09:40:01 2017
@@ -16,8 +16,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-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;>
+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
 
@@ -30,7 +29,7 @@
 
 javaversion-maven-plugin
 maven-plugin
-0.0.1-SNAPSHOT
+1.0.0
 Apache Sling Java Version Maven Plugin
 Helper Maven plugin that sets various project properties 
based on the configured Java version.
 
@@ -41,9 +40,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin
-
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/javaversion-maven-plugin-1.0.0
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/javaversion-maven-plugin-1.0.0
+
http://svn.apache.org/viewvc/sling/tags/javaversion-maven-plugin-1.0.0

svn commit: r1806920 - /sling/tags/sling-32/

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:44:12 2017
New Revision: 1806920

URL: http://svn.apache.org/viewvc?rev=1806920=rev
Log:
[maven-release-plugin] copy for tag sling-32

Added:
sling/tags/sling-32/
  - copied from r1806919, sling/trunk/parent/

svn commit: r1806921 - /sling/trunk/parent/pom.xml

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:44:14 2017
New Revision: 1806921

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

Modified:
sling/trunk/parent/pom.xml

Modified: sling/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1806921=1806920=1806921=diff
==
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Fri Sep  1 09:44:14 2017
@@ -28,7 +28,7 @@
 org.apache.sling
 sling
 pom
-32
+33-SNAPSHOT
 
 Apache Sling (Parent)
 The parent project for Apache Sling
@@ -61,9 +61,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-32
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-32
-http://svn.apache.org/viewvc/sling/tags/sling-32
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/parent
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/parent
+http://svn.apache.org/viewvc/sling/trunk/parent

svn commit: r1806919 - /sling/trunk/parent/pom.xml

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:43:58 2017
New Revision: 1806919

URL: http://svn.apache.org/viewvc?rev=1806919=rev
Log:
[maven-release-plugin] prepare release sling-32

Modified:
sling/trunk/parent/pom.xml

Modified: sling/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1806919=1806918=1806919=diff
==
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Fri Sep  1 09:43:58 2017
@@ -28,7 +28,7 @@
 org.apache.sling
 sling
 pom
-32-SNAPSHOT
+32
 
 Apache Sling (Parent)
 The parent project for Apache Sling
@@ -61,9 +61,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/parent
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/parent
-http://svn.apache.org/viewvc/sling/trunk/parent
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/sling-32
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/sling-32
+http://svn.apache.org/viewvc/sling/tags/sling-32

svn commit: r1806917 - /sling/trunk/parent/pom.xml

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:43:04 2017
New Revision: 1806917

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

Replace the maven-antrun-plugin snippet with the javaversion-maven-plugin
in the parent pom.

Modified:
sling/trunk/parent/pom.xml

Modified: sling/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1806917=1806916=1806917=diff
==
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Fri Sep  1 09:43:04 2017
@@ -111,7 +111,18 @@
 
 
 
-
+
+org.apache.sling
+javaversion-maven-plugin
+1.0.0
+
+
+
+set-java-version
+
+
+
+
 
 
 org.apache.maven.plugins
@@ -173,47 +184,7 @@
 
 
 
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-set-bundle-required-execution-environment
-
-run
-
-initialize
-
-true
-
- 
-
-
-
-
-
+
 
 
 org.codehaus.mojo
@@ -703,25 +674,6 @@
 
 
 
-
-
-org.apache.maven.plugins
-
-
-maven-antrun-plugin
-
-
-[1.3,)
-
-
-run
-
-
-
- 
-
-
-
 
 
 org.apache.maven.plugins

svn commit: r1806915 - /sling/tags/javaversion-maven-plugin-1.0.0/

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:40:14 2017
New Revision: 1806915

URL: http://svn.apache.org/viewvc?rev=1806915=rev
Log:
[maven-release-plugin] copy for tag javaversion-maven-plugin-1.0.0

Added:
sling/tags/javaversion-maven-plugin-1.0.0/
  - copied from r1806914, 
sling/trunk/tooling/maven/javaversion-maven-plugin/

svn commit: r1806916 - /sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:40:16 2017
New Revision: 1806916

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

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

Modified: 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=1806916=1806915=1806916=diff
==
--- sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml Fri Sep  1 
09:40:16 2017
@@ -29,7 +29,7 @@
 
 javaversion-maven-plugin
 maven-plugin
-1.0.0
+1.0.1-SNAPSHOT
 Apache Sling Java Version Maven Plugin
 Helper Maven plugin that sets various project properties 
based on the configured Java version.
 
@@ -40,9 +40,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/javaversion-maven-plugin-1.0.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/javaversion-maven-plugin-1.0.0
-
http://svn.apache.org/viewvc/sling/tags/javaversion-maven-plugin-1.0.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin
+
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin

svn commit: r1806913 - in /sling/trunk/tooling/maven/javaversion-maven-plugin: pom.xml src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java

2017-09-01 Thread rombert 
Author: rombert
Date: Fri Sep  1 09:38:55 2017
New Revision: 1806913

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

Further tweaks to the Java Version Maven Plugin.

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

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

Modified: 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=1806913=1806912=1806913=diff
==
--- sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/javaversion-maven-plugin/pom.xml Fri Sep  1 
09:38:55 2017
@@ -31,14 +31,20 @@
 javaversion-maven-plugin
 maven-plugin
 0.0.1-SNAPSHOT
-Java version Maven plugin
+Apache Sling Java Version Maven Plugin
+Helper Maven plugin that sets various project properties 
based on the configured Java version.
 
 
 3.0.5
 
 6
 
-
+
+
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/javaversion-maven-plugin
+
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/javaversion-maven-plugin
+
 
 
 

Modified: 
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=1806913=1806912=1806913=diff
==
--- 
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
 (original)
+++ 
sling/trunk/tooling/maven/javaversion-maven-plugin/src/main/java/org/apache/sling/maven/javaversion/SetJavaVersionMojo.java
 Fri Sep  1 09:38:55 2017
@@ -31,8 +31,8 @@ import org.apache.maven.project.MavenPro
  * 
  * The following versions are set:
  * 
- *   sling.bree - the value of the OSGi 
Bundle-RequiredExecutionEnvironment header.
- *   sling.animalSignatures.version - the value 
+ *   sling.bree - the value of the OSGi 
Bundle-RequiredExecutionEnvironment header, e.g. JavaSE-1.8
+ *   sling.animalSignatures.version - the value to be appended 
appended to the artifactId following java1, e.g. 8
  * 
  * 
  *