diff --git a/bundle/pom.xml b/bundle/pom.xml index 640d48cea6..96812d7256 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -306,6 +306,12 @@ jsr305 provided + + org.jetbrains + annotations + provided + + javax.annotation @@ -372,7 +378,7 @@ javax.mail - mail + javax.mail-api provided @@ -581,6 +587,12 @@ 1.7 test + + com.sun.mail + javax.mail + 1.6.2 + test + org.apache.sling @@ -732,7 +744,6 @@ com.adobe.aem uber-jar - apis provided diff --git a/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java b/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java index fee9f8cfd5..8c7698bf3e 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java +++ b/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockContentFragment.java @@ -26,6 +26,8 @@ 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; @@ -33,6 +35,7 @@ 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 adaptTo(@Nonnull Class aClass) { @Override public void removeVariation(String name) throws ContentFragmentException { } + + @NotNull + @Override + public Calendar getLastModifiedDeep() throws ContentFragmentException { + return Calendar.getInstance(); + } } diff --git a/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockDataType.java b/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockDataType.java index 035c78290d..82f2ccf1d1 100755 --- a/bundle/src/test/java/com/adobe/acs/commons/mcp/impl/processes/cfi/MockDataType.java +++ b/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; + } } diff --git a/bundle/src/test/java/com/adobe/acs/commons/workflow/impl/WorkflowPackageManagerImplTest.java b/bundle/src/test/java/com/adobe/acs/commons/workflow/impl/WorkflowPackageManagerImplTest.java index 68c9c326ac..775b3e27bf 100644 --- a/bundle/src/test/java/com/adobe/acs/commons/workflow/impl/WorkflowPackageManagerImplTest.java +++ b/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; + } }; } \ No newline at end of file diff --git a/oakpal-checks/pom.xml b/oakpal-checks/pom.xml index 852211b7d6..831b916b5a 100644 --- a/oakpal-checks/pom.xml +++ b/oakpal-checks/pom.xml @@ -177,7 +177,7 @@ - 6.4 + 6.5 ${pom.basedir}/src/main/script/ExtractBundleInfo.groovy @@ -194,51 +194,6 @@ - - webster-aem64 - - - - - net.adamcin.oakpal - oakpal-maven-plugin - - - - src/main/resources/OAKPAL-INF/checklist/content-class-aem64.json - - - - granite - http://www.adobe.com/jcr/granite/1.0 - - - - granite:PublicArea - granite:FinalArea - granite:InternalArea - granite:AbstractArea - - - - exclude - nt:file - - - exclude - nt:resource - - - - - - - - - - webster-aem65 + io.wcm.maven io.wcm.maven.aem-dependencies - 6.4.0.0004 + 6.5.10.0002 pom import @@ -503,7 +503,7 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/ com.day.cq cq-commons 5.8.32 - + @@ -532,6 +532,12 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/ org.apache.felix.scr.annotations 1.12.0 + + + org.jetbrains + annotations + 23.0.0 + com.google.code.findbugs jsr305 @@ -541,7 +547,7 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/ biz.aQute.bnd biz.aQute.bnd.annotation - 3.4.0 + 6.1.0 diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 2c4edb9401..9a9596f823 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -51,7 +51,12 @@ day/cq60/product cq-content - [6.3.64,) + [6.5.6,) + + + adobe/cq650/servicepack + aem-service-pkg + [6.5.10,) @@ -107,19 +112,6 @@ - - oakpal-scan-content-class-aem64 - - scan - - - ${project.build.directory}/oakpal-plugin/reports/content-class-aem64.json - - - content-class-aem64 - - - oakpal-verify @@ -127,8 +119,6 @@ - ${project.build.directory}/oakpal-plugin/reports/content-class-aem64.json - ${project.build.directory}/oakpal-plugin/reports/content-class-aem65.json @@ -214,7 +204,6 @@ com.adobe.aem uber-jar - apis provided diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 273b3faa27..395ea768e5 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -134,19 +134,6 @@ - - oakpal-scan-content-class-aem64 - - scan - - - ${project.build.directory}/oakpal-plugin/reports/content-class-aem64.json - - - content-class-aem64 - - - oakpal-verify @@ -154,8 +141,6 @@ - ${project.build.directory}/oakpal-plugin/reports/content-class-aem64.json - ${project.build.directory}/oakpal-plugin/reports/content-class-aem65.json @@ -191,7 +176,6 @@ com.adobe.aem uber-jar - apis provided