Dropwizard 5.x Update with support for legacy 2.x implementation

CHANGELOG.md

@@ -1,37 +1,51 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 ## [1.1.0]
+
 - Added bill of materials for ranger, for clients who intend to use ranger.
 - Updated version to release version 1.1.0
 
 ## [1.1-RC5]
+
 Server to server replication implemented
 
 ## [1.1-RC4]
+
 - Remove WaitStrategy in the Retryer used to check if ServiceRegistry is refreshed during ServiceRegistryUpdater startup
 
 ## [1.1-RC3]
-- Execute updateRegistry operation in async inside  ServiceFinderHub so that main thread reaches till waitTillHubIsReady instead of waiting for lock release and hubStartTimeoutMs is honoured as expected
+
+- Execute updateRegistry operation in async inside ServiceFinderHub so that main thread reaches till waitTillHubIsReady
+  instead of waiting for lock release and hubStartTimeoutMs is honoured as expected
 - Setting the read timeout and write timeout in OkHttpClient same as operation timeout given in HttpClientConfig
 - Added waitStrategy in waitTillServiceIsReady in ServiceFinderHub to save come cpu cycles in Retryer
 
 ## [1.1-RC2]
+
 - Add feature to exclude services from service data source
 - Create one single `RangerHealthCheck` for all curatorFrameworks when giving multiple zookeeper connection strings
-- Update `lastUpdatedTimeStamp` for service nodes in service registry for zk / http communication failures from any kind of node data source - zk/http/drove
-- Pertaining to PR : https://github.com/appform-io/ranger/pull/22/, building of a ServiceFinderHub and a ServiceFinder are bounded.
+- Update `lastUpdatedTimeStamp` for service nodes in service registry for zk / http communication failures from any kind
+  of node data source - zk/http/drove
+- Pertaining to PR : https://github.com/appform-io/ranger/pull/22/, building of a ServiceFinderHub and a ServiceFinder
+  are bounded.
 
 ## [1.0-RC18]
+
 - Version bump to release lexicographically higher version than 1.0-dw3-RC17
 
 ## [1.0-RC17]
+
 - Domain specific collision checker in id generator
 
 ## [1.0-RC16]
-- Fixed hierarchical environment aware shard selector  : If a service  is deployed with environment :  env.x.y.z then it should be able to discover other services present in environment -  [env , env.x , env.x.y, env.x.y.z ]
+
+- Fixed hierarchical environment aware shard selector  : If a service is deployed with environment :  env.x.y.z then it
+  should be able to discover other services present in environment -  [env , env.x , env.x.y, env.x.y.z ]
 
 ## [1.0-RC15]
+
 - Moved discovery bundle from https://github.com/appform-io/dropwizard-service-discovery.
 - Updated to dropwizard version 2.1.10 : BOM update.
 - Upgraded to java version 17 with release in 11
@@ -41,13 +55,19 @@ Server to server replication implemented
 - Done sonar fixes after the java version upgrade
 
 ## [1.0-RC14]
-- When the Collection of Services is empty the monitor should gracefully return [PR](https://github.com/appform-io/ranger/pull/27)
+
+- When the Collection of Services is empty the monitor should gracefully
+  return [PR](https://github.com/appform-io/ranger/pull/27)
 
 ## [1.0-RC13]
+
 - Handling NodeDataSource refresh failures gracefully
 
 ## [1.0-RC12]
+
 - Dynamic service registration
 
 ## [1.0-RC11]
-- Introduced a portScheme on ServiceNode, so multiple types of protocols could be supported. Was assumed to be HTTP instead. 
+
+- Introduced a portScheme on ServiceNode, so multiple types of protocols could be supported. Was assumed to be HTTP
+  instead. 

pom.xml

@@ -41,10 +41,15 @@
         <module>ranger-drove-client</module>
         <module>ranger-server-common</module>
         <module>ranger-server-bundle</module>
+        <module>ranger-server-bundle-dw5</module>
         <module>ranger-http-model</module>
+        <module>ranger-discovery-common</module>
         <module>ranger-discovery-bundle</module>
+        <module>ranger-discovery-bundle-dw5</module>
         <module>ranger-hub-server-bundle</module>
+        <module>ranger-hub-server-bundle-dw5</module>
         <module>ranger-server</module>
+        <module>ranger-server-dw5</module>
         <module>ranger-bom</module>
     </modules>
 
@@ -74,7 +79,7 @@
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
             <comments>A business-friendly OSS license</comments>
         </license>
@@ -99,34 +104,56 @@
     </developers>
 
     <properties>
+        <!-- General -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <guava.version>33.3.0-jre</guava.version>
-        <curator.version>5.5.0</curator.version>
-        <slf4j.version>1.7.32</slf4j.version>
-
-        <maven.compiler.version>3.8.0</maven.compiler.version>
         <java.version>17</java.version>
         <java.release.version>17</java.release.version>
-        <lombok.version>1.18.30</lombok.version>
-        <annotations.version>3.0.1u2</annotations.version>
 
-        <junit.version>5.8.2</junit.version>
-        <awaitility.version>4.1.1</awaitility.version>
+        <!-- Global -->
+        <guava.version>33.5.0-jre</guava.version>
+        <curator.version>5.9.0</curator.version>
+        <slf4j.version>1.7.32</slf4j.version>
+        <lombok.version>1.18.42</lombok.version>
+        <annotations.version>3.0.1</annotations.version>
         <guava-retrying.version>2.0.0</guava-retrying.version>
+        <http.client.version>5.1.0</http.client.version>
+        <logback.version>1.5.18</logback.version>
+        <metrics.version>4.2.0</metrics.version>
+        <jackson.version>2.20</jackson.version>
+        <snappy.version>1.1.10.8</snappy.version>
+        <zookeeper.version>3.9.4</zookeeper.version>
 
-        <http.client.version>4.9.3</http.client.version>
-        <wiremock.version>3.3.1</wiremock.version>
+        <!-- Test Dependencies -->
+        <junit.version>5.13.4</junit.version>
+        <awaitility.version>4.3.0</awaitility.version>
+        <wiremock.version>4.0.0-beta.15</wiremock.version>
         <mockito.version>4.2.0</mockito.version>
+        <json-smart.version>2.6.0</json-smart.version>
 
-        <dropwizard.version>2.1.12</dropwizard.version>
-        <logback.version>1.2.12</logback.version>
-        <metrics.version>4.2.0</metrics.version>
-
+        <!-- Maven Plugins -->
+        <maven.compiler.version>3.14.0</maven.compiler.version>
+        <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
         <jacoco.version>0.8.13</jacoco.version>
+        <maven.gpg.plugin.version>3.2.8</maven.gpg.plugin.version>
+        <nexus.staging.maven.plugin.version>1.7.0</nexus.staging.maven.plugin.version>
+        <maven.javadoc.plugin.version>3.12.0</maven.javadoc.plugin.version>
+        <maven.source.plugin.version>3.3.1</maven.source.plugin.version>
+        <maven.surefire.plugin.version>3.5.4</maven.surefire.plugin.version>
+        <maven.surefire.junit5.tree.reporter.version>1.4.0</maven.surefire.junit5.tree.reporter.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.xerial.snappy</groupId>
+                <artifactId>snappy-java</artifactId>
+                <version>${snappy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
@@ -135,11 +162,10 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>io.dropwizard</groupId>
-                <artifactId>dropwizard-bom</artifactId>
-                <type>pom</type>
-                <scope>import</scope>
-                <version>${dropwizard.version}</version>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>${json-smart.version}</version>
+                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -151,6 +177,24 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
@@ -166,10 +210,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-jackson</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -207,12 +247,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>${maven.surefire.plugin.version}</version>
                 <dependencies>
                     <dependency>
                         <groupId>me.fabriciorby</groupId>
                         <artifactId>maven-surefire-junit5-tree-reporter</artifactId>
-                        <version>1.3.0</version>
+                        <version>${maven.surefire.junit5.tree.reporter.version}</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -257,7 +297,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>${maven.source.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -270,7 +310,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>${maven.javadoc.plugin.version}</version>
                 <configuration>
                     <doclint>all,-missing</doclint>
                 </configuration>
@@ -286,7 +326,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.7.0</version>
+                <version>${nexus.staging.maven.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -312,7 +352,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>${maven.gpg.plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -347,5 +387,4 @@
             </properties>
         </profile>
     </profiles>
-
 </project>