Skip to content

Commit

Permalink
Update AEM dependencies to 6.5.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwin
kwin committed Apr 2, 2023
1 parent 40a4001 commit ef801b4
Show file tree
Hide file tree
Showing 9 changed files with 2,672 additions and 1,420 deletions.
15 changes: 13 additions & 2 deletions bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>

<!-- @PostConstruct -->
<dependency>
<groupId>javax.annotation</groupId>
Expand Down Expand Up @@ -372,7 +378,7 @@
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<artifactId>javax.mail-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- for com.adobe.acs.commons.logging.impl.SyslogAppender -->
Expand Down Expand Up @@ -581,6 +587,12 @@
<version>1.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<scope>test</scope>
</dependency>
<!-- needed to override the embedded commons.osgi in org.apache.sling.models.impl -->
<dependency>
<groupId>org.apache.sling</groupId>
Expand Down Expand Up @@ -732,7 +744,6 @@
<dependency>
<groupId>com.adobe.aem</groupId>
<artifactId>uber-jar</artifactId>
<classifier>apis</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
9 changes: 9 additions & 0 deletions bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
import com.adobe.cq.dam.cfm.VariationTemplate;
import com.adobe.cq.dam.cfm.VersionDef;
import com.adobe.cq.dam.cfm.VersionedContent;

import java.util.Calendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import org.apache.sling.api.resource.Resource;
import org.jetbrains.annotations.NotNull;

/**
* Incomplete mock that provides just enough for basic testing
Expand Down Expand Up @@ -156,5 +159,11 @@ public <AdapterType> AdapterType adaptTo(@Nonnull Class<AdapterType> aClass) {
@Override
public void removeVariation(String name) throws ContentFragmentException {
}

@NotNull
@Override
public Calendar getLastModifiedDeep() throws ContentFragmentException {
return Calendar.getInstance();
}

}
11 changes: 11 additions & 0 deletions bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockDataType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.adobe.cq.dam.cfm.DataType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MockDataType implements DataType {

Expand All @@ -38,4 +39,14 @@ public String getTypeString() {
public boolean isMultiValue() {
return false;
}

@Override
public @Nullable String getSemanticType() {
return type;
}

@Override
public @NotNull String getValueType() {
return type;
}
}
5 changes: 5 additions & 0 deletions bundle/src/test/java/com/adobe/acs/commons/workflow/impl/WorkflowPackageManagerImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,10 @@ public void stopRecording(final String s) {
public String getPath() {
return WORKFLOW_PACKAGE_PATH;
}

@Override
public boolean hasNode(String arg0) {
return false;
}
};
}
48 changes: 1 addition & 47 deletions oakpal-checks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
</goals>
<configuration>
<defaults>
<aemVersion>6.4</aemVersion>
<aemVersion>6.5</aemVersion>
</defaults>
<source>${pom.basedir}/src/main/script/ExtractBundleInfo.groovy</source>
</configuration>
Expand All @@ -194,51 +194,6 @@
</plugins>
</build>
</profile>
<profile>
<id>webster-aem64</id>
<!-- to be able to execute oakpal:webster with this profile, first create a profile with the same name in
your settings.xml file that sets a "webster.repositoryHome" property with an absolute path to the
crx-quickstart/repository directory of a locally-installed AEM 6.4 server. -->
<build>
<plugins>
<plugin>
<groupId>net.adamcin.oakpal</groupId>
<artifactId>oakpal-maven-plugin</artifactId>
<configuration>
<websterTargets>
<checklist>
<file>src/main/resources/OAKPAL-INF/checklist/content-class-aem64.json</file>
<config>
<jcrNamespaces>
<namespace>
<prefix>granite</prefix>
<uri>http://www.adobe.com/jcr/granite/1.0</uri>
</namespace>
</jcrNamespaces>
<selectNodeTypes>
<type>granite:PublicArea</type>
<type>granite:FinalArea</type>
<type>granite:InternalArea</type>
<type>granite:AbstractArea</type>
</selectNodeTypes>
<nodeTypeFilters>
<filter>
<type>exclude</type>
<pattern>nt:file</pattern>
</filter>
<filter>
<type>exclude</type>
<pattern>nt:resource</pattern>
</filter>
</nodeTypeFilters>
</config>
</checklist>
</websterTargets>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>webster-aem65</id>
<!-- to be able to execute oakpal:webster with this profile, first create a profile with the same name in
Expand Down Expand Up @@ -294,7 +249,6 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>18.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit ef801b4

Please sign in to comment.