Update AEM dependencies to 6.5.10

Author: kwin

bundle/pom.xml

@@ -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>
@@ -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  -->
@@ -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>
@@ -732,7 +744,6 @@
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>
-            <classifier>apis</classifier>
             <scope>provided</scope>
         </dependency>
     </dependencies>

bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java

@@ -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
@@ -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();
+    }
 
 }

bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockDataType.java

@@ -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 {
 
@@ -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;
+    }
 }

bundle/src/test/java/com/adobe/acs/commons/workflow/impl/WorkflowPackageManagerImplTest.java

@@ -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;
+        }
     };
 }

oakpal-checks/pom.xml

@@ -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>
@@ -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
@@ -294,7 +249,6 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>18.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>