You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:59:09 UTC
[sling-org-apache-sling-provisioning-model] annotated tag
org.apache.sling.provisioning.model-1.8.2 created (now fbb576a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.provisioning.model-1.8.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git.
at fbb576a (tag)
tagging 11ba47a19a0960c0cddd08b688ca8454d4f37fda (commit)
by Carsten Ziegeler
on Tue May 2 14:44:33 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.provisioning.model-1.8.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 11a204a Add slingstart model
new 03f094c Add slingstart model
new a86fcd4 Update javadocs and rename subsystem to deliverable and run mode to feature
new 58cc5a6 Add simple txt parser
new 43a5c06 Add simple txt parser
new fdc1ccf Fully support Apach Felix config file format. Move from properties to getter and setter methods
new 470e4bc Fully support Apach Felix config file format. Move from properties to getter and setter methods
new 9857e6c Fully support Apach Felix config file format. Move from properties to getter and setter methods
new 75a411c Simplify model, move completely to getter/setter methods
new 1a36bd0 Implement txt format for reading and writing
new 7bee16a Add merger utility and variable replacement
new ca9289e Finish configuration support
new 245be2d Add resolver to resolve variables from environment, system properties etc.
new ffb35f8 Don't output jar extension if not necessary
new 252bf2d Remove support for xml
new 456ebb1 Implement provisioning model
new 380d68e Rename some constants
new c58f1ab Cleanup methods and constants
new d3b6bc4 Update to Sling Parent POM 22 with baselining enabled
new 5154296 Correct method name
new 55e51ed Remove old slingstart model
new 4b98c32 Refactor model and add basic read/write test
new 98736d5 Consistent method naming and javadocs
new 2341da7 Rename to provisoning model
new 4d55db0 Rename to provisioning model
new dc48bc1 Keep ${sling.home} in settings
new fb3de37 Remove artifact on merge regardless of the start level
new 43e7bcf Fix writing out raw configs
new 54361e3 Fix writing out raw configs
new d71c810 Fix reading configs
new bbe9bcd Allow comments in configurations
new bccda6c Add some tests to verify the parsed and effective models
new c47da2f [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.0.0
new e93aff8 [maven-release-plugin] prepare for next development iteration
new 7aee9d5 Fix comments
new ee05f2c Update to latest launchpad base release
new 523138f SLING-4473 : Provide a way to remove settings, artifacts and features through a model SLING-4475 : Artifact is twice in feature after merge
new 94c918f [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.1.0
new 15d9a12 [maven-release-plugin] prepare for next development iteration
new 89e8cf9 Add test case for run modes
new 97ac28f Update test case
new 52ee32c Fix javadocs
new 7a21cc8 Add missing licence headers
new ceeb1f7 SLING-4698 - Set parent.relativePath to empty for all modules
new 43429c2 SLING-4768 : Sort entries alphabetical in written model
new fba2533 SLING-4768 : Sort entries alphabetical in written model
new ee04adc SLING-4768 : Sort entries alphabetical in written model
new 9c0eaaa SLING-4766 Provisioning Model does not support adding variables to Sling Settings - allow escaping with \${var}
new 9dcb074 SLING-4768 : Sort entries alphabetical in written model
new 1f2cf68 SLING-4782 : Update to latest format from Apache Felix config admin
new f66c21e SLING-4786 : Attributes and configuration format are wronlgy written out
new 2192bda SLING-4126 : Provide a mechanism to merge configurations
new 5f9f27c SLING-4126 : Provide a mechanism to merge configurations
new bd96e54 SLING-4124 : Bootstrap command file can't be appended
new c2b343f SLING-4790 : Removal of artifacts from inherited model is not possible
new 9c0fcd5 [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.2.0
new 690eb71 [maven-release-plugin] prepare for next development iteration
new 0972528 SLING-4807 : Variables in configurations are not replaced
new 312ade9 Update to Sling Parent 23
new 1d0ef5f Remove superflous sling.java.version=6 as it's the default now
new 58dbd4a set parent version to 24 and add empty relativePath where missing
new 3509c1f SLING-4645 Update Tika to 1.9
new bbf7873 SLING-4880 Allow to get artifact versions from POM
new 6a392fa SLING-4879 refactor model processing logic from ModelUtility#getEffectiveModel into separate class to make it reusable
new 82e4d3f SLING-4879 move resolver/replace logic to separate class ModelResolverUtility
new 7d6e31f SLING-4807 make sure variable replacement is applied whether custom resolver exists or not
new 5eea7de SLING-4879 add ModelUtility.applyVariables method that allows to inject further variables from a custom variable resolver
new ce9607f SLING-4880 apply resolved dependencies to raw model instead of attaching effective model add new optional parameter "allowUnresolvedPomDependencies" (default: false)
new 84e3f39 fix some javadoc errors java 8 complains about
new 9a36bf7 SLING-4807 introduce explicit boolean flag to make sure variable replacement does not take place when merging models
new e3b7720 [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.3.0
new b0181cd [maven-release-plugin] prepare for next development iteration
new 9a80232 Update the main reactor to parent 25
new b36cc99 SLING-5148 : Support OSGi Subsystems in the Sling Provisioning model. Apply patch from David Bosschaert
new d0779ce SLING-5172 : Provide support for custom sections in the provisioning model
new 7fa8736 SLING-5148 : Support OSGi Subsystems in the Sling Provisioning model.
new 94bc251 SLING-5174 : Refactor merging of models into separate utility class and add merge options
new 4a90126 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1709754 13f79535-47bb-0310-9956-ffa450edef68
new b0f38e7 SLING-5172 : Provide support for custom sections in the provisioning model
new 42a911c SLING-5174 : Refactor merging of models into separate utility class and add merge options
new b05b9ce [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.0
new d7059e2 [maven-release-plugin] prepare for next development iteration
new 6bb2a5e SLING-5185 : Version comparision is wrong in case of qualifiers
new 2c05c45 SLING-5189 : Improve start level handling when merging models
new 967d25a SLING-5318 : Sling provisioning model does not propagate Artifact metadata during processing. Apply patch from David Bosschaert
new a4b997d [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.2
new 7da6bc0 [maven-release-plugin] prepare for next development iteration
new 90c365d SLING-5355 - test multiline strings in configs
new 5ba03f6 Switch to parent pom 26
new f1b113a SLING-5765 : No way to remove an artifact from a special runmode
new 609d205 [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.4
new 3bd7409 [maven-release-plugin] prepare for next development iteration
new 636f387 SLING-5914 - add tests that demonstrate the current behavior
new af9d553 SLING-6181 : Support adding version info to Feature
new 62c933d [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.5.0
new 3502210 [maven-release-plugin] prepare for next development iteration
new 52c62df SLING-6215 : Catch IllegalArgumentException when comparing versions
new 8cc4eef SLING-6214 : Validate feature version to be a valid version
new f12e1de SLING-6216 : Merge versioned features by using highest version
new d6876f6 SLING-6218 : Make usage of MergeOptions easier
new 57a433e [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.6.0
new 9f2afeb [maven-release-plugin] prepare for next development iteration
new e5c653f SLING-6265 : Effective model does not get feature versions
new 46bc2eb SLING-6267 : Support OSGi versions and provide accessor methods of version parts
new 070df11 SLING-6267 : Support OSGi versions and provide accessor methods of version parts
new a734fed [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.7.0
new 4777434 [maven-release-plugin] prepare for next development iteration
new 97fe761 SLING-6272 : Comments in the provisioning model get lost
new ab4c7d8 SLING-6278 : Provide tooling to create an archive with the provisioning model and all artifacts
new 39d76f8 SLING-6389 : Avoid empty blank line at end of provisioning model
new ac29edc [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.0
new 915ab61 [maven-release-plugin] prepare for next development iteration
new ea92c7f use Sling Parent 30
new 725bdaa SLING-6816 : Model validation should handle :remove sections correctly
new 34e6187 [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.2
new 11ba47a [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.8.2
The 116 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
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-provisioning-model] 04/05:
[maven-release-plugin] prepare release
org.apache.sling.provisioning.model-1.8.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.8.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 34e6187a6aaa31047bc1f0582cdf55e3836ab2cd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 14:44:20 2017 +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/tooling/support/provisioning-model@1793506 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9dccaf2..1ce3993 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>org.apache.sling.provisioning.model</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.8.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Provisioning Model</name>
@@ -31,9 +31,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.8.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 02/05: use Sling Parent
30
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.8.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit ea92c7fc20c4a9d685c77219474816b134e90eb8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 807de47..9dccaf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 03/05: SLING-6816 :
Model validation should handle :remove sections correctly
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.8.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 725bdaa752a63076f03b67ec032df0d266f4c04e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 11:52:32 2017 +0000
SLING-6816 : Model validation should handle :remove sections correctly
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1793475 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/provisioning/model/ModelUtility.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
index 968bfce..62a37e8 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
@@ -162,7 +162,7 @@ public abstract class ModelUtility {
* @return A map with errors or {@code null} if valid.
*/
public static Map<Traceable, String> validate(final Model model) {
- final Map<Traceable, String> errors = new HashMap<Traceable, String>();
+ final Map<Traceable, String> errors = new HashMap<>();
for(final Feature feature : model.getFeatures() ) {
// validate feature
@@ -178,10 +178,10 @@ public abstract class ModelUtility {
}
}
for(final RunMode runMode : feature.getRunModes()) {
+ boolean hasRemove = false;
final String[] rm = runMode.getNames();
if ( rm != null ) {
int hasSpecial = 0;
- boolean hasRemove = false;
for(final String m : rm) {
if ( m.startsWith(":") ) {
if ( hasSpecial > 0 ) {
@@ -242,7 +242,7 @@ public abstract class ModelUtility {
if ( c.isSpecial() && c.getFactoryPid() != null ) {
error = (error != null ? error + ", " : "") + "factory pid not allowed for special configuration";
}
- if ( c.getProperties().isEmpty() ) {
+ if ( c.getProperties().isEmpty() && !hasRemove ) {
error = (error != null ? error + ", " : "") + "configuration properties missing";
}
if (error != null) {
@@ -271,7 +271,7 @@ public abstract class ModelUtility {
public static Model applyVariables(final Model model, final VariableResolver resolver) {
// define delegating resolver that collects all variable names and value per feature
- final Map<String,Map<String,String>> collectedVars = new HashMap<String, Map<String,String>>();
+ final Map<String,Map<String,String>> collectedVars = new HashMap<>();
VariableResolver variableCollector = new VariableResolver() {
@Override
public String resolve(Feature feature, String name) {
@@ -279,7 +279,7 @@ public abstract class ModelUtility {
if (value != null) {
Map<String,String> featureVars = collectedVars.get(feature.getName());
if (featureVars == null) {
- featureVars = new HashMap<String, String>();
+ featureVars = new HashMap<>();
collectedVars.put(feature.getName(), featureVars);
}
featureVars.put(name, value);
@@ -295,7 +295,7 @@ public abstract class ModelUtility {
ModelProcessor variablesUpdater = new ModelProcessor() {
@Override
protected KeyValueMap<String> processVariables(KeyValueMap<String> variables, Feature newFeature) {
- KeyValueMap<String> newVariables = new KeyValueMap<String>();
+ KeyValueMap<String> newVariables = new KeyValueMap<>();
Map<String,String> featureVars = collectedVars.get(newFeature.getName());
if (featureVars != null) {
for (Map.Entry<String, String> entry : featureVars.entrySet()) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 01/05:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.8.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 915ab614b2e29bed91c7c654cbb49df0664ff9d4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Dec 13 12:52:45 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1774004 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4276687..807de47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>org.apache.sling.provisioning.model</artifactId>
- <version>1.8.0</version>
+ <version>1.8.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Provisioning Model</name>
@@ -31,9 +31,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.8.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 05/05:
[maven-release-plugin] copy for tag
org.apache.sling.provisioning.model-1.8.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.8.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 11ba47a19a0960c0cddd08b688ca8454d4f37fda
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue May 2 14:44:33 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.8.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.2@1793507 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.