This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new 98d29ac Move file based artifact management into separate package
98d29ac is described below
commit 98d29ac685d1bb5eedeca5c18603eed967acdc41
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Oct 1 14:16:23 2018 +0200
Move file based artifact management into separate package
---
src/main/java/org/apache/sling/feature/analyser/main/Main.java | 6 +++---
src/main/java/org/apache/sling/feature/scanner/Scanner.java | 2 +-
.../sling/feature/scanner/impl/ApiRegionsExtensionScanner.java | 2 +-
.../sling/feature/scanner/impl/ContentPackagesExtensionScanner.java | 2 +-
.../java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java | 2 +-
.../java/org/apache/sling/feature/scanner/spi/ExtensionScanner.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/analyser/main/Main.java
b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
index 45f8ece..31e0f78 100644
--- a/src/main/java/org/apache/sling/feature/analyser/main/Main.java
+++ b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
@@ -28,8 +28,8 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.analyser.Analyser;
-import org.apache.sling.feature.io.DefaultArtifactManagerConfig;
-import org.apache.sling.feature.io.DefaultArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManagerConfig;
import org.apache.sling.feature.io.json.FeatureJSONReader;
import org.apache.sling.feature.scanner.Scanner;
import org.slf4j.Logger;
@@ -90,7 +90,7 @@ public class Main {
}
try {
- final Scanner scanner = new
Scanner(DefaultArtifactManager.getArtifactManager(new
DefaultArtifactManagerConfig()));
+ final Scanner scanner = new
Scanner(ArtifactManager.getArtifactManager(new ArtifactManagerConfig()));
final Analyser analyser;
if (pluginClass != null) {
analyser = new Analyser(scanner, pluginClass);
diff --git a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
index 3f0e1ba..989d505 100644
--- a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
@@ -30,7 +30,7 @@ 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.io.ArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManager;
import org.apache.sling.feature.scanner.impl.BundleDescriptorImpl;
import org.apache.sling.feature.scanner.impl.FeatureDescriptorImpl;
import org.apache.sling.feature.scanner.spi.ExtensionScanner;
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/ApiRegionsExtensionScanner.java
b/src/main/java/org/apache/sling/feature/scanner/impl/ApiRegionsExtensionScanner.java
index 0aaa9b5..92d1fac 100644
---
a/src/main/java/org/apache/sling/feature/scanner/impl/ApiRegionsExtensionScanner.java
+++
b/src/main/java/org/apache/sling/feature/scanner/impl/ApiRegionsExtensionScanner.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManager;
import org.apache.sling.feature.scanner.BundleDescriptor;
import org.apache.sling.feature.scanner.ContainerDescriptor;
import org.apache.sling.feature.scanner.FeatureDescriptor;
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
index f5791da..de7dcfe 100644
---
a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
+++
b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackagesExtensionScanner.java
@@ -25,7 +25,7 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.FeatureConstants;
-import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManager;
import org.apache.sling.feature.scanner.ContainerDescriptor;
import org.apache.sling.feature.scanner.spi.ExtensionScanner;
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
b/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
index 39fff51..e8304a4 100644
--- a/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/RepoInitScanner.java
@@ -24,7 +24,7 @@ import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.FeatureConstants;
-import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManager;
import org.apache.sling.feature.scanner.ContainerDescriptor;
import org.apache.sling.feature.scanner.spi.ExtensionScanner;
import org.osgi.resource.Requirement;
diff --git
a/src/main/java/org/apache/sling/feature/scanner/spi/ExtensionScanner.java
b/src/main/java/org/apache/sling/feature/scanner/spi/ExtensionScanner.java
index 1ef993d..8881237 100644
--- a/src/main/java/org/apache/sling/feature/scanner/spi/ExtensionScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/spi/ExtensionScanner.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.io.ArtifactManager;
+import org.apache.sling.feature.io.file.ArtifactManager;
import org.apache.sling.feature.scanner.ContainerDescriptor;
import org.osgi.annotation.versioning.ConsumerType;
