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

Merge branch 'develop-cxf' into stable-cxf

parents 63789812 80f695cd

pom.xml

+34 −39
Original line number Diff line number Diff line
@@ -43,17 +43,16 @@ 
		<maven.compiler.source>11</maven.compiler.source>

		<maven.compiler.target>11</maven.compiler.target>



		<junit.version>5.12.0</junit.version>

		<spring.version>6.0.23</spring.version>

		<jackson.version>2.17.3</jackson.version>

		<cxf.version>4.0.6</cxf.version>

		<spring.version>6.2.18</spring.version>

		<jackson.version>2.21.1</jackson.version>

		<cxf.version>4.1.5</cxf.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>jakarta.annotation</groupId>

			<artifactId>jakarta.annotation-api</artifactId>

			<version>2.1.1</version>

			<version>3.0.0</version>

		</dependency>

		<dependency>

			<groupId>org.springframework</groupId>
@@ -78,7 +77,7 @@ 
		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>

			<version>3.17.0</version>

			<version>3.20.0</version>

		</dependency>

		<dependency>

			<groupId>org.slf4j</groupId>
@@ -90,10 +89,11 @@ 
			<artifactId>jakarta.ws.rs-api</artifactId>

			<version>3.1.0</version>

		</dependency>



		<dependency>

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

			<artifactId>junit-jupiter-api</artifactId>

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

			<version>5.14.3</version>

			<scope>test</scope>

		</dependency>

		<dependency>
@@ -118,11 +118,27 @@ 
	</dependencies>

	

	<build>

		<pluginManagement>

			<plugins>

				<plugin>

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

					<version>3.5.5</version>

				</plugin>

				<plugin>

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

					<version>3.5.5</version>

				</plugin>

				<plugin>

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

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

					<version>3.6.1</version>

				</plugin>

			</plugins>

		</pluginManagement>

		<plugins>

			<plugin>

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

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

				<version>3.4.0</version>

				<executions>

					<execution>

						<id>add-jaxrs-src</id>
@@ -144,34 +160,12 @@ 
					</execution>

				</executions>

			</plugin>

			<plugin>

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

				<version>3.4.0</version>

				<dependencies>

					<dependency>

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

						<artifactId>junit-jupiter-engine</artifactId>

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

					</dependency>

				</dependencies>

			</plugin>

			<plugin>

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

				<version>3.4.0</version>

				<dependencies>

					<dependency>

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

						<artifactId>junit-jupiter-engine</artifactId>

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

					</dependency>

				</dependencies>

			</plugin>

		</plugins>

	</build>



	<profiles>

		<profile>

			<id>ossrh-release</id>

			<id>central-publish</id>

			<properties>

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

			</properties>
@@ -211,19 +205,20 @@ 
						</executions>

					</plugin>

					<plugin>

						<groupId>org.sonatype.plugins</groupId>

						<artifactId>nexus-staging-maven-plugin</artifactId>

						<version>1.6.14</version>

						<groupId>org.sonatype.central</groupId>

						<artifactId>central-publishing-maven-plugin</artifactId>

						<version>0.10.0</version>

						<extensions>true</extensions>

						<configuration>

							<serverId>ossrh</serverId>

							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>

							<autoReleaseAfterClose>true</autoReleaseAfterClose>

							<publishingServerId>central</publishingServerId>

							<autoPublish>true</autoPublish>

						</configuration>

						<!-- for some reason this is required... -->

						<executions>

							<execution>

								<id>ossrh-deploy</id>

								<id>deploy</id>

								<phase>deploy</phase>

								<goals><goal>deploy</goal></goals>

								<goals><goal>publish</goal></goals>

							</execution>

						</executions>

					</plugin>