Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@YegorKozlov
YegorKozlov committed Jan 4, 2025
2 parents 4f50dd4 + 5f45a0c commit 9bd5099
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 103 deletions.
15 changes: 12 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
## Unreleased ([details][unreleased changes details])

### Fixed

- # - Redirect Manager: ensure redirect configurations are orderable

## 6.10.0 - 2024-12-13

### Changed

- #3494 - Remove offline instrumentation with Jacoco

### Fixed

- #3471 - EmailService not working due to unsatisfied reference to MailTemplateManager in AEM on prem

## 6.9.10 - 2024-12-13

### Added
- #3484 - Redirect Manager: A servlet to export redirects to a TXT file to use with pipeline-free redirects
- #3480 - AEM Sites Copy Publish URLs

### Fixed
- #3479 - Fixed Configurations Model for Redirect Manager after change in "redirect" resource as "sling:Folder"

### Fixed

- #3483 - Fixed issue with genericlist/body.jsp importing a class from an impl package.

## 6.9.6 - 2024-11-20
Expand Down
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>
66 changes: 38 additions & 28 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<!-- the minimum AEMaaCS version being supported -->
<aem.sdk.api.version>2024.8.17569.20240822T203847Z-240700</aem.sdk.api.version>

<jacoco.version>0.8.11</jacoco.version>
<jacoco.version>0.8.12</jacoco.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version> <!-- >= 5.x requires Java 11 -->
<!-- affects both m-compiler-p and m-javadoc-p-->
<maven.compiler.release>8</maven.compiler.release>
Expand Down Expand Up @@ -219,14 +219,8 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>${bnd.version}</version>
<executions>
<execution>
<id>bnd-process</id>
<goals>
<goal>bnd-process</goal>
</goals>
<configuration>
<bnd><![CDATA[
<configuration>
<bnd><![CDATA[
# a lot of bundle header are generated from pom elements by default: https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin#default-bundle-headers
Bundle-Category: acs-aem-commons
# export all versioned packages except for conditional ones (https://github.com/bndtools/bnd/issues/3721#issuecomment-579026778)
Expand All @@ -248,8 +242,14 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/
# support only DS 1.4 (https://github.com/bndtools/bnd/pull/3121/files)
-dsannotations-options: version;maximum=1.4.0,inherit
-metatypeannotations-options: version;maximum=1.4.0
]]></bnd>
</configuration>
]]></bnd>
</configuration>
<executions>
<execution>
<id>bnd-process</id>
<goals>
<goal>bnd-process</goal>
</goals>
</execution>
</executions>
<dependencies>
Expand Down Expand Up @@ -794,38 +794,48 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/
<profile>
<id>coverage</id>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{jacoco.command}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<!--
for IT where you need a forked JVM to run the tests you can use this system property to make sure that
the JaCoCo agent correctly instruments your code
set system property also via argLine as only that allows late evaluation -->
<argLine>@{jacoco.command} -Djacoco.command=@{jacoco.command}</argLine>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>

<executions>
<execution>
<id>default-prepare-agent</id>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<!-- the same execution data file is used for both IT and UT-->
<configuration>
<excludes>
<exclude>*</exclude>
</excludes>
<propertyName>jacoco.command</propertyName>
</configuration>
</execution>
<execution>
<id>jacoco-instrument</id>
<goals>
<goal>instrument</goal>
</goals>
</execution>
<execution>
<id>jacoco-restore-instrumented-classes</id>
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
Expand Down

0 comments on commit 9bd5099

Please sign in to comment.