diff --git a/.gitignore b/.gitignore index 6fe33307d0..42cc183311 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,7 @@ bundle/mockserver.log .java-version # Maven versions plugin -pom.xml.versionsBackup \ No newline at end of file +pom.xml.versionsBackup + +# Qlty plugin folder +/.qlty/ diff --git a/CHANGELOG.md b/CHANGELOG.md index b683c63603..c36cadb265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) ## Unreleased ([details][unreleased changes details]) +- #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 ### Fixed + - #3473 - Fix Broken Styling when the notification is active - #3474 - Fixed reintroduction of dependency to outdated Apache Commons Collections 3 @@ -34,11 +42,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com) ## 6.9.0 - 2024-10-29 ### Fixed + - #3459 - Top level properties in parameterized include are now respected. - #3460 - Fixes issue where double parameters were not working for the parameterized include - #3443 - Content Sync: don't drill down into content tree if recursion is off ### Changed + - #3385 Made nesting parameterized includes inside a multi-field (ignored resource types) possible ## 6.8.0 - 2024-10-17 diff --git a/all/pom.xml b/all/pom.xml index a1b79318b3..ed7edac73e 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/bundle-cloud/pom.xml b/bundle-cloud/pom.xml index 1b60a6d39b..01c9534ac2 100644 --- a/bundle-cloud/pom.xml +++ b/bundle-cloud/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/bundle-onprem/pom.xml b/bundle-onprem/pom.xml index 5604477d36..a6db518ee4 100644 --- a/bundle-onprem/pom.xml +++ b/bundle-onprem/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/bundle/pom.xml b/bundle/pom.xml index 23ea706103..56be916ea2 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/RewriteMapServlet.java b/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/RewriteMapServlet.java new file mode 100644 index 0000000000..b1a1ca345e --- /dev/null +++ b/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/RewriteMapServlet.java @@ -0,0 +1,83 @@ +/*- + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2013 - 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ +package com.adobe.acs.commons.redirects.servlets; + +import com.adobe.acs.commons.redirects.filter.RedirectFilter; +import com.adobe.acs.commons.redirects.models.RedirectRule; +import org.apache.http.entity.ContentType; +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.servlets.SlingSafeMethodsServlet; +import org.osgi.service.component.annotations.Component; + +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collection; + +import static com.adobe.acs.commons.redirects.servlets.CreateRedirectConfigurationServlet.REDIRECTS_RESOURCE_PATH; + + +/** + * Servlet for generating an Apache RewriteMap text file to use with + * he Pipeline-free URL Redirects feature in AEM as a Cloud Service + * + * Usage: http://localhost:4502/conf/my-site/settings/redirects.txt + * To filter by status code: http://localhost:4502/conf/my-site/settings/redirects.301.txt + * + * See https://experienceleague.adobe.com/en/docs/experience-manager-cloud-service/content/implementing/content-delivery/pipeline-free-url-redirects + * + */ +@Component(service = Servlet.class, property = { + "sling.servlet.methods=GET", + "sling.servlet.extensions=txt", + "sling.servlet.resourceTypes=" + REDIRECTS_RESOURCE_PATH +}) +public class RewriteMapServlet extends SlingSafeMethodsServlet { + + private static final long serialVersionUID = -3564475196678277711L; + + @Override + @SuppressWarnings("java:S3457") + protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) + throws ServletException, IOException { + response.setContentType(ContentType.TEXT_PLAIN.getMimeType()); + + String[] selectors = request.getRequestPathInfo().getSelectors(); + int statusCode = 0; + if(selectors != null && selectors.length > 0) { + statusCode = Integer.parseInt(selectors[0]); + } + Collection rules = RedirectFilter.getRules(request.getResource()); + PrintWriter out = response.getWriter(); + out.printf("# %s Redirects\n", statusCode == 0 ? "All" : "" + statusCode); + for (RedirectRule rule : rules) { + if(statusCode != 0 && rule.getStatusCode() != statusCode) { + continue; + } + String note = rule.getNote(); + if(note != null && !note.isEmpty()) { + out.printf("# %s\n", note); + } + out.printf("%s %s\n", rule.getSource(), rule.getTarget()); + } + } +} diff --git a/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/package-info.java b/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/package-info.java index 29b37a5407..7185a8e113 100755 --- a/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/package-info.java +++ b/bundle/src/main/java/com/adobe/acs/commons/redirects/servlets/package-info.java @@ -15,5 +15,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@org.osgi.annotation.versioning.Version("1.1.0") +@org.osgi.annotation.versioning.Version("1.2.0") package com.adobe.acs.commons.redirects.servlets; diff --git a/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/CopySitesPublishUrlFeature.java b/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/CopySitesPublishUrlFeature.java new file mode 100644 index 0000000000..a73cbaa338 --- /dev/null +++ b/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/CopySitesPublishUrlFeature.java @@ -0,0 +1,74 @@ +/*- + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2013 - 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +package com.adobe.acs.commons.wcm.impl; + +import org.apache.sling.featureflags.ExecutionContext; +import org.apache.sling.featureflags.Feature; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.metatype.annotations.AttributeDefinition; +import org.osgi.service.metatype.annotations.Designate; +import org.osgi.service.metatype.annotations.ObjectClassDefinition; + + +/** + * OSGi Feature flag to enable or disable the copy publish URLs dropdown field in the Sites Editor. + */ +@Component(service = Feature.class) +@Designate(ocd = CopySitesPublishUrlFeature.Config.class) +public class CopySitesPublishUrlFeature implements Feature { + static final String FEATURE_FLAG_PID = "com.adobe.acs.commons.wcm.impl.copysitespublishurlfeature.feature.flag"; + + private Config config; + + @ObjectClassDefinition( + name = "ACS AEM Commons - Copy Sites Publish URL Feature Flag", + description = "ACS Commons feature flag enables or disables the copy publish url dropdown field in the Sites Editor." + ) + @interface Config { + @AttributeDefinition( + name = "Enable", + description = "Check to enable the AEM Sites Copy Publish URL feature." + ) + boolean feature_flag_active_status() default false; + } + + @SuppressWarnings("ClassEscapesDefinedScope") + @Activate + protected final void activate(Config config) { + this.config = config; + } + + @Override + public String getName() { + return FEATURE_FLAG_PID; + } + + @Override + public String getDescription() { + return "ACS AEM Commons feature flag enables or disables the copy publish URL dropdown field in the Sites Editor."; + } + + @Override + public boolean isEnabled(ExecutionContext executionContext) { + return config.feature_flag_active_status(); + } +} \ No newline at end of file diff --git a/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/PublishUrlServlet.java b/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/PublishUrlServlet.java new file mode 100644 index 0000000000..9a6c20c945 --- /dev/null +++ b/bundle/src/main/java/com/adobe/acs/commons/wcm/impl/PublishUrlServlet.java @@ -0,0 +1,116 @@ +/*- + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2013 - 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +package com.adobe.acs.commons.wcm.impl; + +import com.day.cq.commons.Externalizer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.commons.lang3.StringUtils; +import org.apache.sling.api.SlingHttpServletRequest; +import org.apache.sling.api.SlingHttpServletResponse; +import org.apache.sling.api.resource.ResourceResolver; +import org.apache.sling.api.servlets.HttpConstants; +import org.apache.sling.api.servlets.SlingSafeMethodsServlet; +import org.apache.sling.servlets.annotations.SlingServletResourceTypes; +import org.jetbrains.annotations.NotNull; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.ConfigurationPolicy; +import org.osgi.service.metatype.annotations.AttributeDefinition; +import org.osgi.service.metatype.annotations.AttributeType; +import org.osgi.service.metatype.annotations.Designate; +import org.osgi.service.metatype.annotations.ObjectClassDefinition; + +import javax.servlet.Servlet; +import java.io.IOException; +import java.io.Serializable; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; + +/** + * This servlet generates a JSON response with the externalized URLs for the given path using configured keys in its + * configuration. They keys need to match the environment keys configured in the Externalizer configuration. The servlet + * uses Externalizer service to generate the externalized URLs via Externalizer.externalLink() method. The response is + * in format {"Author": "Author URL", "Publish": "Publish URL", ...}. + */ +@Component(service = Servlet.class, configurationPolicy = ConfigurationPolicy.REQUIRE) +@SlingServletResourceTypes( + resourceTypes = PublishUrlServlet.RESOURCE_TYPE, + methods = HttpConstants.METHOD_GET, + extensions = PublishUrlServlet.JSON_EXTENSION +) +@Designate(ocd = PublishUrlServlet.PublishUrlServletConfig.class) +public class PublishUrlServlet extends SlingSafeMethodsServlet implements Serializable { + + private static final long serialVersionUID = 1L; + protected static final String RESOURCE_TYPE = "acs-commons/components/utilities/publish-url"; + protected static final String JSON_EXTENSION = "json"; + private static final String PATH = "path"; + private static final String JSON_TYPE = "application/json"; + private String[] externalizerKeys; + + @Activate + protected void activate(final PublishUrlServletConfig config) { + this.externalizerKeys = config.externalizerKeys(); + } + + /** + * Gets the path parameter from the request and generates the externalized URLs for the given path using the + * Externalizer service. Writes the JSON response with the externalized URLs to the response. + * + * @param request SlingHttpServletRequest + * @param response SlingHttpServletResponse + * @throws IOException if response.getWriter() fails + */ + @Override + protected void doGet(SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response) throws IOException { + String path = request.getParameter(PATH); + ResourceResolver resolver = request.getResourceResolver(); + Externalizer externalizer = resolver.adaptTo(Externalizer.class); + ObjectMapper mapper = new ObjectMapper(); + ObjectNode jsonResponse = mapper.createObjectNode(); + + if (externalizer != null) { + Arrays.asList(externalizerKeys).forEach(key -> { + String capitalizedKey = StringUtils.capitalize(key); + String externalLink = externalizer.externalLink(resolver, key, request.getScheme(), path); + jsonResponse.put(capitalizedKey, externalLink); + }); + } + + response.setContentType(JSON_TYPE); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + response.getWriter().write(jsonResponse.toString()); + } + + @ObjectClassDefinition( + name = "ACS AEM Commons - Publish URL Servlet", + description = "Servlet that accepts a GET request with a resource path in the path parameter, and returns a JSON object of the externalized URLs for the path." + ) + public @interface PublishUrlServletConfig { + @AttributeDefinition( + name = "Externalizer environment keys", + description = "Keys must match the environment keys configured in the AEM Externalizer OSGi configuration.", + type = AttributeType.STRING + ) + String[] externalizerKeys() default {}; + } +} diff --git a/bundle/src/test/java/com/adobe/acs/commons/redirects/servlets/RewriteMapServletTest.java b/bundle/src/test/java/com/adobe/acs/commons/redirects/servlets/RewriteMapServletTest.java new file mode 100755 index 0000000000..fd7bf8a1c1 --- /dev/null +++ b/bundle/src/test/java/com/adobe/acs/commons/redirects/servlets/RewriteMapServletTest.java @@ -0,0 +1,137 @@ +/*- + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2013 - 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ +package com.adobe.acs.commons.redirects.servlets; + +import com.adobe.acs.commons.redirects.RedirectResourceBuilder; +import org.apache.http.entity.ContentType; +import org.apache.sling.api.resource.PersistenceException; +import org.apache.sling.api.resource.Resource; +import org.apache.sling.testing.mock.sling.ResourceResolverType; +import org.apache.sling.testing.mock.sling.junit.SlingContext; +import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest; +import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import javax.servlet.ServletException; +import java.io.IOException; +import java.util.Calendar; + +import static org.junit.Assert.assertEquals; + +/** + * @author Yegor Kozlov + */ +public class RewriteMapServletTest { + @Rule + public SlingContext context = new SlingContext(ResourceResolverType.RESOURCERESOLVER_MOCK); + + private RewriteMapServlet servlet; + private final String redirectStoragePath = "/conf/acs-commons/redirects"; + + @Before + public void setUp() throws PersistenceException { + new RedirectResourceBuilder(context, redirectStoragePath) + .setSource("/content/one") + .setTarget("/content/two") + .setStatusCode(302) + .setUntilDate(new Calendar.Builder().setDate(2022, 9, 9).build()) + .setEffectiveFrom(new Calendar.Builder().setDate(2025, 2, 2).build()) + .setNotes("note-1") + .setEvaluateURI(true) + .setContextPrefixIgnored(true) + .setTagIds(new String[]{"redirects:tag1"}) + .setCreatedBy("john.doe") + .setModifiedBy("jane.doe") + .setCreated(new Calendar.Builder().setDate(1974, 1, 16).build()) + .setModified(new Calendar.Builder().setDate(1976, 10, 22).build()) + .build(); + new RedirectResourceBuilder(context, redirectStoragePath) + .setSource("/content/three") + .setTarget("/content/four") + .setStatusCode(301) + .setTagIds(new String[]{"redirects:tag2"}) + .setModifiedBy("john.doe") + .build(); + + Resource redirects = context.resourceResolver().getResource(redirectStoragePath); + context.request().setResource(redirects); + servlet = new RewriteMapServlet(); + } + + + @Test + public void testGet() throws ServletException, IOException { + MockSlingHttpServletRequest request = context.request(); + MockSlingHttpServletResponse response = context.response(); + + servlet.doGet(request, response); + + assertEquals(ContentType.TEXT_PLAIN.getMimeType(), response.getContentType()); + String[] lines = response.getOutputAsString().split("\n"); + assertEquals(4, lines.length); // header + 2 rules + assertEquals("# All Redirects", lines[0]); + assertEquals("# note-1", lines[1]); + + String[] rule1 = lines[2].split(" "); + assertEquals("/content/one", rule1[0]); + assertEquals("/content/two", rule1[1]); + + String[] rule2 = lines[3].split(" "); + assertEquals("/content/three", rule2[0]); + assertEquals("/content/four", rule2[1]); + } + + @Test + public void test301Selector() throws ServletException, IOException { + MockSlingHttpServletRequest request = context.request(); + MockSlingHttpServletResponse response = context.response(); + + context.requestPathInfo().setSelectorString("301"); + servlet.doGet(request, response); + + assertEquals(ContentType.TEXT_PLAIN.getMimeType(), response.getContentType()); + String[] lines = response.getOutputAsString().split("\n"); + assertEquals(2, lines.length); // header + 1 rule + assertEquals("# 301 Redirects", lines[0]); + String[] rule1 = lines[1].split(" "); + assertEquals("/content/three", rule1[0]); + assertEquals("/content/four", rule1[1]); + } + + @Test + public void test302Selector() throws ServletException, IOException { + MockSlingHttpServletRequest request = context.request(); + MockSlingHttpServletResponse response = context.response(); + + context.requestPathInfo().setSelectorString("302"); + servlet.doGet(request, response); + + assertEquals(ContentType.TEXT_PLAIN.getMimeType(), response.getContentType()); + String[] lines = response.getOutputAsString().split("\n"); + assertEquals(3, lines.length); // header + notes + 1st rule + assertEquals("# 302 Redirects", lines[0]); + + String[] rule1 = lines[2].split(" "); + assertEquals("/content/one", rule1[0]); + assertEquals("/content/two", rule1[1]); + } +} \ No newline at end of file diff --git a/bundle/src/test/java/com/adobe/acs/commons/wcm/impl/CopySitesPublishUrlFeatureTest.java b/bundle/src/test/java/com/adobe/acs/commons/wcm/impl/CopySitesPublishUrlFeatureTest.java new file mode 100644 index 0000000000..5b0a97b07a --- /dev/null +++ b/bundle/src/test/java/com/adobe/acs/commons/wcm/impl/CopySitesPublishUrlFeatureTest.java @@ -0,0 +1,66 @@ +/*- + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +package com.adobe.acs.commons.wcm.impl; + +import io.wcm.testing.mock.aem.junit5.AemContextExtension; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +@ExtendWith({MockitoExtension.class, AemContextExtension.class}) +class CopySitesPublishUrlFeatureTest { + + + @InjectMocks + CopySitesPublishUrlFeature copySitesPublishUrlFeature = new CopySitesPublishUrlFeature(); + @Mock + CopySitesPublishUrlFeature.Config config; + + @BeforeEach + void setUp() { + copySitesPublishUrlFeature.activate(config); + } + + @Test + void testGetName() { + assertEquals("com.adobe.acs.commons.wcm.impl.copysitespublishurlfeature.feature.flag", + copySitesPublishUrlFeature.getName()); + } + + @Test + void testGetDescription() { + assertEquals("ACS AEM Commons feature flag enables or disables the copy publish URL dropdown field in the Sites Editor.", + copySitesPublishUrlFeature.getDescription()); + } + + @Test + void testIsEnabled() { + when(config.feature_flag_active_status()).thenReturn(true); + assertTrue(copySitesPublishUrlFeature.isEnabled(null)); + } + +} \ No newline at end of file diff --git a/bundle/src/test/java/com/adobe/acs/commons/wcm/impl/PublishUrlServletTest.java b/bundle/src/test/java/com/adobe/acs/commons/wcm/impl/PublishUrlServletTest.java new file mode 100644 index 0000000000..561c56f5f8 --- /dev/null +++ b/bundle/src/test/java/com/adobe/acs/commons/wcm/impl/PublishUrlServletTest.java @@ -0,0 +1,81 @@ +/*- + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +package com.adobe.acs.commons.wcm.impl; + +import com.day.cq.commons.Externalizer; +import io.wcm.testing.mock.aem.junit5.AemContext; +import io.wcm.testing.mock.aem.junit5.AemContextExtension; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.Servlet; +import org.apache.commons.io.IOUtils; +import org.apache.sling.api.resource.ResourceResolver; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +@ExtendWith({MockitoExtension.class, AemContextExtension.class}) +class PublishUrlServletTest { + + private final AemContext ctx = new AemContext(); + + @Mock + Externalizer externalizer; + + @Test + void testDoGet() throws IOException { + ctx.registerAdapter(ResourceResolver.class, Externalizer.class, externalizer); + + Map params = new HashMap<>(); + params.put("externalizerKeys", new String[]{"local", "author", "publish", "dispatcher"}); + + Map requestParams = new HashMap<>(); + requestParams.put("path", "/content/we-retail/us/en/experience"); + ctx.request().setParameterMap(requestParams); + + when(externalizer.externalLink(any(ResourceResolver.class), any(String.class), any(String.class), any(String.class))) + .thenReturn("http://localhost:4502/content/we-retail/us/en/experience.html") + .thenReturn("https://aem.author.someorganization.com/content/we-retail/us/en/experience.html") + .thenReturn("https://aem.publish.someorganization.com/content/we-retail/us/en/experience.html") + .thenReturn("https://www.someorganization.com/experience"); + + ctx.registerInjectActivateService(new PublishUrlServlet(), params); + + PublishUrlServlet servlet = (PublishUrlServlet) ctx.getServices(Servlet.class, + "(sling.servlet.resourceTypes=acs-commons/components/utilities/publish-url)")[0]; + + servlet.doGet(ctx.request(), ctx.response()); + + try (InputStream inputStream = getClass().getResourceAsStream("PublishUrlServletResponse.json")) { + assert inputStream != null; + String expectedJson = IOUtils.toString(inputStream, StandardCharsets.UTF_8); + assertEquals(expectedJson, ctx.response().getOutputAsString()); + } + } +} \ No newline at end of file diff --git a/bundle/src/test/resources/com/adobe/acs/commons/wcm/impl/PublishUrlServletResponse.json b/bundle/src/test/resources/com/adobe/acs/commons/wcm/impl/PublishUrlServletResponse.json new file mode 100644 index 0000000000..b058b23077 --- /dev/null +++ b/bundle/src/test/resources/com/adobe/acs/commons/wcm/impl/PublishUrlServletResponse.json @@ -0,0 +1 @@ +{"Local":"http://localhost:4502/content/we-retail/us/en/experience.html","Author":"https://aem.author.someorganization.com/content/we-retail/us/en/experience.html","Publish":"https://aem.publish.someorganization.com/content/we-retail/us/en/experience.html","Dispatcher":"https://www.someorganization.com/experience"} \ No newline at end of file diff --git a/oakpal-checks/pom.xml b/oakpal-checks/pom.xml index af51347817..049977ac3f 100644 --- a/oakpal-checks/pom.xml +++ b/oakpal-checks/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 518ad9285e..09ce1a6b61 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT pom ACS AEM Commons - Reactor Project diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 455b2730da..9e69ad8891 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml index 55c9d3cc4c..a587f29c5b 100644 --- a/ui.apps/src/main/content/META-INF/vault/filter.xml +++ b/ui.apps/src/main/content/META-INF/vault/filter.xml @@ -2,7 +2,7 @@ diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/css.txt b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/css.txt new file mode 100644 index 0000000000..f3795dee3a --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/css.txt @@ -0,0 +1,3 @@ +#base=. + +sites-copy-publish-url.css \ No newline at end of file diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/js.txt b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/js.txt new file mode 100644 index 0000000000..d05cba20c5 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/js.txt @@ -0,0 +1,3 @@ +#base=. + +sites-copy-publish-url.js \ No newline at end of file diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/sites-copy-publish-url.css b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/sites-copy-publish-url.css new file mode 100644 index 0000000000..c65056ae1c --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/sites-copy-publish-url.css @@ -0,0 +1,62 @@ +/* + * #%L + * ACS AEM Commons Package + * %% + * Copyright (C) 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +#acs-aem-commons__aem-sites-copy-publish-url .coral3-Dialog-wrapper { + width: 1000px !important; + left: 50% !important; + margin-left: -500px !important; +} + +.acs-aem-commons__aem-sites-copy-publish-url__text { + min-width: 30rem; + min-height: 5rem; + padding: 1rem; + font-size: 1.1rem; + line-height: 1.25rem; + border-color: #ccc; + } + +.acs-aem-commons__aem-sites-copy-publish-url__text--failure { + padding: 1rem; + font-size: 1.1rem; + text-align: center; + color: #EA7B6F; + min-width: 30rem; +} + +.acs-aem-commons__aem-sites-copy-publish-url__group { + display: flex; + align-items: center; + margin-bottom: 1rem; +} +.acs-aem-commons__aem-sites-copy-publish-url__group .coral-Form-field { + padding: .6rem; + width: calc(100% - 170px) !important; +} + +.acs-aem-commons__aem-sites-copy-publish-url__group .coral-Form-field, +.acs-aem-commons__aem-sites-copy-publish-url__group .acs-aem-commons__aem-sites-copy-publish-url__copy-cmd { + margin-right: 10px; +} + +.acs-aem-commons__aem-sites-copy-publish-url__group .coral-Form-field, +.acs-aem-commons__aem-sites-copy-publish-url__group .acs-aem-commons__aem-sites-copy-publish-url__copy-cmd { + margin-right: 10px; +} \ No newline at end of file diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/sites-copy-publish-url.js b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/sites-copy-publish-url.js new file mode 100644 index 0000000000..6116bfad3b --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/authoring/sites-copy-publishurl/sites-copy-publish-url.js @@ -0,0 +1,103 @@ +/* + * #% + * ACS AEM Commons Package + * %% + * Copyright (C) 2024 Adobe + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +(function(document, $) { + "use strict"; + + var GRANITE_ID = "acs-aem-commons__aem-sites-copy-publish-url"; + + $( document ).one('foundation-toggleable-show', '#' + GRANITE_ID, function(e) { + var modalBody = $(e.target).find('coral-dialog-content'), + failureMessage = Granite.I18n.get('An error occurred determining the page\'s publish URLs.'), + missingConfigMessage = Granite.I18n.get('Missing configs for the Publish URL servlet or Externalizer.'), + publishUrl = Granite.HTTP.externalize('/apps/acs-commons/components/utilities/sites-publish-url.json'), + path = $(e.target).data('assetpath'); + + var result = + Granite.$.ajax({ + type : "GET", + //async : false, + dataType : 'text', + data : { + path : path + }, + url : publishUrl + }); + result.done(function(text) { + var jsonResponse = JSON.parse(text); + var content = ''; + var labelWidth = 0; + var inputWidth = 0; + if (jsonResponse.size === 0) { + modalBody.html('

' + missingConfigMessage + '

'); + return; + } + + Object.keys(jsonResponse).forEach(function(key) { + if (key.length > labelWidth) { + labelWidth = key.length; + } + if (jsonResponse[key].length > inputWidth) { + inputWidth = jsonResponse[key].length; + } + }); + inputWidth = inputWidth > 0 ? inputWidth - 10 : 0; + + Object.keys(jsonResponse).forEach(function(key) { + content += '
' + + '' + + '' + + '' + + '
'; + }); + + // if this is loaded via the Dailog's extra client libs, the CSS is lost so it has to be re-added here. + content += ''; + modalBody.html(content); + + setTimeout(function() { + window.dispatchEvent(new Event('resize')); + }, 50); + + document.querySelectorAll('.acs-aem-commons__aem-sites-copy-publish-url__copy-cmd').forEach(function(button) { + button.addEventListener('click', function() { + var key = this.getAttribute('data-copy-target'); + var inputField = this.previousElementSibling; + inputField.select(); + document.execCommand("copy"); + }); + }); + }); + + result.fail(function() { + modalBody.html('

' + failureMessage + '

'); + }); + }); + + $( document ).one('foundation-contentloaded', function(e) { + if (!document.execCommand && !document.queryCommandSupported) { + $('.acs-aem-commons__aem-sites-copy-publish-url__copy-cmd').hide(); + } + if (!document.queryCommandSupported('copy')) { + $('.acs-aem-commons__aem-sites-copy-publish-url__copy-cmd').hide(); + } + }); + +})(document, Granite.$); diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/genericlist/body.jsp b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/genericlist/body.jsp index ce24b51802..fa7310b4dd 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/genericlist/body.jsp +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/genericlist/body.jsp @@ -17,7 +17,7 @@ limitations under the License. #L% --%> -<%@page import="com.adobe.acs.commons.genericlists.GenericList, com.adobe.acs.commons.mcp.form.impl.GeneratedDialogWrapper"%> +<%@page import="com.adobe.acs.commons.genericlists.GenericList, com.adobe.acs.commons.mcp.form.GeneratedDialogWrapper"%> <%@include file="/libs/foundation/global.jsp"%> <% diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/sites-publish-url/.content.xml b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/sites-publish-url/.content.xml new file mode 100644 index 0000000000..450e0c0d05 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/sites-publish-url/.content.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/.content.xml new file mode 100644 index 0000000000..333925bb94 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/.content.xml new file mode 100644 index 0000000000..333925bb94 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/.content.xml new file mode 100644 index 0000000000..0aed9288ef --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/.content.xml @@ -0,0 +1,22 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/.content.xml new file mode 100644 index 0000000000..fa54b73927 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/.content.xml @@ -0,0 +1,22 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/.content.xml new file mode 100644 index 0000000000..ca1b5b0f95 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/.content.xml @@ -0,0 +1,22 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/.content.xml new file mode 100644 index 0000000000..ca1b5b0f95 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/.content.xml @@ -0,0 +1,22 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/acs-commons_copy-publish-url-dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/acs-commons_copy-publish-url-dialog/.content.xml new file mode 100644 index 0000000000..34e7d5350c --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/acs-commons_copy-publish-url-dialog/.content.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/items/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/items/.content.xml new file mode 100644 index 0000000000..03441a7f68 --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/items/.content.xml @@ -0,0 +1,20 @@ + + + + diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/items/acs-commons_copy-publish-url/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/items/acs-commons_copy-publish-url/.content.xml new file mode 100644 index 0000000000..cb1c22571c --- /dev/null +++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/editor/_jcr_content/content/items/content/header/items/headerbar/items/pageinfopopover/items/list/items/acs-commons_copy-publish-url/.content.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + diff --git a/ui.config/pom.xml b/ui.config/pom.xml index 3b3aa08ea3..1e70526e75 100644 --- a/ui.config/pom.xml +++ b/ui.config/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT diff --git a/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config index 53258e42bd..4ecaad1997 100644 --- a/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config +++ b/ui.config/src/main/content/jcr_root/apps/acs-commons/config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-acs-commons-author.config @@ -74,5 +74,8 @@ set ACL for acs-commons-file-fetch-service allow jcr:read,jcr:versionManagement,rep:write,crx:replicate on /content/dam allow jcr:read on / end + +# Copy Publish URL - AEM Sites Page Editor overlay +create path (nt:unstructured) /apps/wcm(nt:folder)/core(nt:folder)/content(sling:Folder)/editor(cq:Page)/jcr:content/content/items(sling:OrderedFolder)/content(sling:OrderedFolder)/header/items/headerbar/items/pageinfopopover/items/list/items " ] \ No newline at end of file diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 8188e9cb80..cf2fb0e777 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -25,7 +25,7 @@ com.adobe.acs acs-aem-commons - 6.9.7-SNAPSHOT + 6.10.0-SNAPSHOT