Skip to content

Commit 3437996

Browse files
kwinkwin
committed
Update AEM dependencies to 6.5.10
1 parent 40a4001 commit 3437996

File tree

11 files changed

+2703
-1452
lines changed

11 files changed

+2703
-1452
lines changed

‎bundle/pom.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,12 @@
306306
<artifactId>jsr305</artifactId>
307307
<scope>provided</scope>
308308
</dependency>
309+
<dependency>
310+
<groupId>org.jetbrains</groupId>
311+
<artifactId>annotations</artifactId>
312+
<scope>provided</scope>
313+
</dependency>
314+
309315
<!-- @PostConstruct -->
310316
<dependency>
311317
<groupId>javax.annotation</groupId>
@@ -372,7 +378,7 @@
372378
</dependency>
373379
<dependency>
374380
<groupId>javax.mail</groupId>
375-
<artifactId>mail</artifactId>
381+
<artifactId>javax.mail-api</artifactId>
376382
<scope>provided</scope>
377383
</dependency>
378384
<!-- for com.adobe.acs.commons.logging.impl.SyslogAppender -->
@@ -581,6 +587,12 @@
581587
<version>1.7</version>
582588
<scope>test</scope>
583589
</dependency>
590+
<dependency>
591+
<groupId>com.sun.mail</groupId>
592+
<artifactId>javax.mail</artifactId>
593+
<version>1.6.2</version>
594+
<scope>test</scope>
595+
</dependency>
584596
<!-- needed to override the embedded commons.osgi in org.apache.sling.models.impl -->
585597
<dependency>
586598
<groupId>org.apache.sling</groupId>
@@ -732,7 +744,6 @@
732744
<dependency>
733745
<groupId>com.adobe.aem</groupId>
734746
<artifactId>uber-jar</artifactId>
735-
<classifier>apis</classifier>
736747
<scope>provided</scope>
737748
</dependency>
738749
</dependencies>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@
2626
import com.adobe.cq.dam.cfm.VariationTemplate;
2727
import com.adobe.cq.dam.cfm.VersionDef;
2828
import com.adobe.cq.dam.cfm.VersionedContent;
29+
30+
import java.util.Calendar;
2931
import java.util.HashMap;
3032
import java.util.Iterator;
3133
import java.util.Map;
3234
import java.util.stream.Collectors;
3335
import javax.annotation.CheckForNull;
3436
import javax.annotation.Nonnull;
3537
import org.apache.sling.api.resource.Resource;
38+
import org.jetbrains.annotations.NotNull;
3639

3740
/**
3841
* Incomplete mock that provides just enough for basic testing
@@ -156,5 +159,11 @@ public <AdapterType> AdapterType adaptTo(@Nonnull Class<AdapterType> aClass) {
156159
@Override
157160
public void removeVariation(String name) throws ContentFragmentException {
158161
}
162+
163+
@NotNull
164+
@Override
165+
public Calendar getLastModifiedDeep() throws ContentFragmentException {
166+
return Calendar.getInstance();
167+
}
159168

160169
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.adobe.cq.dam.cfm.DataType;
2121
import org.jetbrains.annotations.NotNull;
22+
import org.jetbrains.annotations.Nullable;
2223

2324
public class MockDataType implements DataType {
2425

@@ -38,4 +39,14 @@ public String getTypeString() {
3839
public boolean isMultiValue() {
3940
return false;
4041
}
42+
43+
@Override
44+
public @Nullable String getSemanticType() {
45+
return type;
46+
}
47+
48+
@Override
49+
public @NotNull String getValueType() {
50+
return type;
51+
}
4152
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,5 +211,10 @@ public void stopRecording(final String s) {
211211
public String getPath() {
212212
return WORKFLOW_PACKAGE_PATH;
213213
}
214+
215+
@Override
216+
public boolean hasNode(String arg0) {
217+
return false;
218+
}
214219
};
215220
}

‎oakpal-checks/pom.xml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</goals>
178178
<configuration>
179179
<defaults>
180-
<aemVersion>6.4</aemVersion>
180+
<aemVersion>6.5</aemVersion>
181181
</defaults>
182182
<source>${pom.basedir}/src/main/script/ExtractBundleInfo.groovy</source>
183183
</configuration>
@@ -194,51 +194,6 @@
194194
</plugins>
195195
</build>
196196
</profile>
197-
<profile>
198-
<id>webster-aem64</id>
199-
<!-- to be able to execute oakpal:webster with this profile, first create a profile with the same name in
200-
your settings.xml file that sets a "webster.repositoryHome" property with an absolute path to the
201-
crx-quickstart/repository directory of a locally-installed AEM 6.4 server. -->
202-
<build>
203-
<plugins>
204-
<plugin>
205-
<groupId>net.adamcin.oakpal</groupId>
206-
<artifactId>oakpal-maven-plugin</artifactId>
207-
<configuration>
208-
<websterTargets>
209-
<checklist>
210-
<file>src/main/resources/OAKPAL-INF/checklist/content-class-aem64.json</file>
211-
<config>
212-
<jcrNamespaces>
213-
<namespace>
214-
<prefix>granite</prefix>
215-
<uri>http://www.adobe.com/jcr/granite/1.0</uri>
216-
</namespace>
217-
</jcrNamespaces>
218-
<selectNodeTypes>
219-
<type>granite:PublicArea</type>
220-
<type>granite:FinalArea</type>
221-
<type>granite:InternalArea</type>
222-
<type>granite:AbstractArea</type>
223-
</selectNodeTypes>
224-
<nodeTypeFilters>
225-
<filter>
226-
<type>exclude</type>
227-
<pattern>nt:file</pattern>
228-
</filter>
229-
<filter>
230-
<type>exclude</type>
231-
<pattern>nt:resource</pattern>
232-
</filter>
233-
</nodeTypeFilters>
234-
</config>
235-
</checklist>
236-
</websterTargets>
237-
</configuration>
238-
</plugin>
239-
</plugins>
240-
</build>
241-
</profile>
242197
<profile>
243198
<id>webster-aem65</id>
244199
<!-- to be able to execute oakpal:webster with this profile, first create a profile with the same name in
@@ -294,7 +249,6 @@
294249
<dependency>
295250
<groupId>org.jetbrains</groupId>
296251
<artifactId>annotations</artifactId>
297-
<version>18.0.0</version>
298252
<scope>provided</scope>
299253
</dependency>
300254
<dependency>

‎oakpal-checks/src/main/java/com/adobe/acs/commons/oakpal/checks/ImportedPackages.java

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,6 @@
1717
*/
1818
package com.adobe.acs.commons.oakpal.checks;
1919

20-
import com.google.common.collect.ImmutableMap;
21-
import net.adamcin.oakpal.api.PathAction;
22-
import net.adamcin.oakpal.api.ProgressCheck;
23-
import net.adamcin.oakpal.api.ProgressCheckFactory;
24-
import net.adamcin.oakpal.api.Severity;
25-
import net.adamcin.oakpal.api.SimpleProgressCheckFactoryCheck;
26-
import org.apache.jackrabbit.JcrConstants;
27-
import org.apache.jackrabbit.commons.JcrUtils;
28-
import org.apache.jackrabbit.vault.fs.config.MetaInf;
29-
import org.apache.jackrabbit.vault.packaging.PackageId;
30-
import org.apache.jackrabbit.vault.packaging.PackageProperties;
31-
import org.jetbrains.annotations.NotNull;
32-
import org.osgi.framework.Version;
33-
import org.osgi.framework.VersionRange;
34-
35-
import javax.jcr.Node;
36-
import javax.jcr.RepositoryException;
37-
import javax.jcr.Session;
38-
import javax.json.Json;
39-
import javax.json.JsonArray;
40-
import javax.json.JsonObject;
41-
import javax.json.JsonReader;
42-
import javax.json.JsonString;
4320
import java.io.IOException;
4421
import java.io.InputStream;
4522
import java.util.AbstractMap;
@@ -58,10 +35,33 @@
5835
import java.util.zip.ZipEntry;
5936
import java.util.zip.ZipInputStream;
6037

38+
import javax.jcr.Node;
39+
import javax.jcr.RepositoryException;
40+
import javax.jcr.Session;
41+
import javax.json.Json;
42+
import javax.json.JsonArray;
43+
import javax.json.JsonObject;
44+
import javax.json.JsonReader;
45+
import javax.json.JsonString;
46+
47+
import org.apache.jackrabbit.JcrConstants;
48+
import org.apache.jackrabbit.commons.JcrUtils;
49+
import org.apache.jackrabbit.vault.fs.config.MetaInf;
50+
import org.apache.jackrabbit.vault.packaging.PackageId;
51+
import org.apache.jackrabbit.vault.packaging.PackageProperties;
52+
import org.jetbrains.annotations.NotNull;
53+
import org.osgi.framework.Version;
54+
import org.osgi.framework.VersionRange;
55+
56+
import net.adamcin.oakpal.api.ProgressCheck;
57+
import net.adamcin.oakpal.api.ProgressCheckFactory;
58+
import net.adamcin.oakpal.api.Severity;
59+
import net.adamcin.oakpal.api.SimpleProgressCheckFactoryCheck;
60+
6161
public final class ImportedPackages implements ProgressCheckFactory {
6262

6363
private static final String CONFIG_VERSION = "aemVersion";
64-
private static final List<String> DEFAULT_VERSIONS = Arrays.asList("6.4");
64+
private static final List<String> DEFAULT_VERSIONS = Arrays.asList("6.5");
6565

6666

6767
@Override
@@ -81,14 +81,14 @@ public ProgressCheck newInstance(JsonObject config) throws Exception {
8181
}
8282
try (JsonReader reader = Json.createReader(inputStream)) {
8383
JsonObject packageDefinitions = reader.readObject();
84-
ImmutableMap.Builder<String, Set<Version>> builder = ImmutableMap.builder();
84+
Map<String, Set<Version>> exportedPackages = new HashMap<>();
8585
packageDefinitions.keySet().forEach(key -> {
86-
builder.put(key, packageDefinitions.getJsonArray(key).stream().map(v -> {
86+
exportedPackages.put(key, packageDefinitions.getJsonArray(key).stream().map(v -> {
8787
String str = ((JsonString) v).getString();
8888
return new Version(str);
8989
}).collect(Collectors.toSet()));
9090
});
91-
return new AbstractMap.SimpleEntry<>(version, builder.build());
91+
return new AbstractMap.SimpleEntry<>(version, exportedPackages);
9292
}
9393
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
9494

@@ -104,16 +104,15 @@ static final class Check extends SimpleProgressCheckFactoryCheck<ImportedPackage
104104

105105
Check(Map<String, Map<String, Set<Version>>> exportedPackagesByVersion) {
106106
super(ImportedPackages.class);
107-
ImmutableMap.Builder<String, Map<String, Set<Version>>> builder = ImmutableMap.builder();
107+
this.exportedPackagesByVersion = new HashMap<>();
108108
exportedPackagesByVersion.forEach((version, exportedPackages) -> {
109109
Map<String, Set<Version>> mutableExports = new HashMap<>();
110110
exportedPackages.forEach((packageName, versions) -> {
111111
mutableExports.put(packageName, new HashSet<>(versions));
112112
});
113-
builder.put(version, mutableExports);
113+
this.exportedPackagesByVersion.put(version, mutableExports);
114114
});
115115

116-
this.exportedPackagesByVersion = builder.build();
117116
}
118117

119118
@Override

0 commit comments

Comments
 (0)