svn commit: r1803583 [1/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe

[pauls]

Author: pauls
Date: Mon Jul 31 22:01:42 2017
New Revision: 1803583

URL: http://svn.apache.org/viewvc?rev=1803583&view=rev
Log:
Optimize imports

Modified:

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Analyser.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/ArtifactDescriptor.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Scanner.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForInitialContent.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundlesForResources.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/Resolver.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/resolver/ResolverContext.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ArtifactScanner.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/ExtensionScanner.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/FrameworkScanner.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java

sling/whiteboard/cziegeler/feature-karaf/src/main/java/org/apache/sling/feature/karaf/KarafFeatureWriter.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Installation.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/Main.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkLauncher.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/launchers/FrameworkRunner.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java

sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManager.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ArtifactManagerConfig.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java

sling/whiteboard/cziegeler/feature-support/src/ma

svn commit: r1803583 [2/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe

[pauls]

Modified: 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==
--- 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
 (original)
+++ 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
 Mon Jul 31 22:01:42 2017
@@ -16,8 +16,6 @@
  */
 package org.apache.sling.feature.maven.mojos;
 
-import java.io.File;
-
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugins.annotations.Component;
@@ -26,6 +24,8 @@ import org.apache.maven.project.MavenPro
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.sling.feature.maven.FeatureProjectConfig;
 
+import java.io.File;
+
 /**
  * Base class for all mojos.
  */

Modified: 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java?rev=1803583&r1=1803582&r2=1803583&view=diff
==
--- 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
 (original)
+++ 
sling/whiteboard/cziegeler/osgifeature-maven-plugin/src/main/java/org/apache/sling/feature/maven/mojos/AttachFeature.java
 Mon Jul 31 22:01:42 2017
@@ -16,20 +16,20 @@
  */
 package org.apache.sling.feature.maven.mojos;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.support.json.FeatureJSONWriter;
 import org.apache.sling.feature.maven.FeatureConstants;
 import org.apache.sling.feature.maven.ProjectHelper;
+import org.apache.sling.feature.support.json.FeatureJSONWriter;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
 
 /**
  * Attach the feature as a project artifact.

svn commit: r1803576 - in /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support: json/FeatureJSONReader.java json/FeatureJSONWriter.java util/ManifestParser.java u

[pauls]

Author: pauls
Date: Mon Jul 31 21:56:25 2017
New Revision: 1803576

URL: http://svn.apache.org/viewvc?rev=1803576&view=rev
Log:
Implement Attribute and Directive marshal and unmarshal.

Modified:

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java?rev=1803576&r1=1803575&r2=1803576&view=diff
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java
 Mon Jul 31 21:56:25 2017
@@ -32,8 +32,13 @@ import org.apache.sling.feature.Capabili
 import org.apache.sling.feature.Feature;
 import org.apache.sling.feature.Include;
 import org.apache.sling.feature.Requirement;
+import org.apache.sling.feature.support.util.LambdaUtil;
 import org.apache.sling.feature.support.util.ManifestUtil;
 
+import static 
org.apache.sling.feature.support.util.LambdaUtil.rethrowBiConsumer;
+import static 
org.apache.sling.feature.support.util.ManifestUtil.unmarshalAttribute;
+import static 
org.apache.sling.feature.support.util.ManifestUtil.unmarshalDirective;
+
 /**
  * This class offers a method to read a {@code Feature} using a {@code Reader} 
instance.
  */
@@ -284,14 +289,14 @@ public class FeatureJSONReader extends J
 checkType("Requirement attributes", 
obj.get(JSONConstants.REQCAP_ATTRIBUTES), Map.class);
 @SuppressWarnings("unchecked")
 final Map attrs = (Map)obj.get(JSONConstants.REQCAP_ATTRIBUTES);
-attrs.forEach((key, value) -> 
ManifestUtil.unmarshallAttribute(key, value, r.getAttributes()::put));
+attrs.forEach(rethrowBiConsumer((key, value) -> 
unmarshalAttribute(key, value, r.getAttributes()::put)));
 }
 
 if ( obj.containsKey(JSONConstants.REQCAP_DIRECTIVES) ) {
 checkType("Requirement directives", 
obj.get(JSONConstants.REQCAP_DIRECTIVES), Map.class);
 @SuppressWarnings("unchecked")
 final Map dirs = (Map)obj.get(JSONConstants.REQCAP_DIRECTIVES);
-dirs.forEach((key, value) -> 
ManifestUtil.unmarshallDirective(key, value, r.getDirectives()::put));
+dirs.forEach(rethrowBiConsumer((key, value) -> 
unmarshalDirective(key, value, r.getDirectives()::put)));
 }
 }
 }
@@ -321,14 +326,14 @@ public class FeatureJSONReader extends J
 checkType("Capability attributes", 
obj.get(JSONConstants.REQCAP_ATTRIBUTES), Map.class);
 @SuppressWarnings("unchecked")
 final Map attrs = (Map)obj.get(JSONConstants.REQCAP_ATTRIBUTES);
-attrs.forEach((key, value) -> 
ManifestUtil.unmarshallAttribute(key, value, c.getAttributes()::put));
+attrs.forEach(rethrowBiConsumer((key, value) -> 
unmarshalAttribute(key, value, c.getAttributes()::put)));
 }
 
 if ( obj.containsKey(JSONConstants.REQCAP_DIRECTIVES) ) {
 checkType("Capability directives", 
obj.get(JSONConstants.REQCAP_DIRECTIVES), Map.class);
 @SuppressWarnings("unchecked")
 final Map dirs = (Map) 
obj.get(JSONConstants.REQCAP_DIRECTIVES);
-dirs.forEach((key, value) -> 
ManifestUtil.unmarshallDirective(key, value, c.getDirectives()::put));
+dirs.forEach(rethrowBiConsumer((key, value) -> 
unmarshalDirective(key, value, c.getDirectives()::put)));
 }
 }
 }

Modified: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java?rev=1803576&r1=1803575&r2=1803576&view=diff
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java
 (original)
+++ 
sling/

svn commit: r1803574 - in /sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl: ./ CapabilityMatcher.java SimpleFilter.java StringComparator.java VersionRang

[pauls]

Author: pauls
Date: Mon Jul 31 20:51:16 2017
New Revision: 1803574

URL: http://svn.apache.org/viewvc?rev=1803574&view=rev
Log:
Add first pass on Capability matching.

Added:

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/SimpleFilter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/StringComparator.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/VersionRange.java

Added: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java?rev=1803574&view=auto
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
 (added)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/impl/CapabilityMatcher.java
 Mon Jul 31 20:51:16 2017
@@ -0,0 +1,621 @@
+package org.apache.sling.feature.support.impl;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
+
+import static org.osgi.framework.Constants.RESOLUTION_DIRECTIVE;
+import static org.osgi.framework.Constants.RESOLUTION_OPTIONAL;
+
+/*
+ * 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.
+ */
+public class CapabilityMatcher
+{
+public static Set match(Set caps, final 
SimpleFilter sf)
+{
+Set matches = Collections.newSetFromMap(new 
ConcurrentHashMap());
+
+if (sf.getOperation() == SimpleFilter.MATCH_ALL)
+{
+matches.addAll(caps);
+}
+else if (sf.getOperation() == SimpleFilter.AND)
+{
+// Evaluate each subfilter against the remaining capabilities.
+// For AND we calculate the intersection of each subfilter.
+// We can short-circuit the AND operation if there are no
+// remaining capabilities.
+final List sfs = (List) sf.getValue();
+for (int i = 0; (caps.size() > 0) && (i < sfs.size()); i++)
+{
+matches = match(caps, sfs.get(i));
+caps = matches;
+}
+}
+else if (sf.getOperation() == SimpleFilter.OR)
+{
+// Evaluate each subfilter against the remaining capabilities.
+// For OR we calculate the union of each subfilter.
+List sfs = (List) sf.getValue();
+for (int i = 0; i < sfs.size(); i++)
+{
+matches.addAll(match(caps, sfs.get(i)));
+}
+}
+else if (sf.getOperation() == SimpleFilter.NOT)
+{
+// Evaluate each subfilter against the remaining capabilities.
+// For OR we calculate the union of each subfilter.
+matches.addAll(caps);
+List sfs = (List) sf.getValue();
+for (int i = 0; i < sfs.size(); i++)
+{
+matches.removeAll(match(caps, sfs.get(i)));
+}
+}
+else
+{
+for (Iterator it = caps.iterator(); it.hasNext(); )
+{
+Capability cap = it.next();
+Object lhs = cap.getAttributes().get(sf.getName());
+if (lhs != null)
+

svn commit: r1803573 - in /sling/whiteboard/cziegeler: ./ feature-analyser/ feature-karaf/ feature-launcher/ feature-modelconverter/ feature-support/ feature/ osgifeature-maven-plugin/

[pauls]

Author: pauls
Date: Mon Jul 31 20:49:27 2017
New Revision: 1803573

URL: http://svn.apache.org/viewvc?rev=1803573&view=rev
Log:
Add *.iml and .idea to svn ignore

Modified:
sling/whiteboard/cziegeler/   (props changed)
sling/whiteboard/cziegeler/feature/   (props changed)
sling/whiteboard/cziegeler/feature-analyser/   (props changed)
sling/whiteboard/cziegeler/feature-karaf/   (props changed)
sling/whiteboard/cziegeler/feature-launcher/   (props changed)
sling/whiteboard/cziegeler/feature-modelconverter/   (props changed)
sling/whiteboard/cziegeler/feature-support/   (props changed)
sling/whiteboard/cziegeler/osgifeature-maven-plugin/   (props changed)

Propchange: sling/whiteboard/cziegeler/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -0,0 +1 @@
+.idea

Propchange: sling/whiteboard/cziegeler/feature/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

Propchange: sling/whiteboard/cziegeler/feature-analyser/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

Propchange: sling/whiteboard/cziegeler/feature-karaf/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

Propchange: sling/whiteboard/cziegeler/feature-launcher/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

Propchange: sling/whiteboard/cziegeler/feature-modelconverter/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

Propchange: sling/whiteboard/cziegeler/feature-support/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

Propchange: sling/whiteboard/cziegeler/osgifeature-maven-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Mon Jul 31 20:49:27 2017
@@ -2,3 +2,4 @@
 .settings
 target
 .project
+*.iml

svn commit: r1803557 [1/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe

[pauls]

Author: pauls
Date: Mon Jul 31 17:22:58 2017
New Revision: 1803557

URL: http://svn.apache.org/viewvc?rev=1803557&view=rev
Log:
Move parsing into feature-support, add Requirement/Capability matching and 
parsing to feature-support, and create basic check task for Req/Cap in analyser 
(still needs testing).

Added:

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckRequirementsCapabilities.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/
  - copied from r1803556, 
sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/LambdaUtil.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestParser.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java

sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/

sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONReaderTest.java

sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/FeatureJSONWriterTest.java

sling/whiteboard/cziegeler/feature-support/src/test/java/org/apache/sling/feature/support/json/U.java
sling/whiteboard/cziegeler/feature-support/src/test/resources/
sling/whiteboard/cziegeler/feature-support/src/test/resources/features/

sling/whiteboard/cziegeler/feature-support/src/test/resources/features/test.json
Removed:

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/PackageInfo.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ManifestUtil.java

sling/whiteboard/cziegeler/feature/src/main/java/org/apache/sling/feature/json/

sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/json/
sling/whiteboard/cziegeler/feature/src/test/resources/features/
Modified:

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/BundleDescriptor.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/Descriptor.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/BundleDescriptorImpl.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/CheckBundleExportsImports.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ContainerDescriptorImpl.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/main/Main.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/analyser/task/AnalyserTask.java

sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java

sling/whiteboard/cziegeler/feature-launcher/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java

sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
sling/whiteboard/cziegeler/feature-support/pom.xml

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/ConfigurationUtil.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ApplicationJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/ConfigurationJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONReader.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/FeatureJSONWriter.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONConstants.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/json/JSONReaderBase.java

sling/whiteboard/cziegeler/feature-support/src/main/java/org/

svn commit: r1803557 [2/2] - in /sling/whiteboard/cziegeler: feature-analyser/src/main/java/org/apache/sling/feature/analyser/ feature-analyser/src/main/java/org/apache/sling/feature/analyser/impl/ fe

[pauls]

Added: 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java?rev=1803557&view=auto
==
--- 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
 (added)
+++ 
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/ManifestUtil.java
 Mon Jul 31 17:22:58 2017
@@ -0,0 +1,124 @@
+/*
+ * 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.support.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+import org.apache.sling.commons.osgi.ManifestHeader;
+import org.apache.sling.feature.Capability;
+import org.apache.sling.feature.Requirement;
+import org.osgi.framework.Constants;
+
+public class ManifestUtil {
+
+/**
+ * Get the manifest from the artifact.
+ * @param artifact The file
+ * @throws IOException If the manifest can't be read
+ */
+public static Manifest getManifest(final File artifact) throws IOException 
{
+try (final JarFile file = new JarFile(artifact) ) {
+return file.getManifest();
+}
+}
+
+public static List extractPackages(final Manifest m,
+final String headerName,
+final String defaultVersion,
+final boolean checkOptional) {
+final String pckInfo = m.getMainAttributes().getValue(headerName);
+if (pckInfo != null) {
+final ManifestHeader header = ManifestHeader.parse(pckInfo);
+
+final List pcks = new ArrayList<>();
+for(final ManifestHeader.Entry entry : header.getEntries()) {
+String version = entry.getAttributeValue("version");
+if ( version == null ) {
+version = defaultVersion;
+}
+boolean optional = false;
+if ( checkOptional ) {
+final String resolution = 
entry.getDirectiveValue("resolution");
+optional = "optional".equalsIgnoreCase(resolution);
+}
+final PackageInfo pck = new PackageInfo(entry.getValue(),
+version,
+optional);
+pcks.add(pck);
+}
+
+return pcks;
+}
+return Collections.emptyList();
+}
+
+public static List extractExportedPackages(final Manifest m) {
+return extractPackages(m, Constants.EXPORT_PACKAGE, "0.0.0", false);
+}
+
+public static List extractImportedPackages(final Manifest m) {
+return extractPackages(m, Constants.IMPORT_PACKAGE, null, true);
+}
+
+public static List extractDynamicImportedPackages(final 
Manifest m) {
+return extractPackages(m, Constants.DYNAMICIMPORT_PACKAGE, null, 
false);
+}
+
+public static List extractCapabilities(ManifestParser parser) {
+return parser.getCapabilities();
+}
+
+public static List extractRequirements(ManifestParser parser) 
 {
+return parser.getRequirements();
+}
+
+public static void unmarshallAttribute(String key, Object value, 
BiConsumer sink) {
+unmarshallAttributeOrDirective(key, value, sink);
+}
+
+public static void unmarshallDirective(String key, Object value, 
BiConsumer sink) {
+unmarshallAttributeOrDirective(key, value, sink);
+}
+
+private static void unmarshallAttributeOrDirective(String key, Object 
value, BiConsumer sink) {
+// TODO: parse Attribute Or Directive correctly
+sink.accept(key, value.toString());
+}
+
+public static void marshallAttribute(String key, Object value, 
BiConsumer sink) {
+marsha

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

[Apache Jenkins Server]

See 

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

[radu]

Author: radu
Date: Mon Jul 31 16:23:38 2017
New Revision: 1803550

URL: http://svn.apache.org/viewvc?rev=1803550&view=rev
Log:
SLING-7000 - HTL: URIManipulatorFilterExtension destroys opaque URIs

* applied slightly modified patch submitted by Dirk Rudolph

Added:

sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/extension/ModifiableRequestPathInfoTest.java
Removed:

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

sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/URIManipulationFilterExtension.java

sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/engine/extension/URIManipulationFilterExtensionTest.java
sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
sling/trunk/bundles/scripting/sightly/testing/pom.xml

Modified: 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/URIManipulationFilterExtension.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/URIManipulationFilterExtension.java?rev=1803550&r1=1803549&r2=1803550&view=diff
==
--- 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/URIManipulationFilterExtension.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/URIManipulationFilterExtension.java
 Mon Jul 31 16:23:38 2017
@@ -21,23 +21,30 @@ package org.apache.sling.scripting.sight
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import org.apache.commons.io.FilenameUtils;
+import javax.annotation.Nonnull;
+
 import org.apache.commons.lang.StringUtils;
+import org.apache.sling.api.request.RequestPathInfo;
+import org.apache.sling.api.resource.Resource;
 import org.apache.sling.scripting.sightly.SightlyException;
 import org.apache.sling.scripting.sightly.compiler.RuntimeFunction;
 import org.apache.sling.scripting.sightly.extension.RuntimeExtension;
 import org.apache.sling.scripting.sightly.render.RenderContext;
 import org.apache.sling.scripting.sightly.render.RuntimeObjectModel;
 import org.osgi.service.component.annotations.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component(
 service = RuntimeExtension.class,
@@ -64,6 +71,7 @@ public class URIManipulationFilterExtens
 public static final String ADD_QUERY = "addQuery";
 public static final String REMOVE_QUERY = "removeQuery";
 
+private static final Logger LOG = 
LoggerFactory.getLogger(URIManipulationFilterExtension.class);
 
 @Override
 @SuppressWarnings("unchecked")
@@ -72,156 +80,224 @@ public class URIManipulationFilterExtens
 RuntimeObjectModel runtimeObjectModel = renderContext.getObjectModel();
 String uriString = runtimeObjectModel.toString(arguments[0]);
 Map options = runtimeObjectModel.toMap(arguments[1]);
-StringBuilder sb = new StringBuilder();
-PathInfo pathInfo = new PathInfo(uriString);
-uriAppender(sb, SCHEME, options, pathInfo.getScheme());
-if (sb.length() > 0) {
-sb.append(":");
-
sb.append(StringUtils.defaultIfEmpty(pathInfo.getBeginPathSeparator(), "//"));
-}
-if (sb.length() > 0) {
-uriAppender(sb, DOMAIN, options, pathInfo.getHost());
-} else {
-String domain = getOption(DOMAIN, options, pathInfo.getHost());
-if (StringUtils.isNotEmpty(domain)) {
-sb.append("//").append(domain);
-}
-}
-if (pathInfo.getPort() > -1) {
-sb.append(":").append(pathInfo.getPort());
-}
-String prependPath = getOption(PREPEND_PATH, options, 
StringUtils.EMPTY);
-if (prependPath == null) {
-prependPath = StringUtils.EMPTY;
-}
-String path = getOption(PATH, options, pathInfo.getPath());
-if (StringUtils.isEmpty(path)) {
-// if the path is forced to be empty don't remove the path
-path = pathInfo.getPath();
-}
-if (StringUtils.isNotEmpty(path) && !"/".equals(path)) {
-if (StringUtils.isNotEmpty(prependPath)) 

svn commit: r1803540 - in /sling/whiteboard/cziegeler/feature/src/test: java/org/apache/sling/feature/process/FeatureBuilderTest.java resources/features/process/

[cziegeler]

Author: cziegeler
Date: Mon Jul 31 14:29:24 2017
New Revision: 1803540

URL: http://svn.apache.org/viewvc?rev=1803540&view=rev
Log:
Don't use JSON reader in builder test

Removed:
sling/whiteboard/cziegeler/feature/src/test/resources/features/process/
Modified:

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

Modified: 
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java?rev=1803540&r1=1803539&r2=1803540&view=diff
==
--- 
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature/src/test/java/org/apache/sling/feature/process/FeatureBuilderTest.java
 Mon Jul 31 14:29:24 2017
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,21 +32,38 @@ import org.apache.sling.feature.Capabili
 import org.apache.sling.feature.Configuration;
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.Include;
 import org.apache.sling.feature.Requirement;
-import org.apache.sling.feature.json.U;
 import org.junit.Test;
 
 public class FeatureBuilderTest {
 
+private static final Map FEATURES = new HashMap<>();
+
+static {
+final Feature f1 = new Feature(ArtifactId.fromMvnId("g/a/1"));
+
+f1.getFrameworkProperties().put("foo", "2");
+f1.getFrameworkProperties().put("bar", "X");
+
+f1.getBundles().add(3, new 
Artifact(ArtifactId.fromMvnId("org.apache.sling/foo-bar/4.5.6")));
+f1.getBundles().add(5, new 
Artifact(ArtifactId.fromMvnId("group/testnewversion_low/2")));
+f1.getBundles().add(5, new 
Artifact(ArtifactId.fromMvnId("group/testnewversion_high/2")));
+f1.getBundles().add(5, new 
Artifact(ArtifactId.fromMvnId("group/testnewstartlevel/1")));
+f1.getBundles().add(5, new 
Artifact(ArtifactId.fromMvnId("group/testnewstartlevelandversion/1")));
+
+final Configuration c1 = new Configuration("org.apache.sling.foo");
+c1.getProperties().put("prop", "value");
+f1.getConfigurations().add(c1);
+
+FEATURES.put(f1.getId().toMvnId(), f1);
+}
+
 private final FeatureProvider provider = new FeatureProvider() {
 
 @Override
 public Feature provide(final ArtifactId id) {
-try {
-return U.readFeature("process/" + id.getGroupId() + "-" + 
id.getArtifactId() + "-" + id.getVersion());
-} catch (Exception e) {
-return null;
-}
+return FEATURES.get(id.getGroupId() + "/" + id.getArtifactId() + 
"/" + id.getVersion());
 }
 };
 
@@ -155,7 +173,43 @@ public class FeatureBuilderTest {
 }
 
 @Test public void testNoIncludesNoUpgrade() throws Exception {
-final Feature base = U.readFeature("process/base");
+final Feature base = new 
Feature(ArtifactId.fromMvnId("org.apache.sling/test-feature/1.1"));
+
+final Requirement r1 = new Requirement("osgi.contract");
+r1.getDirectives().put("filter", 
"(&(osgi.contract=JavaServlet)(version=3.1))");
+base.getRequirements().add(r1);
+
+final Capability c1 = new Capability("osgi.implementation");
+c1.getAttributes().put("osgi.implementation", "osgi.http");
+c1.getAttributes().put("version:Version", "1.1");
+c1.getDirectives().put("uses", 
"javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard");
+base.getCapabilities().add(c1);
+final Capability c2 = new Capability("osgi.service");
+c2.getAttributes().put("objectClass:List", 
"org.osgi.service.http.runtime.HttpServiceRuntime");
+c2.getDirectives().put("uses", 
"org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto");
+base.getCapabilities().add(c2);
+
+base.getFrameworkProperties().put("foo", "1");
+base.getFrameworkProperties().put("brave", "something");
+base.getFrameworkProperties().put("org.apache.felix.scr.directory", 
"launchpad/scr");
+
+final Artifact a1 = new 
Artifact(ArtifactId.fromMvnId("org.apache.sling/oak-server/1.0.0"));
+a1.getMetadata().put("hash", "4632463464363646436");
+base.getBundles().add(1, a1);
+base.getBundles().add(1,  new 
Artifact(ArtifactId.fromMvnId("org.apache.sling/application-bundle/2.0.0")));
+base.getBundles().add(1,  new 
Artifact(ArtifactId.fromMvnId("org.apache.sling/another-bundle/2.1.0")));
+base.getBundles().add(2,  

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Launchpad Base 5.6.6-2.6.20 RC1Deployer properties:"userAgent" = "Apache-Maven/3.5.0 (Java 1.8.0_121; Mac OS X 10.12.5)""userId" = "pauls""ip" = "193.105.139.131"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20.pom.asc(SHA1: e61d7a25967d6a8d21c60e799ed57cb70780b9fd)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-sources.jar.asc(SHA1: e2081158de40b9a5b63a74f4c277833c791e8ad4)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20.jar(SHA1: a141f7c81c29b43c93d3ecb2271efaff1bcb1ba1)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-source-release.zip.asc(SHA1: 7822a199d394f61ab8a71a0df988454a49142776)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar.asc(SHA1: 58bb539e5b9a50071237fda2484f48e9a0089271)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-webapp.war.asc(SHA1: 5f86428de5a408f3c7aa66adfc934bc262ce106b)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-sources.jar(SHA1: c68ba51bf3f024854cae9816b3f607dacf257118)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-source-release.zip(SHA1: cf360289fb0663da6856c2e3c0d95d53619d076c)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-app.jar(SHA1: e77cdae57f7db2ebabc33decb20c7dcd0597a7ea)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20-webapp.war(SHA1: b82c26bcf1916f11635619aa0207cf0b7a77e565)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20.pom(SHA1: 6d3b85bfa528efedddaf89977a076f14aa6c603f)/org/apache/sling/org.apache.sling.launchpad.base/5.6.6-2.6.20/org.apache.sling.launchpad.base-5.6.6-2.6.20.jar.asc(SHA1: d4d899c68d27ddeb39de920a5ca9bb93b2d828f7)Action performed by Karl Pauls (pauls)

svn commit: r1803522 - /sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/

[pauls]

Author: pauls
Date: Mon Jul 31 11:24:44 2017
New Revision: 1803522

URL: http://svn.apache.org/viewvc?rev=1803522&view=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.launchpad.base-5.6.6-2.6.20

Added:
sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/   (props changed)
  - copied from r1803521, sling/trunk/launchpad/base/

Propchange: sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/
--
--- svn:ignore (added)
+++ svn:ignore Mon Jul 31 11:24:44 2017
@@ -0,0 +1,14 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml

Propchange: sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jul 31 11:24:44 2017
@@ -0,0 +1 @@
+/incubator/sling/whiteboard/fmeschbe/launchpad/base:734114-735986

svn commit: r1803523 - /sling/trunk/launchpad/base/pom.xml

[pauls]

Author: pauls
Date: Mon Jul 31 11:24:47 2017
New Revision: 1803523

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

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

Modified: sling/trunk/launchpad/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1803523&r1=1803522&r2=1803523&view=diff
==
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Jul 31 11:24:47 2017
@@ -32,7 +32,7 @@
This version is a concatenation of the framework version and a version 
for the launchpad base itself.
For a release only the qualifier (launchpad base version) is increased.
  -->
-5.6.6-2.6.20
+5.6.6-2.6.21-SNAPSHOT
 bundle
 
 Apache Sling Launchpad Base
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base
+http://svn.apache.org/viewvc/sling/trunk/launchpad/base
 
 
 

svn commit: r1803521 - /sling/trunk/launchpad/base/pom.xml

[pauls]

Author: pauls
Date: Mon Jul 31 11:24:30 2017
New Revision: 1803521

URL: http://svn.apache.org/viewvc?rev=1803521&view=rev
Log:
[maven-release-plugin] prepare release 
org.apache.sling.launchpad.base-5.6.6-2.6.20

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

Modified: sling/trunk/launchpad/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1803521&r1=1803520&r2=1803521&view=diff
==
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Jul 31 11:24:30 2017
@@ -32,7 +32,7 @@
This version is a concatenation of the framework version and a version 
for the launchpad base itself.
For a release only the qualifier (launchpad base version) is increased.
  -->
-5.6.6-2.6.19-SNAPSHOT
+5.6.6-2.6.20
 bundle
 
 Apache Sling Launchpad Base
@@ -42,9 +42,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/base
-
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/base
-http://svn.apache.org/viewvc/sling/trunk/launchpad/base
+
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
+
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
+
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.base-5.6.6-2.6.20
 
 
 

svn commit: r1803520 - /sling/trunk/launchpad/base/pom.xml

[pauls]

Author: pauls
Date: Mon Jul 31 11:22:53 2017
New Revision: 1803520

URL: http://svn.apache.org/viewvc?rev=1803520&view=rev
Log:
SLING-7022: Update to Felix Framework 5.6.6.

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

Modified: sling/trunk/launchpad/base/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1803520&r1=1803519&r2=1803520&view=diff
==
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Mon Jul 31 11:22:53 2017
@@ -32,7 +32,7 @@
This version is a concatenation of the framework version and a version 
for the launchpad base itself.
For a release only the qualifier (launchpad base version) is increased.
  -->
-5.6.4-2.6.19-SNAPSHOT
+5.6.6-2.6.19-SNAPSHOT
 bundle
 
 Apache Sling Launchpad Base
@@ -253,7 +253,7 @@
 
 org.apache.felix
 org.apache.felix.framework
-5.6.4
+5.6.6
 provided