sling-org-apache-sling-feature.git
10 days agoSLING-8156 Extension should provide a copy() method master
David Bosschaert [Mon, 3 Dec 2018 16:40:25 +0000 (16:40 +0000)] 
SLING-8156 Extension should provide a copy() method

2 weeks agoSLING-8135: Fix an NPE when removing a bundle from a prototype with configurations.
Karl Pauls [Tue, 27 Nov 2018 11:51:35 +0000 (12:51 +0100)] 
SLING-8135: Fix an NPE when removing a bundle from a prototype with configurations.

2 weeks ago[maven-release-plugin] prepare for next development iteration
David Bosschaert [Fri, 23 Nov 2018 09:35:49 +0000 (09:35 +0000)] 
[maven-release-plugin] prepare for next development iteration

2 weeks ago[maven-release-plugin] prepare release org.apache.sling.feature-0.8.0 org.apache.sling.feature-0.8.0
David Bosschaert [Fri, 23 Nov 2018 09:35:29 +0000 (09:35 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.feature-0.8.0

2 weeks agoFixing up Javadoc in preparation for the release.
David Bosschaert [Fri, 23 Nov 2018 09:34:11 +0000 (09:34 +0000)] 
Fixing up Javadoc in preparation for the release.

3 weeks agoSLING-8104 Avoid magic when merging features
David Bosschaert [Thu, 22 Nov 2018 13:32:20 +0000 (13:32 +0000)] 
SLING-8104 Avoid magic when merging features

Artifact overrides do not apply to artifacts which do not clash.

3 weeks agoRemoving feature schema as this is now in the feature-io module.
David Bosschaert [Thu, 22 Nov 2018 09:35:32 +0000 (09:35 +0000)] 
Removing feature schema as this is now in the feature-io module.

3 weeks agoSLING-8104 Avoid magic when merging features
David Bosschaert [Thu, 22 Nov 2018 08:33:38 +0000 (08:33 +0000)] 
SLING-8104 Avoid magic when merging features

Support the case where two features have identical artifacts but an
override is still required.

3 weeks agoSLING-8104 Avoid magic when merging features
David Bosschaert [Thu, 22 Nov 2018 08:29:41 +0000 (08:29 +0000)] 
SLING-8104 Avoid magic when merging features

Support overrides from different versions and more than one override.

3 weeks agoSLING-8121 Rename feature 'include' to 'prototype'
David Bosschaert [Wed, 21 Nov 2018 10:53:13 +0000 (10:53 +0000)] 
SLING-8121 Rename feature 'include' to 'prototype'

3 weeks agoMove extension constants to Extension class
Carsten Ziegeler [Wed, 21 Nov 2018 14:01:11 +0000 (15:01 +0100)] 
Move extension constants to Extension class

3 weeks agoSLING-8123 Remove org-feature tracking from feature model
David Bosschaert [Wed, 21 Nov 2018 10:07:17 +0000 (10:07 +0000)] 
SLING-8123 Remove org-feature tracking from feature model

3 weeks agoSLING-8104 Avoid magic when merging features
David Bosschaert [Wed, 21 Nov 2018 09:47:14 +0000 (09:47 +0000)] 
SLING-8104 Avoid magic when merging features

When merging artifacts/bundles, they need to be selected from a provided
override list if the artifact versions are not the same. The list has
the following syntax:
  groupid1:artifactid1:<resolution>
  groupid2:artifactid2:<resolution>
To apply the same override rule for all clashes, a wildcard using '*' for
groupID and artifactID can be used:
  *:*:<resolution>
means always select the same resolution in case of a clash.

Where <resolution> is one of the following:
  ALL - select all the artifacts
  HIGHEST - select only the artifact with the highest version number
  LATEST - select only the artifact provided latest
  <version> - select this specific version
When comparing version numbers these are converted to OSGi version
numbers and the OSGi version number ordering is applied.

When merging includes artifacts specified in the target feature
override all artifacts with the same group ID and artifact ID in the
included feature.
Both the included as well the target feature can have multiple artifacts
with the same group ID and artifact ID but different versions.

Additionally variables and framework properties overwrites are now
called overrides.

This closes #9

3 weeks agoAdd copy method to Configuration
Carsten Ziegeler [Tue, 20 Nov 2018 06:13:21 +0000 (07:13 +0100)] 
Add copy method to Configuration

3 weeks agoSLING-8119 : Improve configuration handling
Carsten Ziegeler [Mon, 19 Nov 2018 19:11:06 +0000 (20:11 +0100)] 
SLING-8119 : Improve configuration handling

3 weeks agoSLING-8119 : Improve configuration handling
Carsten Ziegeler [Mon, 19 Nov 2018 06:59:37 +0000 (07:59 +0100)] 
SLING-8119 : Improve configuration handling

3 weeks agoRemove bundle property from configuration
Carsten Ziegeler [Fri, 16 Nov 2018 14:01:45 +0000 (15:01 +0100)] 
Remove bundle property from configuration

4 weeks agoSLING-8109 Replace KeyValueMap with Map<String,String>
David Bosschaert [Wed, 14 Nov 2018 15:14:49 +0000 (15:14 +0000)] 
SLING-8109 Replace KeyValueMap with Map<String,String>

4 weeks agoSLING-8108 : Provide setter methods for optional context info
Carsten Ziegeler [Wed, 14 Nov 2018 09:00:20 +0000 (10:00 +0100)] 
SLING-8108 : Provide setter methods for optional context info

4 weeks agoSLING-8107 : Correct setting the feature origin
Carsten Ziegeler [Wed, 14 Nov 2018 07:25:32 +0000 (08:25 +0100)] 
SLING-8107 : Correct setting the feature origin

4 weeks agoSLING-8104 : Avoid magic when merging features. Make algorithm configurable through...
Carsten Ziegeler [Tue, 13 Nov 2018 18:31:38 +0000 (19:31 +0100)] 
SLING-8104 : Avoid magic when merging features. Make algorithm configurable through context

4 weeks agoSLING-8100 : Add complete flag to Feature
Carsten Ziegeler [Tue, 13 Nov 2018 18:19:51 +0000 (19:19 +0100)] 
SLING-8100 : Add complete flag to Feature

4 weeks agoSLING-8100 : Add complete flag to Feature
Carsten Ziegeler [Tue, 13 Nov 2018 08:56:18 +0000 (09:56 +0100)] 
SLING-8100 : Add complete flag to Feature

4 weeks agoSLING-8100 : Add complete flag to Feature
Carsten Ziegeler [Tue, 13 Nov 2018 08:49:23 +0000 (09:49 +0100)] 
SLING-8100 : Add complete flag to Feature

4 weeks agoSLING-8096 Make it possible to configure Merge Handlers and Post Processors
David Bosschaert [Mon, 12 Nov 2018 15:12:19 +0000 (15:12 +0000)] 
SLING-8096 Make it possible to configure Merge Handlers and Post Processors

5 weeks agoSLING-8076 Merge Handlers should also be called on the first extension being merged in
David Bosschaert [Tue, 6 Nov 2018 12:05:50 +0000 (12:05 +0000)] 
SLING-8076 Merge Handlers should also be called on the first extension being merged in

5 weeks ago[maven-release-plugin] prepare for next development iteration
David Bosschaert [Fri, 2 Nov 2018 10:06:25 +0000 (10:06 +0000)] 
[maven-release-plugin] prepare for next development iteration

5 weeks ago[maven-release-plugin] prepare release org.apache.sling.feature-0.2.0 org.apache.sling.feature-0.2.0
David Bosschaert [Fri, 2 Nov 2018 10:06:01 +0000 (10:06 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.feature-0.2.0

5 weeks ago[maven-release-plugin] prepare for next development iteration
David Bosschaert [Fri, 2 Nov 2018 10:03:31 +0000 (10:03 +0000)] 
[maven-release-plugin] prepare for next development iteration

5 weeks ago[maven-release-plugin] prepare release org.apache.sling.feature-0.1.4 org.apache.sling.feature-0.1.4
David Bosschaert [Fri, 2 Nov 2018 10:02:57 +0000 (10:02 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.feature-0.1.4

5 weeks agoFix some missing Javadoc.
David Bosschaert [Fri, 2 Nov 2018 09:11:17 +0000 (09:11 +0000)] 
Fix some missing Javadoc.

5 weeks agoMove to sling parent pom version 34.
David Bosschaert [Fri, 2 Nov 2018 09:02:23 +0000 (09:02 +0000)] 
Move to sling parent pom version 34.

6 weeks agoSLING-8064 : Support marking a feature as final - add test case
Carsten Ziegeler [Wed, 31 Oct 2018 13:40:41 +0000 (14:40 +0100)] 
SLING-8064 : Support marking a feature as final - add test case

6 weeks agoSLING-8064 : Support marking a feature as final
Carsten Ziegeler [Wed, 31 Oct 2018 13:19:29 +0000 (14:19 +0100)] 
SLING-8064 : Support marking a feature as final

6 weeks agoSLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor
David Bosschaert [Tue, 30 Oct 2018 14:14:15 +0000 (14:14 +0000)] 
SLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor

6 weeks agoSLING-8057 : Introduce Artifacts class similar to Bundles
Carsten Ziegeler [Tue, 30 Oct 2018 06:34:42 +0000 (07:34 +0100)] 
SLING-8057 : Introduce Artifacts class similar to Bundles

6 weeks agoBack to dictionary for configurations
Carsten Ziegeler [Sun, 28 Oct 2018 15:21:54 +0000 (16:21 +0100)] 
Back to dictionary for configurations

6 weeks agoSLING-7752 : Deserializing and serializing a feature model file suffles the configura...
Carsten Ziegeler [Sun, 28 Oct 2018 14:51:06 +0000 (15:51 +0100)] 
SLING-7752 : Deserializing and serializing a feature model file suffles the configurations

6 weeks agoSLING-7752 - Deserializing and serializing a feature model file suffles the configura...
David Bosschaert [Fri, 26 Oct 2018 15:14:53 +0000 (16:14 +0100)] 
SLING-7752 - Deserializing and serializing a feature model file suffles the configurations

Committed on behalf of @andreituicu with many thanks!
Pull request closed #2.

8 weeks agoSLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor
David Bosschaert [Tue, 16 Oct 2018 16:43:33 +0000 (18:43 +0200)] 
SLING-8028 Split FeatureExtensionHandler into MergeHandler and PostProcessor

Provide ArtifactProvider interface to enable extension handlers to
resolve artifacts.

2 months agoMerge tests from SLING-7932
David Bosschaert [Wed, 10 Oct 2018 17:13:19 +0000 (18:13 +0100)] 
Merge tests from SLING-7932

Committed on behalf of Simo Tripodi, with many thanks!
This closes #4

2 months agoMerge pull request #6 from apache/feature-schema
David Bosschaert [Tue, 9 Oct 2018 09:12:43 +0000 (10:12 +0100)] 
Merge pull request #6 from apache/feature-schema

SLING-7990 - Define an initial version of the Feature Model JSON Shema

2 months agoSLING-7990 - Define an initial version of the Feature Model JSON Shema 6/head
Simo Tripodi [Mon, 8 Oct 2018 20:10:24 +0000 (22:10 +0200)] 
SLING-7990 - Define an initial version of the Feature Model JSON Shema

initial version

2 months agoSLING-7977 When merging features artifacts should keep an association with their...
David Bosschaert [Wed, 3 Oct 2018 15:24:20 +0000 (16:24 +0100)] 
SLING-7977 When merging features artifacts should keep an association with their originating feature

Cover case when multiple merges happen. The initial feature should
remain associated.

2 months agoSLING-7977 When merging features artifacts should keep an association with their...
David Bosschaert [Wed, 3 Oct 2018 15:00:15 +0000 (16:00 +0100)] 
SLING-7977 When merging features artifacts should keep an association with their originating feature

2 months agoMerge pull request #5 from apache/issues/SLING-7829
Karl Pauls [Thu, 20 Sep 2018 13:14:26 +0000 (15:14 +0200)] 
Merge pull request #5 from apache/issues/SLING-7829

SLING-7829: Change the includes to be include and from a list to a si…

2 months agotrivial: added license header to *.md files
Radu Cotescu [Thu, 20 Sep 2018 09:09:03 +0000 (11:09 +0200)] 
trivial: added license header to *.md files

2 months agoSLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every module
Radu Cotescu [Wed, 19 Sep 2018 16:29:17 +0000 (18:29 +0200)] 
SLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every module

2 months agoSLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module
Radu Cotescu [Wed, 19 Sep 2018 16:04:00 +0000 (18:04 +0200)] 
SLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module

2 months agoSLING-7829: Change the includes to be include and from a list to a single (optional... issues/SLING-7829 5/head
Karl Pauls [Mon, 17 Sep 2018 11:43:50 +0000 (13:43 +0200)] 
SLING-7829: Change the includes to be include and from a list to a single (optional) field

2 months agoSLING-7932 - Use Regex to parse mvn GAVs and URLs 4/head
Simo Tripodi [Mon, 17 Sep 2018 11:03:35 +0000 (13:03 +0200)] 
SLING-7932 - Use Regex to parse mvn GAVs and URLs

initial checkin

3 months agoMerge pull request #3 from apache/variables
Karl Pauls [Thu, 6 Sep 2018 09:17:59 +0000 (11:17 +0200)] 
Merge pull request #3 from apache/variables

Change variable handling to not allow variables to be defined twice

3 months agoChange variable handling to not allow variables to be defined twice variables 3/head
Karl Pauls [Thu, 6 Sep 2018 07:56:10 +0000 (09:56 +0200)] 
Change variable handling to not allow variables to be defined twice

3 months agoFix json extension merging (take2)
Karl Pauls [Thu, 30 Aug 2018 13:23:19 +0000 (15:23 +0200)] 
Fix json extension merging (take2)

3 months agoFix merging of json extensions
Karl Pauls [Thu, 30 Aug 2018 12:55:11 +0000 (14:55 +0200)] 
Fix merging of json extensions

3 months agoPass Extension object to FeatureExtensionHandler instead of just the extension name.
Karl Pauls [Tue, 28 Aug 2018 20:41:23 +0000 (22:41 +0200)] 
Pass Extension object to FeatureExtensionHandler instead of just the extension name.

3 months agoSLING-7827 : Remove Application concept from feature model
Carsten Ziegeler [Wed, 15 Aug 2018 13:16:01 +0000 (15:16 +0200)] 
SLING-7827 : Remove Application concept from feature model

3 months agoSLING-7827 : Remove Application concept from feature model
Carsten Ziegeler [Wed, 15 Aug 2018 08:27:58 +0000 (10:27 +0200)] 
SLING-7827 : Remove Application concept from feature model

4 months agoAdd second proposal
Carsten Ziegeler [Tue, 31 Jul 2018 12:13:04 +0000 (14:13 +0200)] 
Add second proposal

4 months agoDistinguish between choices and options
Carsten Ziegeler [Fri, 27 Jul 2018 08:34:22 +0000 (10:34 +0200)] 
Distinguish between choices and options

4 months agoSLING-7783 : Unable to remove bundles without specifying a version
Carsten Ziegeler [Wed, 25 Jul 2018 14:57:22 +0000 (16:57 +0200)] 
SLING-7783 : Unable to remove bundles without specifying a version

4 months agoAdd proposal for application configuration
Carsten Ziegeler [Wed, 25 Jul 2018 12:23:20 +0000 (14:23 +0200)] 
Add proposal for application configuration

4 months agoSLING-7765 Application creation missing variable declarations
David Bosschaert [Tue, 17 Jul 2018 14:13:29 +0000 (15:13 +0100)] 
SLING-7765 Application creation missing variable declarations

This part handles the variable declarations for includes

5 months agoChange title
David Bosschaert [Fri, 13 Jul 2018 10:19:17 +0000 (12:19 +0200)] 
Change title

5 months agoClarify the 'global' region
David Bosschaert [Fri, 13 Jul 2018 10:17:26 +0000 (12:17 +0200)] 
Clarify the 'global' region

5 months agoClean up pom and embed felix utils dependency
David Bosschaert [Mon, 9 Jul 2018 08:52:09 +0000 (09:52 +0100)] 
Clean up pom and embed felix utils dependency

5 months agoSLING-7765 Application creation missing variable declarations
David Bosschaert [Fri, 6 Jul 2018 10:26:35 +0000 (11:26 +0100)] 
SLING-7765 Application creation missing variable declarations

This part merges the variables into the application when created.

5 months agoUse the given start-level as start-order for now.
Karl Pauls [Tue, 19 Jun 2018 21:53:55 +0000 (23:53 +0200)] 
Use the given start-level as start-order for now.

6 months agoAdding header to readme
Dan Klco [Sat, 9 Jun 2018 02:18:32 +0000 (22:18 -0400)] 
Adding header to readme

6 months agoSmall editorial change
David Bosschaert [Wed, 6 Jun 2018 14:47:04 +0000 (15:47 +0100)] 
Small editorial change

6 months agoUpdate API Controller details
David Bosschaert [Wed, 6 Jun 2018 14:43:46 +0000 (15:43 +0100)] 
Update API Controller details

6 months ago[maven-release-plugin] prepare for next development iteration
David Bosschaert [Tue, 5 Jun 2018 13:22:36 +0000 (14:22 +0100)] 
[maven-release-plugin] prepare for next development iteration

6 months ago[maven-release-plugin] prepare release org.apache.sling.feature-0.1.2 org.apache.sling.feature-0.1.2
David Bosschaert [Tue, 5 Jun 2018 13:22:15 +0000 (14:22 +0100)] 
[maven-release-plugin] prepare release org.apache.sling.feature-0.1.2

6 months agoUpdate apicontroller.md
Carsten Ziegeler [Tue, 5 Jun 2018 09:28:50 +0000 (11:28 +0200)] 
Update apicontroller.md

6 months ago7697 : Move feature resolving from ApplicationBuilder to FeatureBuilder
Carsten Ziegeler [Wed, 30 May 2018 18:27:26 +0000 (20:27 +0200)] 
7697 : Move feature resolving from ApplicationBuilder to FeatureBuilder
SLING-7968 : Move deduplication of features to FeatureBuilder

6 months agoSLING-7696 : Includes are not taken into account when assembling an application
Carsten Ziegeler [Wed, 30 May 2018 17:04:26 +0000 (19:04 +0200)] 
SLING-7696 : Includes are not taken into account when assembling an application

6 months agoAdd link to file format
David Bosschaert [Mon, 28 May 2018 08:25:05 +0000 (09:25 +0100)] 
Add link to file format

7 months agoFix an UnsupportedOperation exception during extension json merge and make sure the...
Karl Pauls [Tue, 8 May 2018 14:00:22 +0000 (16:00 +0200)] 
Fix an UnsupportedOperation exception during extension json merge and make sure the result ends-up in the target.

7 months ago[maven-release-plugin] prepare for next development iteration
David Bosschaert [Sat, 5 May 2018 19:06:26 +0000 (20:06 +0100)] 
[maven-release-plugin] prepare for next development iteration

7 months ago[maven-release-plugin] prepare release org.apache.sling.feature-0.1.0 org.apache.sling.feature-0.1.0
David Bosschaert [Sat, 5 May 2018 19:05:32 +0000 (20:05 +0100)] 
[maven-release-plugin] prepare release org.apache.sling.feature-0.1.0

7 months agoFix SCM settings
David Bosschaert [Sat, 5 May 2018 18:58:31 +0000 (19:58 +0100)] 
Fix SCM settings

7 months agoMove to Felix Utils 1.11.0
David Bosschaert [Sat, 5 May 2018 18:47:22 +0000 (19:47 +0100)] 
Move to Felix Utils 1.11.0

7 months agoFix name of Sling Feature Model
David Bosschaert [Wed, 2 May 2018 13:10:42 +0000 (14:10 +0100)] 
Fix name of Sling Feature Model

7 months agoMove version to 0.1.0
David Bosschaert [Tue, 1 May 2018 09:02:31 +0000 (10:02 +0100)] 
Move version to 0.1.0

7 months agoRemove .md files from rat checking.
David Bosschaert [Mon, 30 Apr 2018 13:07:13 +0000 (14:07 +0100)] 
Remove .md files from rat checking.

7 months agoAdd LICENSE and .gitignore
David Bosschaert [Fri, 27 Apr 2018 13:32:38 +0000 (14:32 +0100)] 
Add LICENSE and .gitignore

7 months agoAdd design folder from feature model on whiteboard.
David Bosschaert [Fri, 27 Apr 2018 11:14:06 +0000 (12:14 +0100)] 
Add design folder from feature model on whiteboard.

7 months agoAdd documentation from the whiteboard project.
David Bosschaert [Fri, 27 Apr 2018 11:11:31 +0000 (12:11 +0100)] 
Add documentation from the whiteboard project.

7 months ago[Feature Model] Move constants from support module to feature module
David Bosschaert [Thu, 26 Apr 2018 08:50:10 +0000 (09:50 +0100)] 
[Feature Model] Move constants from support module to feature module

EXTENSION_NAME_REPOINIT and EXTENSION_NAME_CONTENT_PACKAGES were moved
from SlingConstants in feature-support to FeatureConstants in feature.

7 months agoMove Feature Model Builder into feature module.
David Bosschaert [Wed, 25 Apr 2018 09:19:53 +0000 (10:19 +0100)] 
Move Feature Model Builder into feature module.

7 months agoRefactor to use Capabilities and Requirements from Felix utils project
David Bosschaert [Sun, 22 Apr 2018 20:19:43 +0000 (21:19 +0100)] 
Refactor to use Capabilities and Requirements from Felix utils project

7 months agoMove Sling specific constants into support module
Carsten Ziegeler [Tue, 17 Apr 2018 08:31:04 +0000 (10:31 +0200)] 
Move Sling specific constants into support module

7 months agoMove FeatureResource to support package.
David Bosschaert [Tue, 17 Apr 2018 06:45:11 +0000 (09:45 +0300)] 
Move FeatureResource to support package.

7 months agoMove the process package from the feature api module to the support one.
David Bosschaert [Wed, 11 Apr 2018 15:51:50 +0000 (16:51 +0100)] 
Move the process package from the feature api module to the support one.

Also move the associated tests.

7 months agoAllow null for attributes or requirements. Throw ISE if namespace is null
Carsten Ziegeler [Mon, 16 Apr 2018 14:24:47 +0000 (16:24 +0200)] 
Allow null for attributes or requirements. Throw ISE if namespace is null

8 months agoSupport variables in converting from features to provisioning model
David Bosschaert [Tue, 20 Mar 2018 10:46:52 +0000 (10:46 +0000)] 
Support variables in converting from features to provisioning model

8 months agoSupport for special feature names when converting to provisioning model.
David Bosschaert [Mon, 19 Mar 2018 15:09:52 +0000 (15:09 +0000)] 
Support for special feature names when converting to provisioning model.

The special feature names must be specified in the variables section
under the variable name 'provisioning.model.name'.
This commit also contains the start of a document-based set of tests for
testing between conversions of the feature model to the provisioning
model and back.

8 months agoSupport the slinstart maven plugin by providing a model converter API
David Bosschaert [Fri, 9 Mar 2018 10:46:10 +0000 (10:46 +0000)] 
Support the slinstart maven plugin by providing a model converter API

9 months agoSLING-7521 Order bundles in the generated app based on feature order and start order
David Bosschaert [Mon, 5 Mar 2018 15:05:23 +0000 (15:05 +0000)] 
SLING-7521 Order bundles in the generated app based on feature order and start order

Order resource (bundles and features) in the resulting application based on the order
of resolved features and then also in the order of the start order within the feature.

9 months agoUpdate to parent pom 33
Carsten Ziegeler [Mon, 26 Feb 2018 12:24:32 +0000 (13:24 +0100)] 
Update to parent pom 33