Commit c05537da authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents d87e01ba e9dcb0cd

pom.xml

+4 −4
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 
		<maven.compiler.release>11</maven.compiler.release>

		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>

		

		<jersey.version>3.1.8</jersey.version>

		<cxf.version>4.0.2</cxf.version>

		<jackson.version>2.17.2</jackson.version>

		<jersey.version>3.1.10</jersey.version>

		<cxf.version>4.1.0</cxf.version>

		<jackson.version>2.18.1</jackson.version>

	</properties>



	<dependencies>
@@ -61,7 +61,7 @@ 
		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>

			<artifactId>jackson-module-jaxb-annotations</artifactId>

			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>

			<version>${jackson.version}</version>

		</dependency>

		<dependency>