You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/04/27 10:02:52 UTC
[sling-org-apache-sling-feature-resolver] 08/20: Move
FeatureResource to support package.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-resolver.git
commit 83080a4e38b1a041b75ca6791136fcf9561960e7
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Apr 17 09:45:11 2018 +0300
Move FeatureResource to support package.
---
src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java | 2 +-
.../java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java | 2 +-
.../org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java | 2 +-
.../java/org/apache/sling/feature/resolver/FrameworkResolverTest.java | 2 +-
.../org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java b/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
index dccf74b..83767b2 100644
--- a/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
+++ b/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
@@ -19,7 +19,6 @@ package org.apache.sling.feature.resolver;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
import org.apache.sling.feature.resolver.impl.BundleResourceImpl;
@@ -27,6 +26,7 @@ import org.apache.sling.feature.resolver.impl.FeatureResourceImpl;
import org.apache.sling.feature.resolver.impl.ResolveContextImpl;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.process.FeatureResolver;
+import org.apache.sling.feature.support.process.FeatureResource;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
diff --git a/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java b/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
index 5053a1d..e6e061a 100644
--- a/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
+++ b/src/main/java/org/apache/sling/feature/resolver/impl/BundleResourceImpl.java
@@ -18,10 +18,10 @@ package org.apache.sling.feature.resolver.impl;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
import org.apache.sling.feature.OSGiCapability;
import org.apache.sling.feature.OSGiRequirement;
import org.apache.sling.feature.analyser.BundleDescriptor;
+import org.apache.sling.feature.support.process.FeatureResource;
import org.apache.sling.feature.support.util.PackageInfo;
import org.osgi.framework.Version;
import org.osgi.framework.VersionRange;
diff --git a/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java b/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
index dc5c6b9..4b0c145 100644
--- a/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
+++ b/src/main/java/org/apache/sling/feature/resolver/impl/FeatureResourceImpl.java
@@ -18,9 +18,9 @@ package org.apache.sling.feature.resolver.impl;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
import org.apache.sling.feature.OSGiCapability;
import org.apache.sling.feature.OSGiRequirement;
+import org.apache.sling.feature.support.process.FeatureResource;
import org.osgi.framework.Version;
import org.osgi.framework.namespace.IdentityNamespace;
import org.osgi.resource.Capability;
diff --git a/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java b/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
index 0617237..093b873 100644
--- a/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
+++ b/src/test/java/org/apache/sling/feature/resolver/FrameworkResolverTest.java
@@ -17,13 +17,13 @@
package org.apache.sling.feature.resolver;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
import org.apache.sling.feature.support.ArtifactHandler;
import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.json.FeatureJSONReader;
import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
import org.apache.sling.feature.support.process.FeatureResolver;
+import org.apache.sling.feature.support.process.FeatureResource;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java b/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
index 68f572e..cbc9ff1 100644
--- a/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
+++ b/src/test/java/org/apache/sling/feature/resolver/impl/BundleResourceImplTest.java
@@ -19,12 +19,12 @@ package org.apache.sling.feature.resolver.impl;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
import org.apache.sling.feature.OSGiCapability;
import org.apache.sling.feature.OSGiRequirement;
import org.apache.sling.feature.analyser.BundleDescriptor;
import org.apache.sling.feature.analyser.Descriptor;
import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
+import org.apache.sling.feature.support.process.FeatureResource;
import org.apache.sling.feature.support.util.PackageInfo;
import org.junit.Test;
import org.mockito.Mockito;
--
To stop receiving notification emails like this one, please contact
davidb@apache.org.