You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/06/15 08:56:49 UTC
[sling-slingfeature-maven-plugin] 01/02: Merge branch 'master' into
feature_diff
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch feature_diff
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
commit 2e95d7317fa276c35b2dac9b5a40d624575ba318
Merge: ca54947 00b2690
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Sat Jun 15 09:58:44 2019 +0200
Merge branch 'master' into feature_diff
README.md | 28 ++++++++++++
pom.xml | 8 ++--
.../apache/sling/feature/maven/Preprocessor.java | 20 +++++++--
.../feature/maven/mojos/AggregateFeaturesMojo.java | 18 ++++++--
.../feature/maven/mojos/AnalyseFeaturesMojo.java | 14 +++++-
.../sling/feature/maven/mojos/ApisJarMojo.java | 42 +++++++++++++----
.../feature/maven/mojos/AttachFeaturesMojo.java | 52 ++++++++++++++++++++--
.../maven/mojos/AttachFeaturesMojoTest.java | 2 +-
8 files changed, 158 insertions(+), 26 deletions(-)
diff --cc pom.xml
index 0e30d91,d923ef5..90fe27c
--- a/pom.xml
+++ b/pom.xml
@@@ -169,27 -169,9 +169,27 @@@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.apiregions.model</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.feature.diff</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <!--
+ | JSON patch
+ -->
+ <dependency>
+ <groupId>com.flipkart.zjsonpatch</groupId>
+ <artifactId>zjsonpatch</artifactId>
+ <version>0.4.8</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>