Skip to content

Commit

Permalink
Core Components 2.10.0 and Archetype 23 (#105)
Browse files Browse the repository at this point in the history
  • Loading branch information
@godanny86
godanny86 committed Jun 23, 2020
1 parent 3a361b5 commit 17b7c28
Show file tree
Hide file tree
Showing 22 changed files with 771 additions and 1,060 deletions.
9 changes: 7 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ If you have a running AEM instance you can build and package the whole project u
Depending on your maven configuration, you may find it helpful to force the resolution of the Adobe public repo with

mvn clean install -PautoInstallSinglePackage -Padobe-public

Or to deploy it to a publish instance, run

mvn clean install -PautoInstallSinglePackagePublish

Or alternatively

mvn clean install -PautoInstallSinglePackage -Daem.port=4503
Expand All @@ -59,6 +59,11 @@ Or to deploy only the bundle to the author, run
cd core
mvn clean install -PautoInstallBundle

### Building for AEM 6.x.x

The project has been designed for **AEM as a Cloud Service**. The project is also backward compatible with AEM **6.4.8** and **6.5.5** by adding the `classic` profile when executing a build, i.e:

mvn clean install -PautoInstallSinglePackage -Pclassic

## Testing

Expand Down
95 changes: 65 additions & 30 deletions all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
| See the License for the specific language governing permissions and
| limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- ====================================================================== -->
Expand Down Expand Up @@ -47,7 +49,7 @@
<artifactId>filevault-package-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<group>wknd</group>
<group>com.adobe.aem.guides</group>
<embeddeds>
<embedded>
<groupId>com.adobe.aem.guides</groupId>
Expand All @@ -67,24 +69,6 @@
<type>zip</type>
<target>/apps/wknd-packages/content/install</target>
</embedded>
<embedded>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.content</artifactId>
<type>zip</type>
<target>/apps/wknd-vendor-packages/application/install</target>
</embedded>
<embedded>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.config</artifactId>
<type>zip</type>
<target>/apps/wknd-vendor-packages/application/install</target>
</embedded>
<embedded>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.examples</artifactId>
<type>zip</type>
<target>/apps/wknd-vendor-packages/content/install</target>
</embedded>
</embeddeds>
</configuration>
</plugin>
Expand Down Expand Up @@ -169,6 +153,57 @@
</plugins>
</build>
</profile>
<!-- AEM 6.x Profile to include Core Components-->
<profile>
<id>classic</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>filevault-package-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<group>com.adobe.aem.guides</group>
<embeddeds>
<embedded>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.apps</artifactId>
<type>zip</type>
<target>/apps/wknd-packages/application/install</target>
</embedded>
<embedded>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.content</artifactId>
<type>zip</type>
<target>/apps/wknd-packages/content/install</target>
</embedded>
<embedded>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.content.sample</artifactId>
<type>zip</type>
<target>/apps/wknd-packages/content/install</target>
</embedded>
<embedded>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.content</artifactId>
<type>zip</type>
<target>/apps/wknd-vendor-packages/application/install</target>
</embedded>
<embedded>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.config</artifactId>
<type>zip</type>
<target>/apps/wknd-vendor-packages/application/install</target>
</embedded>
</embeddeds>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<!-- ====================================================================== -->
Expand All @@ -178,23 +213,28 @@
<dependency>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.apps</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.apps.structure</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.content</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${project.version}</version>
<type>zip</type>
</dependency>

<dependency>
<groupId>com.adobe.aem.guides</groupId>
<artifactId>aem-guides-wknd.ui.content.sample</artifactId>
<version>0.0.3-SNAPSHOT</version>
<version>${project.version}</version>
<type>zip</type>
</dependency>

<!-- Core Component Dependency (6.x only)-->
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.content</artifactId>
Expand All @@ -205,10 +245,5 @@
<artifactId>core.wcm.components.config</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.examples</artifactId>
<type>zip</type>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 17b7c28

Please sign in to comment.