Commit 6bb15618 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-cxf' into stable-cxf

parents cc8d9e9d 0ce23694

pom.xml

+34 −33
Original line number Diff line number Diff line
@@ -44,8 +44,9 @@ 
		<maven.compiler.target>8</maven.compiler.target>



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

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

		<cxf.version>3.3.2</cxf.version>

		<spring.version>5.3.27</spring.version>

		<jackson.version>2.15.1</jackson.version>

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

	</properties>



	<dependencies>
@@ -57,22 +58,22 @@ 
		<dependency>

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

			<artifactId>jackson-databind</artifactId>

			<version>2.12.2</version>

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

		</dependency>

		<dependency>

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

			<artifactId>jackson-jaxrs-json-provider</artifactId>

			<version>2.12.2</version>

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

		</dependency>

		<dependency>

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

			<artifactId>jackson-datatype-jsr310</artifactId>

			<version>2.12.2</version>

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

		</dependency>

		<dependency>

			<groupId>org.slf4j</groupId>

			<artifactId>slf4j-api</artifactId>

			<version>1.7.29</version>

			<version>1.7.36</version>

		</dependency>

		<dependency>

			<groupId>jakarta.ws.rs</groupId>
@@ -94,7 +95,7 @@ 
		<dependency>

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

			<artifactId>httpclient</artifactId>

			<version>4.5.9</version>

			<version>4.5.14</version>

			<scope>test</scope>

		</dependency>
@@ -111,7 +112,7 @@ 
			<plugin>

				<groupId>org.codehaus.mojo</groupId>

				<artifactId>build-helper-maven-plugin</artifactId>

				<version>3.2.0</version>

				<version>3.4.0</version>

				<executions>

					<execution>

						<id>add-jaxrs-src</id>
@@ -135,7 +136,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>
@@ -146,7 +147,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>
@@ -155,6 +156,17 @@ 
					</dependency>

				</dependencies>

			</plugin>

		</plugins>

	</build>



	<profiles>

		<profile>

			<id>ossrh-release</id>

			<properties>

				<maven.deploy.skip>true</maven.deploy.skip>

			</properties>

			<build>

				<plugins>

					<plugin>

						<artifactId>maven-source-plugin</artifactId>

						<executions>
@@ -178,17 +190,6 @@ 
							</execution>

						</executions>

					</plugin>

		</plugins>

	</build>



	<profiles>

		<profile>

			<id>ossrh-release</id>

			<properties>

				<maven.deploy.skip>true</maven.deploy.skip>

			</properties>

			<build>

				<plugins>

					<plugin>

						<artifactId>maven-gpg-plugin</artifactId>

						<executions>