Skip to content

Commit

Permalink
Add missing dependency for bundle fragment "bundle-onprem"
Browse files Browse the repository at this point in the history 
Simplify embedding
Only run aemanalyser on package with classifier "cloud"
  • Loading branch information
@kwin
kwin committed Dec 6, 2024
1 parent 5907675 commit 02ce4da
Showing 1 changed file with 32 additions and 72 deletions.
104 changes: 32 additions & 72 deletions all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<configuration>
<packageType>container</packageType>
<excludes>**/META-INF/*,**/thumbnail.png</excludes>
<embeddedTarget>/apps/acs-commons/install</embeddedTarget>
</configuration>
<executions>
<execution>
Expand All @@ -59,40 +60,14 @@
<name>acs-aem-commons-all</name>
<embeddeds>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle-onprem</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<!-- exclude cloud specific dependencies -->
<artifactId>~acs-aem-commons-bundle-cloud</artifactId>
<classifier>~cloud</classifier>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.content</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.config</artifactId>
<target>/apps/acs-commons/install</target>
<type>jar,zip</type>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
<!-- only consider direct dependencies -->
<excludeTransitive>true</excludeTransitive>
</embedded>
</embeddeds>
</configuration>
Expand Down Expand Up @@ -204,13 +179,32 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle-onprem</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.adobe.acs</groupId>
<artifactId>acs-aem-commons-bundle-cloud</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<version>${project.version}</version>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.adobe.acs</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<classifier>cloud</classifier>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.content</artifactId>
Expand Down Expand Up @@ -278,39 +272,17 @@
<cloudManagerTarget>all</cloudManagerTarget>
</properties>
<embeddeds>
<!-- exclude onprem/classic specific artifacts-->
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-bundle-cloud</artifactId>
<target>/apps/acs-commons/install</target>
<artifactId>~acs-aem-commons-bundle-onprem,~acs-aem-commons-ui.apps</artifactId>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
<!-- only consider direct dependencies -->
<excludeTransitive>true</excludeTransitive>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<classifier>cloud</classifier>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.content</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
<embedded>
<groupId>${project.groupId}</groupId>
<artifactId>acs-aem-commons-ui.config</artifactId>
<target>/apps/acs-commons/install</target>
<filter>true</filter>
<isAllVersionsFilter>true</isAllVersionsFilter>
</embedded>
Expand Down Expand Up @@ -348,26 +320,14 @@
<goals>
<goal>project-analyse</goal>
</goals>
<configuration>
<classifier>cloud</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.adobe.acs</groupId>
<artifactId>acs-aem-commons-bundle-cloud</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.adobe.acs</groupId>
<artifactId>acs-aem-commons-ui.apps</artifactId>
<classifier>cloud</classifier>
<version>${project.version}</version>
<type>zip</type>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

0 comments on commit 02ce4da

Please sign in to comment.