diff --git a/pom.xml b/pom.xml
index 4af05e790..05f44d29c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,38 +73,110 @@
 		<github.global.server>github</github.global.server>
 		<project.build.timestamp>${maven.build.timestamp}</project.build.timestamp>
 
-		<!-- Dependency Versions -->
+		<!-- Plugin Versions -->
 
-		<did-common-java.version>1.11.0</did-common-java.version>
+		<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+		<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+		<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+		<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
+		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+		<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+
+		<!-- Testing Versions -->
 
+		<junit.version>4.13.2</junit.version>
+		<junit-jupiter.version>5.10.2</junit-jupiter.version>
+		<junit-platform.version>1.10.2</junit-platform.version>
+		<junit-platform-commons.version>1.10.2</junit-platform-commons.version>
+		<mockito-core.version>5.11.0</mockito-core.version>
+
+		<!-- Systems Versions -->
+
+		<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
 		<slf4j.version>2.0.12</slf4j.version>
-		<gson.version>2.10.1</gson.version>
-		<jackson.databind.version>2.17.0</jackson.databind.version>
-		<jackson.core.version>2.17.0</jackson.core.version>
-		<jackson.annotations.version>2.17.0</jackson.annotations.version>
-		<httpclient.version>4.5.14</httpclient.version>
+
+		<!-- Spring Versions -->
 
 		<springframework.version>6.1.5</springframework.version>
-		<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+		<fasterxml.jackson.version>2.17.0</fasterxml.jackson.version>
 
-		<junit-jupiter.version>5.10.2</junit-jupiter.version>
-		<mockito-core.version>5.11.0</mockito-core.version>
-		<junit.version>4.13.2</junit.version>
+		<!-- OpenAPI Versions -->
 
-		<!-- Plugin Versions -->
+		<openapi-generator.version>7.4.0</openapi-generator.version>
 
-		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-		<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
-		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-		<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
-		<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-		<maven-scm-plugin.version>2.0.1</maven-scm-plugin.version>
-		<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-		<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+		<!-- OpenAPI Client Versions -->
+
+		<jakarta-annotation.version>3.0.0-M1</jakarta-annotation.version>
+		<jakarta-validation.version>3.1.0-M2</jakarta-validation.version>
+
+		<!-- DIF Versions -->
+
+		<did-common-java.version>1.11.0</did-common-java.version>
+
+		<!-- Other Versions -->
+
+		<gson.version>2.10.1</gson.version>
+		<httpclient.version>4.5.14</httpclient.version>
 	</properties>
 
 	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-enforcer-plugin</artifactId>
+					<version>${maven-enforcer-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>${maven-clean-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>${maven-source-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>${maven-resources-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>${maven-compiler-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>${maven-surefire-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>${maven-install-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>${maven-deploy-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>${maven-release-plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.openapitools</groupId>
+					<artifactId>openapi-generator-maven-plugin</artifactId>
+					<version>${openapi-generator.version}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -155,55 +227,25 @@
 				</executions>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>${maven-source-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>${maven-compiler-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>${maven-surefire-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>${maven-dependency-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>${maven-release-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-scm-plugin</artifactId>
-					<version>${maven-scm-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-war-plugin</artifactId>
-					<version>${maven-war-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-deploy-plugin</artifactId>
-					<version>${maven-deploy-plugin.version}</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>${maven-enforcer-plugin.version}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/src/main/resources/</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.properties</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>${project.basedir}/src/main/resources/</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>**/*.properties</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 
 	<profiles>
@@ -238,106 +280,159 @@
 	</profiles>
 
 	<dependencyManagement>
+
+		<!-- Testing Dependencies -->
+
 		<dependencies>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>uni-resolver-core</artifactId>
-				<version>${project.parent.version}</version>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>uni-resolver-local</artifactId>
-				<version>${project.parent.version}</version>
+				<groupId>org.junit.platform</groupId>
+				<artifactId>junit-platform-commons</artifactId>
+				<version>${junit-platform-commons.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>uni-resolver-client</artifactId>
-				<version>${project.parent.version}</version>
+				<groupId>org.junit.jupiter</groupId>
+				<artifactId>junit-jupiter</artifactId>
+				<version>${junit-jupiter.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>uni-resolver-web</artifactId>
-				<version>${project.parent.version}</version>
+				<groupId>org.junit.jupiter</groupId>
+				<artifactId>junit-jupiter-api</artifactId>
+				<version>${junit-jupiter.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>uni-resolver-driver</artifactId>
-				<version>${project.parent.version}</version>
+				<groupId>org.junit.jupiter</groupId>
+				<artifactId>junit-jupiter-engine</artifactId>
+				<version>${junit-jupiter.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>uni-resolver-driver-http</artifactId>
-				<version>${project.parent.version}</version>
+				<groupId>org.junit.jupiter</groupId>
+				<artifactId>junit-jupiter-params</artifactId>
+				<version>${junit-jupiter.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.junit.vintage</groupId>
+				<artifactId>junit-vintage-engine</artifactId>
+				<version>${junit-jupiter.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-core</artifactId>
+				<version>${mockito-core.version}</version>
+			</dependency>
+
+			<!-- System Dependencies -->
+
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
 				<version>${slf4j.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>decentralized-identity</groupId>
-				<artifactId>did-common-java</artifactId>
-				<version>${did-common-java.version}</version>
+				<groupId>jakarta.servlet</groupId>
+				<artifactId>jakarta.servlet-api</artifactId>
+				<version>${jakarta.servlet-api.version}</version>
+			</dependency>
+
+			<!-- Spring Dependencies -->
+
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-web</artifactId>
+				<version>${springframework.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>${springframework.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-core</artifactId>
-				<version>${jackson.core.version}</version>
+				<version>${fasterxml.jackson.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.annotations.version}</version>
+				<version>${fasterxml.jackson.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.databind.version}</version>
+				<version>${fasterxml.jackson.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>${httpclient.version}</version>
+				<groupId>com.fasterxml.jackson.datatype</groupId>
+				<artifactId>jackson-datatype-jsr310</artifactId>
+				<version>${fasterxml.jackson.version}</version>
 			</dependency>
+
+			<!-- DIF Dependencies -->
+
 			<dependency>
-				<groupId>com.google.code.gson</groupId>
-				<artifactId>gson</artifactId>
-				<version>${gson.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>uni-resolver-core</artifactId>
+				<version>${project.parent.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-web</artifactId>
-				<version>${springframework.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>uni-resolver-local</artifactId>
+				<version>${project.parent.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
-				<version>${springframework.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>uni-resolver-client</artifactId>
+				<version>${project.parent.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>jakarta.servlet</groupId>
-				<artifactId>jakarta.servlet-api</artifactId>
-				<version>${jakarta.servlet-api.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>uni-resolver-web</artifactId>
+				<version>${project.parent.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>uni-resolver-driver</artifactId>
+				<version>${project.parent.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.junit.jupiter</groupId>
-				<artifactId>junit-jupiter-api</artifactId>
-				<version>${junit-jupiter.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>uni-resolver-driver-http</artifactId>
+				<version>${project.parent.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.junit.jupiter</groupId>
-				<artifactId>junit-jupiter-params</artifactId>
-				<version>${junit-jupiter.version}</version>
+				<groupId>decentralized-identity</groupId>
+				<artifactId>did-common-java</artifactId>
+				<version>${did-common-java.version}</version>
 			</dependency>
+
+			<!-- OpenAPI Client Dependencies -->
+
 			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>${mockito-core.version}</version>
+				<groupId>jakarta.annotation</groupId>
+				<artifactId>jakarta.annotation-api</artifactId>
+				<version>${jakarta-annotation.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>jakarta.validation</groupId>
+				<artifactId>jakarta.validation-api</artifactId>
+				<version>${jakarta-validation.version}</version>
+			</dependency>
+
+			<!-- Other Dependencies -->
+
+			<dependency>
+				<groupId>com.google.code.gson</groupId>
+				<artifactId>gson</artifactId>
+				<version>${gson.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>${httpclient.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/uni-resolver-core/pom.xml b/uni-resolver-core/pom.xml
index 28d24a6ca..3d9d69b3c 100644
--- a/uni-resolver-core/pom.xml
+++ b/uni-resolver-core/pom.xml
@@ -11,6 +11,67 @@
 		<version>0.18-SNAPSHOT</version>
 	</parent>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>${project.basedir}/openapi/java-client-generated/</directory>
+							<includes>
+								<include>**/*</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+								<exclude>.openapi-generator-ignore</exclude>
+							</excludes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.openapitools</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>execution-universal-resolver</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<generatorName>java</generatorName>
+							<inputSpec>${project.parent.basedir}/openapi/openapi.yaml</inputSpec>
+							<output>openapi/java-client-generated/</output>
+							<apiPackage>uniresolver.openapi.api</apiPackage>
+							<modelPackage>uniresolver.openapi.model</modelPackage>
+							<invokerPackage>uniresolver.openapi</invokerPackage>
+							<openapiNormalizer>REF_AS_PARENT_IN_ALLOF=true</openapiNormalizer>
+							<configOptions>
+								<basePackage>uniresolver</basePackage>
+								<sourceFolder>src/main/java/</sourceFolder>
+								<groupId>decentralized-identity</groupId>
+								<artifactId>uniresolver-openapi</artifactId>
+								<artifactVersion>${project.version}</artifactVersion>
+								<configPackage>uniresolver.openapi.config</configPackage>
+								<asyncNative>false</asyncNative>
+								<disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
+								<library>native</library>
+								<useBeanValidation>true</useBeanValidation>
+								<dateLibrary>java8</dateLibrary>
+								<hideGenerationTimestamp>true</hideGenerationTimestamp>
+								<openApiNullable>false</openApiNullable>
+								<useJakartaEe>true</useJakartaEe>
+							</configOptions>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>decentralized-identity</groupId>
@@ -24,6 +85,18 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>