Author: cziegeler
Date: Mon Aug 7 08:58:13 2017
New Revision: 1804299
URL: http://svn.apache.org/viewvc?rev=1804299&view=rev
Log:
Update framework version, reduse logging to debug
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Modified:
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java?rev=1804299&r1=1804298&r2=1804299&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
(original)
+++
sling/whiteboard/cziegeler/feature-analyser/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
Mon Aug 7 08:58:13 2017
@@ -75,7 +75,7 @@ public class ContentPackageScanner {
final Set<ContentPackageDescriptor> infos,
final File archive)
throws IOException {
- logger.info("Analyzing Content Package {}", archive.getName());
+ logger.debug("Analyzing Content Package {}", archive.getName());
final File tempDir = Files.createTempDirectory(null).toFile();
try {
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1804299&r1=1804298&r2=1804299&view=diff
==============================================================================
---
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
(original)
+++
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java
Mon Aug 7 08:58:13 2017
@@ -16,13 +16,6 @@
*/
package org.apache.sling.feature.support;
-import org.apache.sling.feature.Application;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.process.ApplicationBuilder;
-import org.apache.sling.feature.process.FeatureProvider;
-import org.apache.sling.feature.support.json.FeatureJSONReader;
-
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
@@ -32,6 +25,13 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import org.apache.sling.feature.Application;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.process.ApplicationBuilder;
+import org.apache.sling.feature.process.FeatureProvider;
+import org.apache.sling.feature.support.json.FeatureJSONReader;
+
public class FeatureUtil {
/**
@@ -43,7 +43,7 @@ public class FeatureUtil {
public static ArtifactId getFelixFrameworkId(final String version) {
return new ArtifactId("org.apache.felix",
"org.apache.felix.framework",
- version != null ? version : "5.6.4", null, null);
+ version != null ? version : "5.6.6", null, null);
}
static final Comparator<String> FEATURE_PATH_COMP = new
Comparator<String>() {
