You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2019/06/11 14:26:36 UTC
[sling-org-apache-sling-feature-modelconverter] 01/01: Merge pull
request #3 from apache/standalone-app
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-org-apache-sling-feature-modelconverter.git
commit ad254c1ab583f5263726764020d3065b6d2b7e4b
Merge: d8e02bb 167546b
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Jun 11 15:26:30 2019 +0100
Merge pull request #3 from apache/standalone-app
SLING-8423 Standalone App and Changes to make Sling Feature Model Converter
pom.xml | 93 +++++++-
readme.md | 148 +++++++++++++
src/main/assembly/README.md | 149 +++++++++++++
src/main/assembly/bin.xml | 71 +++++++
.../modelconverter/FeatureToProvisioning.java | 4 +-
.../apache/sling/feature/modelconverter/Main.java | 142 +++++++++++++
.../modelconverter/ProvisioningToFeature.java | 136 +++++++++---
src/main/legal/LICENSE-with-deps | 233 +++++++++++++++++++++
src/main/legal/NOTICE-with-deps | 5 +
src/main/legal/license-header | 14 ++
.../feature/modelconverter/ModelConverterTest.java | 109 ++++++++--
src/test/resources/boot.json | 6 +-
src/test/resources/boot_gav.json | 6 +-
src/test/resources/more/repoinit-multiple.json | 2 +-
src/test/resources/oak.json | 12 +-
src/test/resources/repoinit.json | 2 +-
src/test/resources/simplelogger.properties | 5 +
17 files changed, 1077 insertions(+), 60 deletions(-)
diff --cc pom.xml
index 77e9d15,e26922c..13caf21
--- a/pom.xml
+++ b/pom.xml
@@@ -67,9 -141,14 +141,14 @@@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>