This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to
refs/heads/SLING-8913-multiple-instance-types by this push:
new e21fe1d Merging
e21fe1d is described below
commit e21fe1d57d13c9d6ba25928fa174b8cdf55ed767
Author: Dan Klco <[email protected]>
AuthorDate: Thu Aug 27 17:04:54 2020 -0400
Merging
---
converter/pom.xml | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/converter/pom.xml b/converter/pom.xml
index 46865b5..f26fa4b 100644
--- a/converter/pom.xml
+++ b/converter/pom.xml
@@ -96,6 +96,43 @@ under the License.
</aggregates>
</configuration>
</execution>
+<<<<<<< HEAD
+=======
+ <execution>
+ <id>install-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-features</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-sling-feature-archives</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-featurearchives</goal>
+ </goals>
+ <configuration>
+ <archives>
+ <archive>
+ <classifier>slingcmsfar</classifier>
+
<includeClassifier>slingcms</includeClassifier>
+ </archive>
+ </archives>
+ </configuration>
+ </execution>
+ <execution>
+ <id>diff</id>
+ <goals>
+ <goal>features-diff</goal>
+ </goals>
+ <configuration>
+ <selection>
+ <includeClassifier>oak_tar</includeClassifier>
+ <includeClassifier>slingcms</includeClassifier>
+ </selection>
+ </configuration>
+ </execution>
+>>>>>>> Adding a POM to convert PM to FM
</executions>
</plugin>
<plugin>
