Commit 238aeef9 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-cxf' into stable-cxf

parents 073ca4a6 cd262858

pom.xml

+6 −6
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ 
		<acs.platform.tag>acs7</acs.platform.tag>



		<junit.version>5.7.2</junit.version>

		<spring.version>5.2.14.RELEASE</spring.version>

		<cxf.version>3.4.7</cxf.version>

		<spring.version>5.3.6</spring.version>

		<cxf.version>3.5.6</cxf.version>

	</properties>



	<dependencies>
@@ -77,13 +77,13 @@ 
		<dependency>

			<groupId>org.apache.httpcomponents</groupId>

			<artifactId>httpclient</artifactId>

			<version>4.5.9</version>

			<version>4.5.14</version>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-slf4j-impl</artifactId>

			<version>2.17.2</version>

			<version>2.19.0</version>

			<scope>test</scope>

		</dependency>

	</dependencies>
@@ -117,7 +117,7 @@ 
			</plugin>

			<plugin>

				<artifactId>maven-surefire-plugin</artifactId>

				<version>3.0.0-M5</version>

				<version>3.1.0</version>

				<dependencies>

					<dependency>

						<groupId>org.junit.jupiter</groupId>
@@ -128,7 +128,7 @@ 
			</plugin>

			<plugin>

				<artifactId>maven-failsafe-plugin</artifactId>

				<version>3.0.0-M5</version>

				<version>3.1.0</version>

				<dependencies>

					<dependency>

						<groupId>org.junit.jupiter</groupId>