diff --git a/changes.xml b/changes.xml index fecd3e3..9cb090b 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,15 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Remove deprecated functionality. + + + Switch to AEM 6.5.17 as minimum version. + + + Switch to Java 11 as minimum version. diff --git a/pom.xml b/pom.xml index c4c5562..ec21eeb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ io.wcm io.wcm.parent_toplevel - 2.2.8 + 2.3.0-SNAPSHOT io.wcm io.wcm.handler.commons - 1.5.1-SNAPSHOT + 2.0.0-SNAPSHOT jar Handler Commons @@ -81,19 +81,19 @@ io.wcm io.wcm.wcm.commons - 1.9.0 + 1.10.0 compile io.wcm io.wcm.sling.commons - 1.4.0 + 1.6.4 compile io.wcm io.wcm.wcm.ui.granite - 1.8.0 + 1.10.0 compile @@ -130,7 +130,7 @@ io.wcm io.wcm.testing.aem-mock.junit5 - 5.4.2 + 5.4.4 test @@ -142,7 +142,7 @@ org.apache.sling org.apache.sling.testing.caconfig-mock-plugin - 1.4.0 + 1.5.4 test @@ -160,7 +160,7 @@ io.wcm io.wcm.testing.wcm-io-mock.caconfig - 1.1.0 + 1.2.0 test diff --git a/src/main/java/io/wcm/handler/commons/dom/AbstractElement.java b/src/main/java/io/wcm/handler/commons/dom/AbstractElement.java index 64d95e7..e1f9dcb 100644 --- a/src/main/java/io/wcm/handler/commons/dom/AbstractElement.java +++ b/src/main/java/io/wcm/handler/commons/dom/AbstractElement.java @@ -51,18 +51,6 @@ protected AbstractElement(String name) { super(name); } - /** - * Sets element name - should not be used for HtmlElement-derived classes! - * @param value Element name - * @return Self reference - * @deprecated Deprecated - */ - @Override - @Deprecated - public final org.jdom2.Element setName(String value) { - return super.setName(value); - } - /** * Gets attribute value as integer. * @param attributeName Attribute name diff --git a/src/main/java/io/wcm/handler/commons/dom/package-info.java b/src/main/java/io/wcm/handler/commons/dom/package-info.java index c127128..59239cc 100644 --- a/src/main/java/io/wcm/handler/commons/dom/package-info.java +++ b/src/main/java/io/wcm/handler/commons/dom/package-info.java @@ -20,5 +20,5 @@ /** * DOM convenience objects used by handler implementations to build markup fragments for links and media. */ -@org.osgi.annotation.versioning.Version("1.3") +@org.osgi.annotation.versioning.Version("2.0.0") package io.wcm.handler.commons.dom; diff --git a/src/main/java/io/wcm/handler/commons/editcontext/DropTargetImpl.java b/src/main/java/io/wcm/handler/commons/editcontext/DropTargetImpl.java index 4da35e3..ddba8a2 100644 --- a/src/main/java/io/wcm/handler/commons/editcontext/DropTargetImpl.java +++ b/src/main/java/io/wcm/handler/commons/editcontext/DropTargetImpl.java @@ -33,7 +33,7 @@ */ @ProviderType /* - * deprecated Sling JSON API tied into AEM public API: + * This depends on the (deprecated) Sling Commons JSON API, which is tied into AEM public API: * https://developer.adobe.com/experience-manager/reference-materials/6-5/javadoc/com/day/cq/commons/JSONItem.html */ @SuppressWarnings("deprecation") diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 4c3df7b..1cb977e 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -15,6 +15,7 @@ Functionality shared by the handler implementations. |Handler Commons version |AEM version supported |------------------------|---------------------- +|2.0.x or higher |AEM 6.5.17+, AEMaaCS |1.5.x or higher |AEM 6.5.7+, AEMaaCS |1.4.x |AEM 6.4.5+, AEMaaCS |1.1.x - 1.3.x |AEM 6.2+ diff --git a/src/test/java/io/wcm/handler/commons/dom/HtmlElementTest.java b/src/test/java/io/wcm/handler/commons/dom/HtmlElementTest.java index 48ee7db..89dea00 100644 --- a/src/test/java/io/wcm/handler/commons/dom/HtmlElementTest.java +++ b/src/test/java/io/wcm/handler/commons/dom/HtmlElementTest.java @@ -42,7 +42,6 @@ void setUp() { underTest = new HtmlElement("test"); } - @SuppressWarnings("deprecation") @Test void testName() { assertEquals("test", underTest.getName());