sling-org-apache-sling-provisioning-model.git
2 months agotrivial: added license header to *.md files master
Radu Cotescu [Thu, 20 Sep 2018 09:09:06 +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:20 +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:02 +0000 (18:04 +0200)] 
SLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to every module

6 months agoUpdating badges for org-apache-sling-provisioning-model
Dan Klco [Fri, 8 Jun 2018 19:31:15 +0000 (15:31 -0400)] 
Updating badges for org-apache-sling-provisioning-model

13 months agoSLING-7213 - Add a default .gitignore file to every module
Robert Munteanu [Tue, 24 Oct 2017 11:41:01 +0000 (13:41 +0200)] 
SLING-7213 - Add a default .gitignore file to every module

13 months agoSLING-7214 - Add the LICENSE file to every module
Robert Munteanu [Mon, 23 Oct 2017 16:38:24 +0000 (18:38 +0200)] 
SLING-7214 - Add the LICENSE file to every module

13 months agoFix typo in pom.xml : conncetion should be connection
Robert Munteanu [Mon, 23 Oct 2017 09:06:30 +0000 (12:06 +0300)] 
Fix typo in pom.xml : conncetion should be connection

13 months agoSLING-7162 - Update SCM information in all POM files to reference Git
Robert Munteanu [Fri, 20 Oct 2017 17:13:16 +0000 (19:13 +0200)] 
SLING-7162 - Update SCM information in all POM files to reference Git

14 months agoUpdate to parent pom 32
Carsten Ziegeler [Wed, 4 Oct 2017 14:42:58 +0000 (14:42 +0000)] 
Update to parent pom 32

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1811078 13f79535-47bb-0310-9956-ffa450edef68

14 months agoSLING-7167 Adjust READMEs
Oliver Lietz [Tue, 3 Oct 2017 09:42:35 +0000 (09:42 +0000)] 
SLING-7167 Adjust READMEs

add missing README

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810812 13f79535-47bb-0310-9956-ffa450edef68

15 months ago[maven-release-plugin] prepare for next development iteration
Tomasz Rekawek [Fri, 18 Aug 2017 09:04:25 +0000 (09:04 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805395 13f79535-47bb-0310-9956-ffa450edef68

15 months ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.4 org.apache.sling.provisioning.model-1.8.4
Tomasz Rekawek [Fri, 18 Aug 2017 09:04:09 +0000 (09:04 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.4

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805393 13f79535-47bb-0310-9956-ffa450edef68

15 months ago@trivial: fixed the javadoc for ModelResolveUtility
Tomasz Rekawek [Fri, 18 Aug 2017 08:45:43 +0000 (08:45 +0000)] 
@trivial: fixed the javadoc for ModelResolveUtility

replaced @result with @return

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805384 13f79535-47bb-0310-9956-ffa450edef68

15 months agoSLING-7054: Slingstart artifacts with parametrized version not removed from the effec...
Tomasz Rekawek [Fri, 18 Aug 2017 08:43:14 +0000 (08:43 +0000)] 
SLING-7054: Slingstart artifacts with parametrized version not removed from the effective slingstart model

Exposed the ModelResolveUtility#replace() method.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1805383 13f79535-47bb-0310-9956-ffa450edef68

18 months agoRemove commons.json from test model
Carsten Ziegeler [Wed, 24 May 2017 09:48:26 +0000 (09:48 +0000)] 
Remove commons.json from test model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1796034 13f79535-47bb-0310-9956-ffa450edef68

19 months ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Tue, 2 May 2017 14:44:35 +0000 (14:44 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1793508 13f79535-47bb-0310-9956-ffa450edef68

19 months ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.2
Carsten Ziegeler [Tue, 2 May 2017 14:44:20 +0000 (14:44 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.2

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1793506 13f79535-47bb-0310-9956-ffa450edef68

19 months agoSLING-6816 : Model validation should handle :remove sections correctly
Carsten Ziegeler [Tue, 2 May 2017 11:52:32 +0000 (11:52 +0000)] 
SLING-6816 : Model validation should handle :remove sections correctly

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1793475 13f79535-47bb-0310-9956-ffa450edef68

21 months agouse Sling Parent 30
Oliver Lietz [Mon, 6 Mar 2017 10:22:30 +0000 (10:22 +0000)] 
use Sling Parent 30

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1785621 13f79535-47bb-0310-9956-ffa450edef68

23 months ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Tue, 13 Dec 2016 12:52:45 +0000 (12:52 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774004 13f79535-47bb-0310-9956-ffa450edef68

23 months ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.0
Carsten Ziegeler [Tue, 13 Dec 2016 12:52:29 +0000 (12:52 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774002 13f79535-47bb-0310-9956-ffa450edef68

23 months agoSLING-6389 : Avoid empty blank line at end of provisioning model
Carsten Ziegeler [Mon, 12 Dec 2016 13:18:22 +0000 (13:18 +0000)] 
SLING-6389 : Avoid empty blank line at end of provisioning model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1773788 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6278 : Provide tooling to create an archive with the provisioning model and...
Carsten Ziegeler [Sat, 12 Nov 2016 15:09:17 +0000 (15:09 +0000)] 
SLING-6278 : Provide tooling to create an archive with the provisioning model and all artifacts

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769384 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6272 : Comments in the provisioning model get lost
Carsten Ziegeler [Fri, 11 Nov 2016 06:37:33 +0000 (06:37 +0000)] 
SLING-6272 : Comments in the provisioning model get lost

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769250 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Thu, 10 Nov 2016 06:00:44 +0000 (06:00 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769041 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.7.0
Carsten Ziegeler [Thu, 10 Nov 2016 06:00:29 +0000 (06:00 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.7.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769039 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6267 : Support OSGi versions and provide accessor methods of version parts
Carsten Ziegeler [Wed, 9 Nov 2016 16:58:04 +0000 (16:58 +0000)] 
SLING-6267 : Support OSGi versions and provide accessor methods of version parts

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769001 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6267 : Support OSGi versions and provide accessor methods of version parts
Carsten Ziegeler [Wed, 9 Nov 2016 16:57:16 +0000 (16:57 +0000)] 
SLING-6267 : Support OSGi versions and provide accessor methods of version parts

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1769000 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6265 : Effective model does not get feature versions
Carsten Ziegeler [Wed, 9 Nov 2016 16:42:59 +0000 (16:42 +0000)] 
SLING-6265 : Effective model does not get feature versions

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768996 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Sat, 5 Nov 2016 10:01:42 +0000 (10:01 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768178 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.6.0
Carsten Ziegeler [Sat, 5 Nov 2016 10:01:27 +0000 (10:01 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.6.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768176 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6218 : Make usage of MergeOptions easier
Carsten Ziegeler [Sun, 30 Oct 2016 12:47:48 +0000 (12:47 +0000)] 
SLING-6218 : Make usage of MergeOptions easier

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1767152 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6216 : Merge versioned features by using highest version
Carsten Ziegeler [Sun, 30 Oct 2016 11:00:33 +0000 (11:00 +0000)] 
SLING-6216 : Merge versioned features by using highest version

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1767141 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6214 : Validate feature version to be a valid version
Carsten Ziegeler [Sun, 30 Oct 2016 10:31:38 +0000 (10:31 +0000)] 
SLING-6214 : Validate feature version to be a valid version

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1767140 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6215 : Catch IllegalArgumentException when comparing versions
Carsten Ziegeler [Sun, 30 Oct 2016 10:26:48 +0000 (10:26 +0000)] 
SLING-6215 : Catch IllegalArgumentException when comparing versions

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1767139 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Fri, 28 Oct 2016 05:15:03 +0000 (05:15 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1766924 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.5.0
Carsten Ziegeler [Fri, 28 Oct 2016 05:14:48 +0000 (05:14 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.5.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1766922 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-6181 : Support adding version info to Feature
Carsten Ziegeler [Sun, 23 Oct 2016 08:47:59 +0000 (08:47 +0000)] 
SLING-6181 : Support adding version info to Feature

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1766252 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-5914 - add tests that demonstrate the current behavior
Bertrand Delacretaz [Fri, 29 Jul 2016 08:07:45 +0000 (08:07 +0000)] 
SLING-5914 - add tests that demonstrate the current behavior

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1754482 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Mon, 6 Jun 2016 13:56:35 +0000 (13:56 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1747003 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.4
Carsten Ziegeler [Mon, 6 Jun 2016 13:56:20 +0000 (13:56 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.4

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1747001 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-5765 : No way to remove an artifact from a special runmode
Carsten Ziegeler [Mon, 6 Jun 2016 13:29:39 +0000 (13:29 +0000)] 
SLING-5765 : No way to remove an artifact from a special runmode

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1746993 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSwitch to parent pom 26
Carsten Ziegeler [Sun, 3 Jan 2016 14:07:46 +0000 (14:07 +0000)] 
Switch to parent pom 26

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68

2 years agoSLING-5355 - test multiline strings in configs
Bertrand Delacretaz [Thu, 31 Dec 2015 13:01:46 +0000 (13:01 +0000)] 
SLING-5355 - test multiline strings in configs

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722442 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Tue, 22 Dec 2015 06:08:24 +0000 (06:08 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1721299 13f79535-47bb-0310-9956-ffa450edef68

2 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.2
Carsten Ziegeler [Tue, 22 Dec 2015 06:08:09 +0000 (06:08 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.2

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1721297 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5318 : Sling provisioning model does not propagate Artifact metadata during...
asf-sync-process [Fri, 27 Nov 2015 07:21:13 +0000 (07:21 +0000)] 
SLING-5318 : Sling provisioning model does not propagate Artifact metadata during processing. Apply patch from David Bosschaert

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1716803 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5189 : Improve start level handling when merging models
Carsten Ziegeler [Mon, 26 Oct 2015 17:52:10 +0000 (17:52 +0000)] 
SLING-5189 : Improve start level handling when merging models

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1710664 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5185 : Version comparision is wrong in case of qualifiers
Carsten Ziegeler [Thu, 22 Oct 2015 12:02:38 +0000 (12:02 +0000)] 
SLING-5185 : Version comparision is wrong in case of qualifiers

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709998 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Wed, 21 Oct 2015 13:03:41 +0000 (13:03 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709827 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.0
Carsten Ziegeler [Wed, 21 Oct 2015 13:03:26 +0000 (13:03 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709825 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5174 : Refactor merging of models into separate utility class and add merge...
Carsten Ziegeler [Wed, 21 Oct 2015 12:51:31 +0000 (12:51 +0000)] 
SLING-5174 : Refactor merging of models into separate utility class and add merge options

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709822 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5172 : Provide support for custom sections in the provisioning model
Carsten Ziegeler [Wed, 21 Oct 2015 08:44:46 +0000 (08:44 +0000)] 
SLING-5172 : Provide support for custom sections in the provisioning model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709755 13f79535-47bb-0310-9956-ffa450edef68

3 years agogit-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709754 13f79535-47bb-0310...
Carsten Ziegeler [Wed, 21 Oct 2015 08:37:08 +0000 (08:37 +0000)] 
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709754 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5174 : Refactor merging of models into separate utility class and add merge...
Carsten Ziegeler [Wed, 21 Oct 2015 08:36:50 +0000 (08:36 +0000)] 
SLING-5174 : Refactor merging of models into separate utility class and add merge options

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709753 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5148 : Support OSGi Subsystems in the Sling Provisioning model.
Carsten Ziegeler [Wed, 21 Oct 2015 05:47:52 +0000 (05:47 +0000)] 
SLING-5148 : Support OSGi Subsystems in the Sling Provisioning model.

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709720 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5172 : Provide support for custom sections in the provisioning model
Carsten Ziegeler [Tue, 20 Oct 2015 14:00:14 +0000 (14:00 +0000)] 
SLING-5172 : Provide support for custom sections in the provisioning model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709592 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-5148 : Support OSGi Subsystems in the Sling Provisioning model. Apply patch...
Carsten Ziegeler [Tue, 20 Oct 2015 10:00:50 +0000 (10:00 +0000)] 
SLING-5148 : Support OSGi Subsystems in the Sling Provisioning model. Apply patch from David Bosschaert

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1709560 13f79535-47bb-0310-9956-ffa450edef68

3 years agoUpdate the main reactor to parent 25
Robert Munteanu [Mon, 5 Oct 2015 10:03:45 +0000 (10:03 +0000)] 
Update the main reactor to parent 25

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Tue, 28 Jul 2015 12:33:52 +0000 (12:33 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1693080 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.3.0
Carsten Ziegeler [Tue, 28 Jul 2015 12:33:36 +0000 (12:33 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.3.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1693078 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4807 introduce explicit boolean flag to make sure variable replacement does...
Stefan Seifert [Tue, 14 Jul 2015 23:24:19 +0000 (23:24 +0000)] 
SLING-4807 introduce explicit boolean flag to make sure variable replacement does not take place when merging models

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1691105 13f79535-47bb-0310-9956-ffa450edef68

3 years agofix some javadoc errors java 8 complains about
Stefan Seifert [Tue, 14 Jul 2015 11:45:41 +0000 (11:45 +0000)] 
fix some javadoc errors java 8 complains about

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690903 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4880 apply resolved dependencies to raw model instead of attaching effective...
Stefan Seifert [Tue, 14 Jul 2015 11:39:49 +0000 (11:39 +0000)] 
SLING-4880 apply resolved dependencies to raw model instead of attaching effective model
add new optional parameter "allowUnresolvedPomDependencies" (default: false)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690902 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4879 add ModelUtility.applyVariables method that allows to inject further varia...
Stefan Seifert [Tue, 14 Jul 2015 10:05:28 +0000 (10:05 +0000)] 
SLING-4879 add ModelUtility.applyVariables method that allows to inject further variables from a custom variable resolver

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690896 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4807 make sure variable replacement is applied whether custom resolver exists...
Stefan Seifert [Tue, 14 Jul 2015 10:01:53 +0000 (10:01 +0000)] 
SLING-4807 make sure variable replacement is applied whether custom resolver exists or not

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690894 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4879 move resolver/replace logic to separate class ModelResolverUtility
Stefan Seifert [Tue, 14 Jul 2015 09:10:39 +0000 (09:10 +0000)] 
SLING-4879 move resolver/replace logic to separate class ModelResolverUtility

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690881 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4879 refactor model processing logic from ModelUtility#getEffectiveModel into...
Stefan Seifert [Tue, 14 Jul 2015 09:04:19 +0000 (09:04 +0000)] 
SLING-4879 refactor model processing logic from ModelUtility#getEffectiveModel into separate class to make it reusable

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690878 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4880 Allow to get artifact versions from POM
Stefan Seifert [Mon, 13 Jul 2015 22:04:21 +0000 (22:04 +0000)] 
SLING-4880 Allow to get artifact versions from POM

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690829 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4645 Update Tika to 1.9
Oliver Lietz [Mon, 13 Jul 2015 10:00:16 +0000 (10:00 +0000)] 
SLING-4645 Update Tika to 1.9

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1690617 13f79535-47bb-0310-9956-ffa450edef68

3 years agoset parent version to 24 and add empty relativePath where missing
Oliver Lietz [Tue, 7 Jul 2015 08:09:17 +0000 (08:09 +0000)] 
set parent version to 24 and add empty relativePath where missing

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68

3 years agoRemove superflous sling.java.version=6 as it's the default now
Robert Munteanu [Thu, 25 Jun 2015 13:14:53 +0000 (13:14 +0000)] 
Remove superflous sling.java.version=6 as it's the default now

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687505 13f79535-47bb-0310-9956-ffa450edef68

3 years agoUpdate to Sling Parent 23
Robert Munteanu [Thu, 25 Jun 2015 13:08:16 +0000 (13:08 +0000)] 
Update to Sling Parent 23

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4807 : Variables in configurations are not replaced
Carsten Ziegeler [Wed, 17 Jun 2015 16:33:43 +0000 (16:33 +0000)] 
SLING-4807 : Variables in configurations are not replaced

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1686067 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Tue, 9 Jun 2015 11:49:41 +0000 (11:49 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684388 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.2.0
Carsten Ziegeler [Tue, 9 Jun 2015 11:49:28 +0000 (11:49 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.2.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684386 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4790 : Removal of artifacts from inherited model is not possible
Carsten Ziegeler [Tue, 9 Jun 2015 11:37:32 +0000 (11:37 +0000)] 
SLING-4790 : Removal of artifacts from inherited model is not possible

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684381 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4124 : Bootstrap command file can't be appended
Carsten Ziegeler [Mon, 8 Jun 2015 14:23:37 +0000 (14:23 +0000)] 
SLING-4124 : Bootstrap command file can't be appended

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684195 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4126 : Provide a mechanism to merge configurations
Carsten Ziegeler [Mon, 8 Jun 2015 14:07:56 +0000 (14:07 +0000)] 
SLING-4126 : Provide a mechanism to merge configurations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684190 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4126 : Provide a mechanism to merge configurations
Carsten Ziegeler [Mon, 8 Jun 2015 13:45:31 +0000 (13:45 +0000)] 
SLING-4126 : Provide a mechanism to merge configurations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684183 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4786 : Attributes and configuration format are wronlgy written out
Carsten Ziegeler [Mon, 8 Jun 2015 11:57:31 +0000 (11:57 +0000)] 
SLING-4786 : Attributes and configuration format are wronlgy written out

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684166 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4782 : Update to latest format from Apache Felix config admin
Carsten Ziegeler [Mon, 8 Jun 2015 11:37:27 +0000 (11:37 +0000)] 
SLING-4782 : Update to latest format from Apache Felix config admin

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684163 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4768 : Sort entries alphabetical in written model
Carsten Ziegeler [Sat, 6 Jun 2015 15:36:01 +0000 (15:36 +0000)] 
SLING-4768 : Sort entries alphabetical in written model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1683921 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4766 Provisioning Model does not support adding variables to Sling Settings...
Stefan Seifert [Thu, 4 Jun 2015 20:47:35 +0000 (20:47 +0000)] 
SLING-4766 Provisioning Model does not support adding variables to Sling Settings - allow escaping with \${var}

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1683639 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4768 : Sort entries alphabetical in written model
Carsten Ziegeler [Mon, 1 Jun 2015 18:23:34 +0000 (18:23 +0000)] 
SLING-4768 : Sort entries alphabetical in written model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1682970 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4768 : Sort entries alphabetical in written model
Carsten Ziegeler [Mon, 1 Jun 2015 17:50:56 +0000 (17:50 +0000)] 
SLING-4768 : Sort entries alphabetical in written model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1682962 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4768 : Sort entries alphabetical in written model
Carsten Ziegeler [Mon, 1 Jun 2015 17:43:39 +0000 (17:43 +0000)] 
SLING-4768 : Sort entries alphabetical in written model

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1682959 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4698 - Set parent.relativePath to empty for all modules
Robert Munteanu [Thu, 7 May 2015 10:14:40 +0000 (10:14 +0000)] 
SLING-4698 - Set parent.relativePath to empty for all modules

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdd missing licence headers
Carsten Ziegeler [Mon, 27 Apr 2015 12:13:45 +0000 (12:13 +0000)] 
Add missing licence headers

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1676243 13f79535-47bb-0310-9956-ffa450edef68

3 years agoFix javadocs
Carsten Ziegeler [Mon, 30 Mar 2015 12:09:53 +0000 (12:09 +0000)] 
Fix javadocs

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1670065 13f79535-47bb-0310-9956-ffa450edef68

3 years agoUpdate test case
Carsten Ziegeler [Mon, 30 Mar 2015 08:07:01 +0000 (08:07 +0000)] 
Update test case

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1670002 13f79535-47bb-0310-9956-ffa450edef68

3 years agoAdd test case for run modes
Carsten Ziegeler [Fri, 6 Mar 2015 15:33:51 +0000 (15:33 +0000)] 
Add test case for run modes

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1664656 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Fri, 6 Mar 2015 14:18:57 +0000 (14:18 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1664631 13f79535-47bb-0310-9956-ffa450edef68

3 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.1.0
Carsten Ziegeler [Fri, 6 Mar 2015 14:18:37 +0000 (14:18 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.1.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1664628 13f79535-47bb-0310-9956-ffa450edef68

3 years agoSLING-4473 : Provide a way to remove settings, artifacts and features through a model
Carsten Ziegeler [Thu, 5 Mar 2015 12:20:27 +0000 (12:20 +0000)] 
SLING-4473 : Provide a way to remove settings, artifacts and features through a model
SLING-4475 : Artifact is twice in feature after merge

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1664323 13f79535-47bb-0310-9956-ffa450edef68

3 years agoUpdate to latest launchpad base release
Carsten Ziegeler [Thu, 29 Jan 2015 07:28:03 +0000 (07:28 +0000)] 
Update to latest launchpad base release

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1655539 13f79535-47bb-0310-9956-ffa450edef68

4 years agoFix comments
Carsten Ziegeler [Sat, 1 Nov 2014 14:44:17 +0000 (14:44 +0000)] 
Fix comments

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1635960 13f79535-47bb-0310-9956-ffa450edef68

4 years ago[maven-release-plugin] prepare for next development iteration
Carsten Ziegeler [Thu, 23 Oct 2014 06:53:15 +0000 (06:53 +0000)] 
[maven-release-plugin] prepare for next development iteration

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1633750 13f79535-47bb-0310-9956-ffa450edef68

4 years ago[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.0.0
Carsten Ziegeler [Thu, 23 Oct 2014 06:52:59 +0000 (06:52 +0000)] 
[maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.0.0

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1633748 13f79535-47bb-0310-9956-ffa450edef68

4 years agoAdd some tests to verify the parsed and effective models
Bertrand Delacretaz [Tue, 21 Oct 2014 12:29:26 +0000 (12:29 +0000)] 
Add some tests to verify the parsed and effective models

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1633358 13f79535-47bb-0310-9956-ffa450edef68