Skip to content

Commit

Permalink
Merge pull request #90 from exadel-inc/tech/samples-pom-structure
Browse files Browse the repository at this point in the history 
[Samples] POM files and README update for Release 1.2.1
  • Loading branch information
@smiakchilo
smiakchilo authored Aug 19, 2020
2 parents 7c67764 + 73e8e62 commit b0694f3
Show file tree
Hide file tree
Showing 6 changed files with 206 additions and 209 deletions.
1 change: 0 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<module>aem-authoring-toolkit-api</module>
<module>aem-authoring-toolkit-plugin</module>
<module>aem-authoring-toolkit-assets</module>
<module>samples</module>
</modules>

<properties>
Expand Down
177 changes: 73 additions & 104 deletions samples/README.md
View file

Large diffs are not rendered by default.

90 changes: 49 additions & 41 deletions samples/apps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,27 @@
<version>1.2.1-SNAPSHOT</version>

<build>
<finalName>aem-dialog-plugin-sandbox-apps-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
<resources>
<resource>
<directory>src/main/content/jcr_root</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>.</targetPath>
</resource>
<resource>
<directory>src/main/content/META-INF</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>../vault-work/META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -27,7 +47,24 @@
</executions>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
<configuration>
<embeddeds>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>aem-authoring-toolkit-samples-core</artifactId>
<target>/apps/${project.jcrAppFolder}/install</target>
</embedded>
</embeddeds>
<subPackages>
<subPackage>
<groupId>${project.groupId}</groupId>
<artifactId>aem-authoring-toolkit-assets</artifactId>
<filter>true</filter>
</subPackage>
</subPackages>
</configuration>
</plugin>
</plugins>
</build>
Expand All @@ -36,52 +73,23 @@
<profile>
<id>install-samples</id>
<build>
<resources>
<resource>
<directory>src/main/content/jcr_root</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>.</targetPath>
</resource>
<resource>
<directory>src/main/content/META-INF</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>../vault-work/META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
<configuration>
<embeddeds>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>aem-authoring-toolkit-samples-core</artifactId>
<target>/apps/${project.jcrAppFolder}/install</target>
</embedded>
</embeddeds>
<subPackages>
<subPackage>
<groupId>com.exadel.aem</groupId>
<artifactId>aem-authoring-toolkit-assets</artifactId>
<filter>true</filter>
</subPackage>
</subPackages>
</configuration>
<executions>
<execution>
<id>Installing AEM package</id>
<goals>
<goal>install</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.exadel.aem</groupId>
<artifactId>aem-authoring-toolkit-plugin</artifactId>
<configuration>
<!-- Place here the path to the node under which your component nodes are stored -->
<componentsPathBase>jcr_root/apps/${project.jcrAppFolder}/components</componentsPathBase>
</configuration>
</plugin>
Expand All @@ -100,9 +108,9 @@
<artifactId>aem-authoring-toolkit-samples-core</artifactId>
</dependency>
<dependency>
<groupId>com.exadel.aem</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>aem-authoring-toolkit-assets</artifactId>
<type>content-package</type>
<type>zip</type>
</dependency>
</dependencies>
</project>
62 changes: 40 additions & 22 deletions samples/content/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,40 @@
<version>1.2.1-SNAPSHOT</version>

<build>
<finalName>aem-dialog-plugin-sandbox-content-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
<resources>
<resource>
<directory>src/main/content/jcr_root</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>.</targetPath>
</resource>
<resource>
<directory>src/main/content/META-INF</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>../vault-work/META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>default-jar</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Expand All @@ -27,30 +57,18 @@
<profile>
<id>install-samples</id>
<build>
<resources>
<resource>
<directory>src/main/content/jcr_root</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>.</targetPath>
</resource>
<resource>
<directory>src/main/content/META-INF</directory>
<excludes>
<exclude>**/*.vlt/**</exclude>
<exclude>**/*.vlt</exclude>
<exclude>**/*.DS_Store</exclude>
</excludes>
<targetPath>../vault-work/META-INF</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>com.day.jcr.vault</groupId>
<artifactId>content-package-maven-plugin</artifactId>
<executions>
<execution>
<id>Installing AEM package</id>
<goals>
<goal>install</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 8 additions & 11 deletions samples/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,17 @@
<packaging>bundle</packaging>

<build>
<finalName>${project.parent.artifactId}-core-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Sling-Model-Packages>com.exadel.aem.toolkit.samples.models</Sling-Model-Packages>
<Export-Package>com.exadel.aem.toolkit.samples.*</Export-Package>
<!-- Import any version of javax.inject, to allow running on multiple versions of AEM -->
<Import-Package>*;resolution:=optional</Import-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand All @@ -57,7 +54,7 @@

<!-- Internal -->
<dependency>
<groupId>com.exadel.aem</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>aem-authoring-toolkit-api</artifactId>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit b0694f3

Please sign in to comment.