Remove deprecated functionality (2.x) (#1)

wcm-io · Dec 20, 2023 · 1c697c3 · 1c697c3
1 parent ea917a8
commit 1c697c3
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 23 deletions.
diff --git 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">
   <body>
 
+    <release version="2.0.0" date="not released">
+      <action type="remove" dev="sseifert">
+        Remove deprecated functionality.
+      </action>
+      <action type="update" dev="sseifert">
+        Switch to AEM 6.5.17 as minimum version.
+      </action>
+    </release>
+
     <release version="1.5.0" date="2023-04-19">
       <action type="update" dev="sseifert">
         Switch to Java 11 as minimum version.

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm</groupId>
     <artifactId>io.wcm.parent_toplevel</artifactId>
-    <version>2.2.8</version>
+    <version>2.3.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.handler.commons</artifactId>
-  <version>1.5.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Handler Commons</name>
@@ -81,19 +81,19 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.commons</artifactId>
-      <version>1.9.0</version>
+      <version>1.10.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.sling.commons</artifactId>
-      <version>1.4.0</version>
+      <version>1.6.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.wcm.ui.granite</artifactId>
-      <version>1.8.0</version>
+      <version>1.10.0</version>
       <scope>compile</scope>
     </dependency>
 
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-      <version>5.4.2</version>
+      <version>5.4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -142,7 +142,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
-      <version>1.4.0</version>
+      <version>1.5.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -160,7 +160,7 @@
     <dependency>
       <groupId>io.wcm</groupId>
       <artifactId>io.wcm.testing.wcm-io-mock.caconfig</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -42,7 +42,6 @@ void setUp() {
     underTest = new HtmlElement("test");
   }
 
-  @SuppressWarnings("deprecation")
   @Test
   void testName() {
     assertEquals("test", underTest.getName());