You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by pa...@apache.org on 2018/09/06 09:18:02 UTC

[sling-org-apache-sling-feature] 01/01: Merge pull request #3 from apache/variables

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

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

commit 0b91c06fbdb68ca8903620045f38376b17956b43
Merge: 26f871c 1732fe2
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Thu Sep 6 11:17:59 2018 +0200

    Merge pull request #3 from apache/variables
    
    Change variable handling to not allow variables to be defined twice

 .../sling/feature/builder/BuilderContext.java      | 33 +++++++-
 .../apache/sling/feature/builder/BuilderUtil.java  | 61 +++++++++++++-
 .../sling/feature/builder/FeatureBuilder.java      | 26 +++---
 .../sling/feature/builder/BuilderUtilTest.java     |  2 +-
 .../sling/feature/builder/FeatureBuilderTest.java  | 93 ++++++++++++++++++++--
 5 files changed, 192 insertions(+), 23 deletions(-)