Commit 3d39f0db authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into develop-jersey

parents a64b70ac d60996f0

pom.xml

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



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

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

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

		<jersey.version>2.35</jersey.version>

	</properties>
@@ -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>
@@ -131,7 +131,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>
@@ -142,7 +142,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>