Build failed in Jenkins: sling-org-apache-sling-commons-cache-portal-1.8 #45

[Apache Jenkins Server]

See 


--
Started by upstream project "sling-org-apache-sling-commons-cache-api-1.8" 
build number 24
originally caused by:
 Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on H23 (ubuntu xenial) in workspace 

Cloning the remote Git repository
Cloning repository 
https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git
 > git init 
 > 
 >  # timeout=10
Fetching upstream changes from 
https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git
 > git --version # timeout=10
 > git fetch --tags --progress 
 > https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url 
 > https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git # 
 > timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
 > git config remote.origin.url 
 > https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git # 
 > timeout=10
Fetching upstream changes from 
https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git
 > git fetch --tags --progress 
 > https://github.com/apache/sling-org-apache-sling-commons-cache-portal.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse origin/master^{commit} # timeout=10
Checking out Revision 089669d5985d5bec28f306e3a048b32fc1b5c601 (origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 089669d5985d5bec28f306e3a048b32fc1b5c601
Commit message: "SLING-7213 - Add a default .gitignore file to every module"
 > git rev-list --no-walk 089669d5985d5bec28f306e3a048b32fc1b5c601 # timeout=10
Parsing POMs
Established TCP socket on 34722
maven33-agent.jar already up to date
maven33-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[sling-org-apache-sling-commons-cache-portal-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 34722
<===[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 Cache Portal Cache 0.1-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.cache.api/0.1-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.cache.api/0.1-SNAPSHOT/maven-metadata.xml
 (1010 B at 2.5 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.cache.api/0.1-SNAPSHOT/org.apache.sling.commons.cache.api-0.1-20180416.084430-29.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.cache.api/0.1-SNAPSHOT/org.apache.sling.commons.cache.api-0.1-20180416.084430-29.pom
 (3 KB at 9.6 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/portal/org.apache.sling.portal.container/0.6.0-SNAPSHOT/maven-metadata.xml
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/portal/org.apache.sling.portal.container/0.6.0-SNAPSHOT/org.apache.sling.portal.container-0.6.0-SNAPSHOT.pom
[WARNING] The POM for 
org.apache.sling.portal:org.apache.sling.portal.container:jar:0.6.0-SNAPSHOT is 
missing, no dependency information available
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.cache.api/0.1-SNAPSHOT/org.apache.sling.commons.cache.api-0.1-20180416.084430-29.jar
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/portal/org.apache.sling.portal.container/0.6.0-SNAPSHOT/org.apache.sling.portal.container-0.6.0-SNAPSHOT.jar
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.commons.cache.api/0.1-SNAPSHOT/org.apach

Jenkins build is still unstable: sling-org-apache-sling-commons-cache-ehcache-1.8 #90

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-org-apache-sling-launchpad-contrib-testing-1.8 #25

[Apache Jenkins Server]

See 

[sling-ide-tooling] 01/01: SLING-5618 - Make the ResourceChangeCommandFactory independent from Eclipse

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-5618
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git

commit bfb9237e07cffb20e05c0e6c9ae32d4e4a2a4ec9
Author: Robert Munteanu 
AuthorDate: Fri Apr 13 18:04:38 2018 +0300

SLING-5618 - Make the ResourceChangeCommandFactory independent from Eclipse

- Introduce abstractions in the API module which support
  working with the ResourceChangeCommandFactory outside of Eclipse.
- Implement needed abstractions in the eclipse-core module and stop using
  the ResourceChangeCommandFactory internally
- The ResourceChangeCommandFactory is now left only as a deprecated stub
  until the tests are ported to use the DefaultCommandFactoryImpl.
---
 eclipse/eclipse-core/META-INF/MANIFEST.MF  |   1 +
 .../sling/ide/eclipse/core/EclipseResources.java   |  52 ++
 .../sling/ide/eclipse/core/ResourceUtil.java   |   3 +-
 .../sling/ide/eclipse/core/internal/Activator.java |  10 +
 .../internal/ResourceChangeCommandFactory.java | 522 +
 .../core/internal/SlingLaunchpadBehaviour.java |   2 +-
 .../sync/content/EclipseWorkspaceDirectory.java|  75 +++
 .../sync/content/EclipseWorkspaceFile.java |  62 +++
 .../sync/content/EclipseWorkspaceProject.java  |  63 +++
 .../sync/content/EclipseWorkspaceResource.java | 116 +
 .../impl/ResourceChangeCommandFactoryTest.java |   2 +-
 eclipse/eclipse-ui/META-INF/MANIFEST.MF|   1 +
 .../sling/ide/eclipse/ui/internal/Activator.java   |  12 +-
 .../ide/eclipse/ui/internal/ExportWizard.java  |  27 +-
 .../ui/internal/ImportRepositoryContentAction.java |   8 +-
 .../ide/serialization/SerializationManager.java|  13 +
 .../sling/ide/sync/content/SyncCommandFactory.java |  71 +++
 .../sling/ide/sync/content/WorkspaceDirectory.java |  53 +++
 .../content/WorkspaceFile.java}|  41 +-
 .../sling/ide/sync/content/WorkspacePath.java  | 126 +
 .../sling/ide/sync/content/WorkspacePaths.java |  37 ++
 .../sling/ide/sync/content/WorkspaceProject.java   |  35 ++
 .../sling/ide/sync/content/WorkspaceResource.java  |  93 
 .../content/impl/DefaultSyncCommandFactory.java| 447 ++
 .../sling/ide/sync/content/package-info.java   |  19 +
 .../sling/ide/transport}/ResourceAndInfo.java  |   5 +-
 .../java/org/apache/sling/ide/util/PathUtil.java   |   3 +
 .../sling/ide/sync/content/WorkspacePathTest.java  | 175 +++
 .../sling/ide/sync/content/WorkspacePathsTest.java |  33 ++
 29 files changed, 1548 insertions(+), 559 deletions(-)

diff --git a/eclipse/eclipse-core/META-INF/MANIFEST.MF 
b/eclipse/eclipse-core/META-INF/MANIFEST.MF
index bd419a5..0d667cd 100644
--- a/eclipse/eclipse-core/META-INF/MANIFEST.MF
+++ b/eclipse/eclipse-core/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Import-Package: org.apache.commons.httpclient;version="3.1.0",
  org.apache.sling.ide.log,
  org.apache.sling.ide.osgi,
  org.apache.sling.ide.serialization,
+ org.apache.sling.ide.sync.content,
  org.apache.sling.ide.transport,
  org.apache.sling.ide.util,
  org.eclipse.core.commands,
diff --git 
a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/EclipseResources.java
 
b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/EclipseResources.java
new file mode 100644
index 000..e839076
--- /dev/null
+++ 
b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/EclipseResources.java
@@ -0,0 +1,52 @@
+/*
+ * 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.ide.eclipse.core;
+
+import java.util.Set;
+
+import org.apache.sling.ide.eclipse.core.internal.Activator;
+import 
org.apache.sling.ide.eclipse.core.internal.sync.content.EclipseWorkspaceDirectory;
+import 
org.apache.sling.ide.eclipse.core.internal.sync.content.EclipseWorkspaceFile;
+import 
org.apache.sling.ide.eclipse.core.internal.sync.content.EclipseWorkspaceProject;
+import org.apache.sling.ide.sync.content.WorkspaceResource;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.reso

[sling-ide-tooling] branch feature/SLING-5618 created (now bfb9237)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch feature/SLING-5618
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git.


  at bfb9237  SLING-5618 - Make the ResourceChangeCommandFactory 
independent from Eclipse

This branch includes the following new commits:

 new bfb9237  SLING-5618 - Make the ResourceChangeCommandFactory 
independent from Eclipse

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
romb...@apache.org.

[sling-tooling-jenkins] branch master updated: Pipeline support: clarify needed scopes

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git


The following commit(s) were added to refs/heads/master by this push:
 new c98e3c5  Pipeline support: clarify needed scopes
c98e3c5 is described below

commit c98e3c54273386e0656b60c3e987548a5222f2a0
Author: Robert Munteanu 
AuthorDate: Mon Apr 16 15:23:51 2018 +0300

Pipeline support: clarify needed scopes
---
 create_jobs.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/create_jobs.groovy b/create_jobs.groovy
index e400cfe..af10943 100644
--- a/create_jobs.groovy
+++ b/create_jobs.groovy
@@ -95,7 +95,7 @@ modules.each { module ->
 for more details''')
 branchSources {
 github {
-scanCredentialsId('sling-github-token')
+scanCredentialsId('sling-github-token') // needs 
repo:status scope
 repoOwner('apache')
 repository(module.location)
 }

-- 
To stop receiving notification emails like this one, please contact
romb...@apache.org.

[sling-whiteboard] branch master updated: Allow null for attributes or requirements. Throw ISE if namespace is null

[cziegeler]

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-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
 new 1712660  Allow null for attributes or requirements. Throw ISE if 
namespace is null
1712660 is described below

commit 1712660caf69aeab56e58d4f209d188594ebc7fd
Author: Carsten Ziegeler 
AuthorDate: Mon Apr 16 16:24:47 2018 +0200

Allow null for attributes or requirements. Throw ISE if namespace is null
---
 .../feature/AbstractCapabilityRequirement.java | 56 ++
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git 
a/featuremodel/feature/src/main/java/org/apache/sling/feature/AbstractCapabilityRequirement.java
 
b/featuremodel/feature/src/main/java/org/apache/sling/feature/AbstractCapabilityRequirement.java
index 200cb92..8a4982f 100644
--- 
a/featuremodel/feature/src/main/java/org/apache/sling/feature/AbstractCapabilityRequirement.java
+++ 
b/featuremodel/feature/src/main/java/org/apache/sling/feature/AbstractCapabilityRequirement.java
@@ -23,30 +23,57 @@ import java.util.Map;
 import org.osgi.resource.Resource;
 
 abstract class AbstractCapabilityRequirement {
-private final Resource resource;
+
+/** The namespace. Required. */
 private final String namespace;
+
+/** Optional resource. */
+private final Resource resource;
+
+/** Optional attributes. Never null. */
 private final Map attributes;
+
+/** Optional attributes. Never null. */
 private final Map directives;
 
-AbstractCapabilityRequirement(Resource res, String ns, Map 
attrs, Map dirs) {
+AbstractCapabilityRequirement(final Resource res, final String ns, final 
Map attrs, final Map dirs) {
+if ( ns == null ) {
+throw new IllegalArgumentException("Namespace must not be null.");
+}
 resource = res;
 namespace = ns;
-attributes = Collections.unmodifiableMap(new HashMap<>(attrs));
-directives = Collections.unmodifiableMap(new HashMap<>(dirs));
+attributes = attrs == null ? Collections.emptyMap() : 
Collections.unmodifiableMap(new HashMap<>(attrs));
+directives = dirs == null ? Collections.emptyMap() : 
Collections.unmodifiableMap(new HashMap<>(dirs));
 }
 
+/**
+ * Return the namespace.
+ * @return The namespace. This is never @{code null}.
+ */
 public String getNamespace() {
 return namespace;
 }
 
+/**
+ * Return the attributes.
+ * @return The attributes, might be empty.
+ */
 public Map getAttributes() {
 return attributes;
 }
 
+/**
+ * Return the directives.
+ * @return The directives, might be empty.
+ */
 public Map getDirectives() {
 return directives;
 }
 
+/**
+ * Return the resource.
+ * @return The resource or @{code null}.
+ */
 public Resource getResource() {
 return resource;
 }
@@ -55,9 +82,9 @@ abstract class AbstractCapabilityRequirement {
 public int hashCode() {
 final int prime = 31;
 int result = 1;
-result = prime * result + ((attributes == null) ? 0 : 
attributes.hashCode());
-result = prime * result + ((directives == null) ? 0 : 
directives.hashCode());
-result = prime * result + ((namespace == null) ? 0 : 
namespace.hashCode());
+result = prime * result + attributes.hashCode();
+result = prime * result + directives.hashCode();
+result = prime * result + namespace.hashCode();
 return result;
 }
 
@@ -70,20 +97,11 @@ abstract class AbstractCapabilityRequirement {
 if (getClass() != obj.getClass())
 return false;
 AbstractCapabilityRequirement other = (AbstractCapabilityRequirement) 
obj;
-if (attributes == null) {
-if (other.attributes != null)
-return false;
-} else if (!attributes.equals(other.attributes))
+if (!namespace.equals(other.namespace))
 return false;
-if (directives == null) {
-if (other.directives != null)
-return false;
-} else if (!directives.equals(other.directives))
+if (!attributes.equals(other.attributes))
 return false;
-if (namespace == null) {
-if (other.namespace != null)
-return false;
-} else if (!namespace.equals(other.namespace))
+if (!directives.equals(other.directives))
 return false;
 return true;
 }

-- 
To stop receiving notification emails like this one, please contact
cziege...@apache.org.

[sling-ide-tooling] branch feature/SLING-5618 updated (bfb9237 -> adb0523)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to branch feature/SLING-5618
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git.


from bfb9237  SLING-5618 - Make the ResourceChangeCommandFactory 
independent from Eclipse
 new d4a0ccb  SLING-5618 - Make the ResourceChangeCommandFactory 
independent from Eclipse
 new adb0523  SLING-7585 - Fix Eclipse in-IDE errors after creating shared 
modules

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../internal/ResourceChangeCommandFactory.java |  64 
 .../core/internal/SlingLaunchpadBehaviour.java |  12 +-
 eclipse/eclipse-m2e-ui/META-INF/MANIFEST.MF|   3 +-
 eclipse/eclipse-test/META-INF/MANIFEST.MF  |   1 +
 .../org/apache/sling/ide/test/impl/Activator.java  |  11 ++
 ...est.java => DefaultCommandFactoryImplTest.java} |  56 +++
 .../ide/eclipse/ui/internal/ExportWizard.java  |   1 -
 .../ui/internal/ImportRepositoryContentAction.java |   1 -
 shared/modules/pom.xml |   1 -
 shared/modules/vlt-wrapper/bnd.bnd |  57 ---
 shared/modules/vlt-wrapper/pom.xml | 133 ---
 shared/p2/pom.xml  |   5 +-
 shared/p2/shared-feature/feature.xml   |   6 +-
 shared/p2/shared-feature/pom.xml   |   6 +-
 .../p2/vlt-wrapper}/META-INF/LICENSE   |   0
 shared/p2/vlt-wrapper/META-INF/MANIFEST.MF |  73 +
 .../p2/vlt-wrapper}/META-INF/NOTICE|   2 +-
 shared/{modules => p2}/vlt-wrapper/README.md   |   0
 shared/p2/vlt-wrapper/build.properties |  18 +++
 .../p2/vlt-wrapper}/lib/.gitignore |   0
 shared/p2/vlt-wrapper/pom.xml  | 178 +
 21 files changed, 328 insertions(+), 300 deletions(-)
 delete mode 100644 
eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
 rename 
eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/{ResourceChangeCommandFactoryTest.java
 => DefaultCommandFactoryImplTest.java} (83%)
 delete mode 100644 shared/modules/vlt-wrapper/bnd.bnd
 delete mode 100644 shared/modules/vlt-wrapper/pom.xml
 copy {eclipse/sightly-feature => shared/p2/vlt-wrapper}/META-INF/LICENSE (100%)
 create mode 100644 shared/p2/vlt-wrapper/META-INF/MANIFEST.MF
 copy {eclipse/eclipse-core => shared/p2/vlt-wrapper}/META-INF/NOTICE (87%)
 rename shared/{modules => p2}/vlt-wrapper/README.md (100%)
 create mode 100644 shared/p2/vlt-wrapper/build.properties
 copy {eclipse/eclipse-ui => shared/p2/vlt-wrapper}/lib/.gitignore (100%)
 create mode 100644 shared/p2/vlt-wrapper/pom.xml

-- 
To stop receiving notification emails like this one, please contact
romb...@apache.org.

[sling-ide-tooling] 02/02: SLING-7585 - Fix Eclipse in-IDE errors after creating shared modules

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-5618
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git

commit adb052307c99d3a21232eaab48b6b855c66b3cf9
Author: Robert Munteanu 
AuthorDate: Mon Apr 16 23:56:31 2018 +0300

SLING-7585 - Fix Eclipse in-IDE errors after creating shared modules

Move vlt-wrapper under shared/p2 . This artifact is only needed in Eclipse,
where OSGi bundles need to come from p2 repos, so it's not really
needed in the 'shared/modules' part. Additionally, the packages it
exports are not available in Eclipse and cause compiler errors (although
Tycho works fine).

The module could have ended up under eclipse/, but in order to build
the shared p2 feature we need a bundle providing javax.jcr.* and
a couple of Jackrabbit packages, so we went with shared/p2.
---
 eclipse/eclipse-test/META-INF/MANIFEST.MF  |   1 +
 shared/modules/pom.xml |   1 -
 shared/modules/vlt-wrapper/bnd.bnd |  57 ---
 shared/modules/vlt-wrapper/pom.xml | 133 ---
 shared/p2/pom.xml  |   5 +-
 shared/p2/shared-feature/feature.xml   |   6 +-
 shared/p2/shared-feature/pom.xml   |   6 +-
 .../feature.xml => vlt-wrapper/META-INF/LICENSE}   |  98 +++-
 shared/p2/vlt-wrapper/META-INF/MANIFEST.MF |  73 +
 shared/p2/vlt-wrapper/META-INF/NOTICE  |  11 ++
 shared/{modules => p2}/vlt-wrapper/README.md   |   0
 shared/p2/vlt-wrapper/build.properties |  18 +++
 shared/p2/vlt-wrapper/lib/.gitignore   |   1 +
 shared/p2/vlt-wrapper/pom.xml  | 178 +
 14 files changed, 313 insertions(+), 275 deletions(-)

diff --git a/eclipse/eclipse-test/META-INF/MANIFEST.MF 
b/eclipse/eclipse-test/META-INF/MANIFEST.MF
index 5cf871d..2913950 100644
--- a/eclipse/eclipse-test/META-INF/MANIFEST.MF
+++ b/eclipse/eclipse-test/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Require-Bundle: org.junit,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
  org.eclipse.wst.server.core,
+ org.eclipse.ui.navigator,
  org.apache.sling.ide.eclipse-core,
  org.apache.sling.ide.eclipse-ui,
  org.apache.sling.ide.eclipse-sightly-core,
diff --git a/shared/modules/pom.xml b/shared/modules/pom.xml
index a9c1920..3d11973 100644
--- a/shared/modules/pom.xml
+++ b/shared/modules/pom.xml
@@ -37,7 +37,6 @@
 api
 impl-resource
 impl-vlt
-vlt-wrapper
 artifacts
 
 
diff --git a/shared/modules/vlt-wrapper/bnd.bnd 
b/shared/modules/vlt-wrapper/bnd.bnd
deleted file mode 100644
index b27c029..000
--- a/shared/modules/vlt-wrapper/bnd.bnd
+++ /dev/null
@@ -1,57 +0,0 @@
-Bundle-ActivationPolicy: lazy
-
--exportcontents: javax.jcr,\
- javax.jcr.nodetype,\
- javax.jcr.lock,\
- javax.jcr.observation, \
- javax.jcr.query, \
- javax.jcr.query.qom, \
- javax.jcr.retention, \
- javax.jcr.security , \
- javax.jcr.util, \
- javax.jcr.version, \
- org.apache.jackrabbit.api,\
- org.apache.jackrabbit.api.management, \
- org.apache.jackrabbit.api.security.authorization, \
- org.apache.jackrabbit.api.security.principal, \
- org.apache.jackrabbit.api.security.user, \
- org.apache.jackrabbit.spi,\
- org.apache.jackrabbit.spi.commons.conversion,\
- org.apache.jackrabbit.spi.commons.namespace,\
- org.apache.jackrabbit.util,\
- org.apache.jackrabbit.vault.davex,\
- org.apache.jackrabbit.vault.fs,\
- org.apache.jackrabbit.vault.fs.api,\
- org.apache.jackrabbit.vault.fs.config,\
- org.apache.jackrabbit.vault.fs.filter,\
- org.apache.jackrabbit.vault.fs.impl,\
- org.apache.jackrabbit.vault.fs.impl.aggregator,\
- org.apache.jackrabbit.vault.fs.impl.io,\
- org.apache.jackrabbit.vault.fs.impl.io.legacycnd,\
- org.apache.jackrabbit.vault.fs.io,\
- org.apache.jackrabbit.vault.fs.spi,\
- org.apache.jackrabbit.vault.fs.spi.impl.jcr20,\
- org.apache.jackrabbit.vault.packaging,\
- org.apache.jackrabbit.vault.packaging.impl,\
- org.apache.jackrabbit.vault.util,\
- org.apache.jackrabbit.vault.util.xml.serialize,\
- org.apache.jackrabbit.vault.util.xml.xerces.dom,\
- org.apache.jackrabbit.vault.util.xml.xerces.util,\
- org.apache.jackrabbit.vault.util.xml.xerces.xni,\
- org.apache.jackrabbit.vault.util.xml.xerces.xni.parser
-
--includeresource: guava-*.jar;lib:=true,\
-jackrabbit-*.jar;lib:=true, \
-vault-*;lib:=true, \
-org.apache.jackrabbit.vault-*.jar;lib:=true, \
-http*.jar;lib:=true, \
-jcr-*.jar;lib:=true
-
-Import-Package: sun.misc;resolution:=optional, \
- org.apache.commons.codec;version="[1.3.0,2)", \
- org.apache.commons.codec.binary;version="[1.3.0,2)", \
- org.apache.commons.io;version="[1.4,3)", \
- org.apache.commons.io.input;version="[1.4,3)", \
- org.apache.commons.io.output;version="[1.4,3)", \
- !org.apache.sling.*, \
- *
diff --git a/shared/modules/vlt-wrapper/p

[sling-ide-tooling] 01/02: SLING-5618 - Make the ResourceChangeCommandFactory independent from Eclipse

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-5618
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git

commit d4a0ccb6084a684ee1291395026cb50b18e2c058
Author: Robert Munteanu 
AuthorDate: Fri Apr 13 18:04:38 2018 +0300

SLING-5618 - Make the ResourceChangeCommandFactory independent from Eclipse

Completely remove the ResourceChangeCommandFactory
---
 .../internal/ResourceChangeCommandFactory.java | 64 --
 .../core/internal/SlingLaunchpadBehaviour.java | 12 ++--
 eclipse/eclipse-m2e-ui/META-INF/MANIFEST.MF|  3 +-
 .../org/apache/sling/ide/test/impl/Activator.java  | 11 
 ...est.java => DefaultCommandFactoryImplTest.java} | 56 ++-
 .../ide/eclipse/ui/internal/ExportWizard.java  |  1 -
 .../ui/internal/ImportRepositoryContentAction.java |  1 -
 7 files changed, 48 insertions(+), 100 deletions(-)

diff --git 
a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
 
b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
deleted file mode 100644
index 4e6a9f8..000
--- 
a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ResourceChangeCommandFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.ide.eclipse.core.internal;
-
-import java.io.IOException;
-
-import org.apache.sling.ide.eclipse.core.EclipseResources;
-import org.apache.sling.ide.transport.Command;
-import org.apache.sling.ide.transport.Repository;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Status;
-
-/**
- * The ResourceChangeCommandFactory creates new {@link #Command 
commands} correspoding to resource addition,
- * change, or removal
- *
- * @deprecated - Use the {@link DefaultCommandFactory} instead. This class is 
present until the tests are migrated off it
- */
-@Deprecated
-public class ResourceChangeCommandFactory {
-
-public Command newCommandForAddedOrUpdated(Repository repository, 
IResource addedOrUpdated) throws CoreException {
-
-try {
-return 
Activator.getDefault().getCommandFactory().newCommandForAddedOrUpdatedResource(repository,
 EclipseResources.create(addedOrUpdated));
-} catch (IOException e) {
-throw new CoreException(new Status(Status.ERROR, 
Activator.PLUGIN_ID, "Failed updating " + addedOrUpdated,
-e));
-}
-}
-
-public Command newCommandForRemovedResources(Repository repository, 
IResource removed) throws CoreException {
-try {
-return  
Activator.getDefault().getCommandFactory().newCommandForRemovedResource(repository,
 EclipseResources.create(removed));
-} catch (IOException e) {
-throw new CoreException(new Status(Status.ERROR, 
Activator.PLUGIN_ID, "Failed removing" + removed, e));
-}
-}
-
-public Command newReorderChildNodesCommand(Repository repository, 
IResource res) throws CoreException {
-try {
-return  
Activator.getDefault().getCommandFactory().newReorderChildNodesCommand(repository,
 EclipseResources.create(res));
-} catch (IOException e) {
-throw new CoreException(new Status(Status.ERROR, 
Activator.PLUGIN_ID, "Failed reordering child nodes for "
-+ res, e));
-}
-}
-
-}
diff --git 
a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
 
b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
index 47aa0fe..d33145b 100644
--- 
a/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
+++ 
b/eclipse/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
@@ -30,12 +30,14 @@ import java.util.Set;
 
 import org.apache.sling.ide.artifacts.EmbeddedArtifact;
 import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
+import org.apache.sling.ide.eclipse.core.Eclipse

[sling-ide-tooling] branch feature/SLING-5618 updated: SLING-7585 - Fix Eclipse in-IDE errors after creating shared modules

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-5618
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git


The following commit(s) were added to refs/heads/feature/SLING-5618 by this 
push:
 new 66cea58  SLING-7585 - Fix Eclipse in-IDE errors after creating shared 
modules
66cea58 is described below

commit 66cea5808651550c16cfc8d428272ef0240e7672
Author: Robert Munteanu 
AuthorDate: Tue Apr 17 00:05:32 2018 +0300

SLING-7585 - Fix Eclipse in-IDE errors after creating shared modules

Improve in-place OSGI metadata copying for pure Maven modules:

- remove META-INF and OSGI-INF on clean
- copy SCR descriptors as well
---
 shared/modules/.gitignore |  1 +
 shared/modules/parent/pom.xml | 40 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/shared/modules/.gitignore b/shared/modules/.gitignore
index 6cb2adc..1cf10b6 100644
--- a/shared/modules/.gitignore
+++ b/shared/modules/.gitignore
@@ -1 +1,2 @@
 MANIFEST.MF
+OSGI-INF/
diff --git a/shared/modules/parent/pom.xml b/shared/modules/parent/pom.xml
index b5c67dc..e0e68fe 100644
--- a/shared/modules/parent/pom.xml
+++ b/shared/modules/parent/pom.xml
@@ -42,6 +42,7 @@
 
 
 **/MANIFEST.MF
+**/OSGI-INF/*.xml
 
 
 
@@ -61,11 +62,30 @@
 
 
 
+maven-clean-plugin
+
+
+
+META-INF
+
+*
+
+
+
+OSGI-INF
+
+*
+
+
+
+
+
+
 maven-resources-plugin
 
 
 copy-manifest-for-pde
-process-classes
+process-test-resources
 
 copy-resources
 
@@ -81,6 +101,24 @@
 
 
 
+
+copy-scr-descriptors-for-pde
+process-test-resources
+
+copy-resources
+
+
+OSGI-INF
+
+
+
${project.build.outputDirectory}/OSGI-INF
+
+*.xml
+
+
+
+
+
 
 
 

-- 
To stop receiving notification emails like this one, please contact
romb...@apache.org.

Build failed in Jenkins: sling-org-apache-sling-launchpad-testing-10 #59

[Apache Jenkins Server]

See 


--
[...truncated 5.94 KB...]
[INFO] Building Apache Sling Launchpad Testing 11-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.integration-tests/1.0.7-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.integration-tests/1.0.7-SNAPSHOT/maven-metadata.xml
 (2 KB at 3.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.integration-tests/1.0.7-SNAPSHOT/org.apache.sling.launchpad.integration-tests-1.0.7-20180417.025709-43.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.integration-tests/1.0.7-SNAPSHOT/org.apache.sling.launchpad.integration-tests-1.0.7-20180417.025709-43.pom
 (12 KB at 38.8 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.junit.teleporter/1.0.17-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.junit.teleporter/1.0.17-SNAPSHOT/maven-metadata.xml
 (1021 B at 3.3 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.junit.teleporter/1.0.17-SNAPSHOT/org.apache.sling.junit.teleporter-1.0.17-20180415.072538-26.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.junit.teleporter/1.0.17-SNAPSHOT/org.apache.sling.junit.teleporter-1.0.17-20180415.072538-26.pom
 (6 KB at 18.9 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.test-services/2.0.15-SNAPSHOT/maven-metadata.xml
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.test-services/2.0.15-SNAPSHOT/maven-metadata.xml
 (2 KB at 3.4 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.test-services/2.0.15-SNAPSHOT/org.apache.sling.launchpad.test-services-2.0.15-20180416.062436-15.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.test-services/2.0.15-SNAPSHOT/org.apache.sling.launchpad.test-services-2.0.15-20180416.062436-15.pom
 (10 KB at 10.6 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.test-bundles/0.0.5-SNAPSHOT/org.apache.sling.launchpad.test-bundles-0.0.5-20180410.224937-17.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.launchpad.test-bundles/0.0.5-SNAPSHOT/org.apache.sling.launchpad.test-bundles-0.0.5-20180410.224937-17.pom
 (3 KB at 7.7 KB/sec)
[INFO] Downloading: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.starter/11-SNAPSHOT/org.apache.sling.starter-11-20180414.065937-31.pom
[INFO] Downloaded: 
http://repository.apache.org/snapshots/org/apache/sling/org.apache.sling.starter/11-SNAPSHOT/org.apache.sling.starter-11-20180414.065937-31.pom
 (8 KB at 22.9 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-commons/1.8.3/composum-sling-core-commons-1.8.3.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-commons/1.8.3/composum-sling-core-commons-1.8.3.pom
 (11 KB at 34.3 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-parent/1.8.3/composum-sling-core-parent-1.8.3.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-parent/1.8.3/composum-sling-core-parent-1.8.3.pom
 (28 KB at 724.9 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-config/1.8.3/composum-sling-core-config-1.8.3.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-config/1.8.3/composum-sling-core-config-1.8.3.pom
 (3 KB at 164.8 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-console/1.8.3/composum-sling-core-console-1.8.3.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-console/1.8.3/composum-sling-core-console-1.8.3.pom
 (10 KB at 464.2 KB/sec)
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-jslibs/1.8.3/composum-sling-core-jslibs-1.8.3.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/com/composum/sling/core/composum-sling-core-jslibs/1.8.3/composum-sling-core-jslibs-1.8.3.pom
 (5 KB at 291.8 KB/sec)
[INFO] Downl

Jenkins build is still unstable: sling-org-apache-sling-launchpad-testing-1.8 #93

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-org-apache-sling-launchpad-testing-9 #91

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-org-apache-sling-launchpad-testing-war-1.8 #93

[Apache Jenkins Server]

See 

Jenkins build is still unstable: sling-org-apache-sling-commons-cache-ehcache-1.8 #91

[Apache Jenkins Server]

See 

[sling-whiteboard] branch master updated: Move the process package from the feature api module to the support one.

[davidb]

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-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
 new 561e9e2  Move the process package from the feature api module to the 
support one.
561e9e2 is described below

commit 561e9e286e48578db53450e23ed963bc885766ea
Author: David Bosschaert 
AuthorDate: Wed Apr 11 16:51:50 2018 +0100

Move the process package from the feature api module to the support one.

Also move the associated tests.
---
 .../sling/feature/analyser/AnalyserTest.java   |  2 +-
 .../feature/applicationbuilder/impl/Main.java  |  2 +-
 .../impl/ApplicationBuilderTest.java   |  8 +--
 .../feature/launcher/impl/FeatureProcessor.java|  2 +-
 .../modelconverter/impl/FeatureToProvisioning.java |  2 +-
 .../sling/feature/resolver/FrameworkResolver.java  |  2 +-
 .../feature/resolver/FrameworkResolverTest.java|  2 +-
 .../apache/sling/feature/support/FeatureUtil.java  |  8 +--
 .../support}/process/ApplicationBuilder.java   |  2 +-
 .../feature/support}/process/BuilderContext.java   |  2 +-
 .../feature/support}/process/BuilderUtil.java  |  2 +-
 .../feature/support}/process/FeatureBuilder.java   |  2 +-
 .../support}/process/FeatureExtensionHandler.java  |  2 +-
 .../feature/support}/process/FeatureProvider.java  |  2 +-
 .../feature/support}/process/FeatureResolver.java  |  2 +-
 .../feature/support}/process/package-info.java |  2 +-
 .../feature/support}/process/BuilderUtilTest.java  | 65 --
 .../support}/process/FeatureBuilderTest.java   | 60 ++--
 .../apache/sling/feature/maven/Preprocessor.java   |  6 +-
 19 files changed, 92 insertions(+), 83 deletions(-)

diff --git 
a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
 
b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
index 8fd9bd5..e8b27fa 100644
--- 
a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
+++ 
b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
@@ -23,12 +23,12 @@ import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
 import org.apache.sling.feature.analyser.service.Analyser;
 import org.apache.sling.feature.analyser.service.Scanner;
-import org.apache.sling.feature.process.FeatureResolver;
 import org.apache.sling.feature.support.ArtifactManager;
 import org.apache.sling.feature.support.ArtifactManagerConfig;
 import org.apache.sling.feature.support.FeatureUtil;
 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.junit.Test;
 
 import java.io.File;
diff --git 
a/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
 
b/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
index 3235e81..57c08b2 100644
--- 
a/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
+++ 
b/featuremodel/feature-applicationbuilder/src/main/java/org/apache/sling/feature/applicationbuilder/impl/Main.java
@@ -24,12 +24,12 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.process.FeatureResolver;
 import org.apache.sling.feature.resolver.FrameworkResolver;
 import org.apache.sling.feature.support.ArtifactManager;
 import org.apache.sling.feature.support.ArtifactManagerConfig;
 import org.apache.sling.feature.support.FeatureUtil;
 import org.apache.sling.feature.support.json.ApplicationJSONWriter;
+import org.apache.sling.feature.support.process.FeatureResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
 
b/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
index 6efa834..4887eb7 100644
--- 
a/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
+++ 
b/featuremodel/feature-applicationbuilder/src/test/java/org/apache/sling/feature/applicationbuilder/impl/ApplicationBuilderTest.java
@@ -19,10 +19,6 @@ package org.apache.sling.feature.applicationbuilder.impl;
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.Artifac

[sling-whiteboard] branch master updated: Move FeatureResource to support package.

[davidb]

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-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
 new 351455d  Move FeatureResource to support package.
351455d is described below

commit 351455dce06e3abc5c23d1ca84a0141dd9ce6c54
Author: David Bosschaert 
AuthorDate: Tue Apr 17 09:45:11 2018 +0300

Move FeatureResource to support package.
---
 .../src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java | 2 +-
 .../org/apache/sling/feature/analyser/TestBundleResourceImpl.java | 2 +-
 .../java/org/apache/sling/feature/resolver/FrameworkResolver.java | 2 +-
 .../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 +-
 .../apache/sling/feature/resolver/impl/BundleResourceImplTest.java| 2 +-
 .../org/apache/sling/feature/support/process/ApplicationBuilder.java  | 1 -
 .../org/apache/sling/feature/support/process/FeatureResolver.java | 1 -
 .../org/apache/sling/feature/support/process}/FeatureResource.java| 4 +++-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
 
b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
index e8b27fa..213ac63 100644
--- 
a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
+++ 
b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
@@ -19,7 +19,6 @@ package org.apache.sling.feature.analyser;
 import org.apache.sling.feature.Application;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureResource;
 import org.apache.sling.feature.analyser.impl.BundleDescriptorImpl;
 import org.apache.sling.feature.analyser.service.Analyser;
 import org.apache.sling.feature.analyser.service.Scanner;
@@ -29,6 +28,7 @@ import org.apache.sling.feature.support.FeatureUtil;
 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.Test;
 
 import java.io.File;
diff --git 
a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
 
b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
index c06affe..2fd7962 100644
--- 
a/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
+++ 
b/featuremodel/feature-analyser/src/test/java/org/apache/sling/feature/analyser/TestBundleResourceImpl.java
@@ -18,9 +18,9 @@ package org.apache.sling.feature.analyser;
 
 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.apache.sling.feature.support.util.PackageInfo;
 import org.osgi.framework.Version;
 import org.osgi.framework.VersionRange;
diff --git 
a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
 
b/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
index dccf74b..83767b2 100644
--- 
a/featuremodel/feature-resolver/src/main/java/org/apache/sling/feature/resolver/FrameworkResolver.java
+++ 
b/featuremodel/feature-resolver/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/featuremodel