Commit 27a3d2c4 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-acs7' into develop-acs23

parents 613e6f1d 90f8dca1

pom.xml

+51 −24
Original line number Diff line number Diff line
@@ -46,31 +46,31 @@ 
		

		<alfresco.platform.version>23.2.0</alfresco.platform.version>



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

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

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

		<jersey.version>4.0.2</jersey.version>

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

		<jackson.version>2.21.2</jackson.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>io.swagger</groupId>

			<artifactId>swagger-annotations</artifactId>

			<version>1.6.11</version>

			<version>1.6.16</version>

		</dependency>

		<dependency>

			<groupId>io.swagger.core.v3</groupId>

			<artifactId>swagger-annotations</artifactId>

			<version>2.2.11</version>

			<version>2.2.43</version>

		</dependency>

		<dependency>

			<groupId>jakarta.activation</groupId>

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

			<version>2.1.3</version>

			<version>2.1.4</version>

		</dependency>

		<dependency>

			<groupId>org.slf4j</groupId>

			<artifactId>slf4j-api</artifactId>

			<version>2.0.7</version>

			<version>2.0.17</version>

		</dependency>

		<dependency>

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

			<groupId>jakarta.xml.bind</groupId>

			<artifactId>jakarta.xml.bind-api</artifactId>

			<version>4.0.1</version>

			<version>4.0.5</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>
@@ -102,10 +102,42 @@ 
	</dependencies>

	

	<build>

		<pluginManagement>

			<plugins>

				<plugin>

					<artifactId>maven-clean-plugin</artifactId>

					<version>3.5.0</version>

				</plugin>

				<plugin>

					<groupId>org.apache.maven.plugins</groupId>

					<artifactId>maven-dependency-plugin</artifactId>

					<version>3.10.0</version>

				</plugin>

				<plugin>

					<groupId>io.swagger.codegen.v3</groupId>

					<artifactId>swagger-codegen-maven-plugin</artifactId>

					<version>3.0.68</version>

				</plugin>

				<plugin>

					<groupId>com.inteligr8</groupId>

					<artifactId>regex-maven-plugin</artifactId>

					<version>1.0.7</version>

				</plugin>

				<plugin>

					<groupId>net.revelc.code</groupId>

					<artifactId>impsort-maven-plugin</artifactId>

					<version>1.12.0</version>

				</plugin>

				<plugin>

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

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

					<version>3.6.1</version>

				</plugin>

			</plugins>

		</pluginManagement>

		<plugins>

			<plugin>

				<artifactId>maven-clean-plugin</artifactId>

				<configuration>

					<filesets>

						<fileset>
@@ -120,7 +152,6 @@ 
			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-dependency-plugin</artifactId>

				<version>3.8.1</version>

				<executions>

					<execution>

						<id>download-api-explorer</id>
@@ -136,7 +167,6 @@ 
			<plugin>

				<groupId>io.swagger.codegen.v3</groupId>

				<artifactId>swagger-codegen-maven-plugin</artifactId>

				<version>3.0.61</version>

				<configuration>

					<language>jaxrs-cxf-client</language>

					<configOptions>
@@ -218,7 +248,6 @@ 
			<plugin>

				<groupId>com.inteligr8</groupId>

				<artifactId>regex-maven-plugin</artifactId>

				<version>1.0.6</version>

				<executions>

					<execution>

						<id>fix-baseUrl</id>
@@ -323,7 +352,6 @@ 
			<plugin>

				<groupId>net.revelc.code</groupId>

				<artifactId>impsort-maven-plugin</artifactId>

				<version>1.9.0</version>

				<executions>

					<execution>

						<id>organize-imports</id>
@@ -344,7 +372,6 @@ 
			<plugin>

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

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

				<version>3.6.1</version>

				<executions>

					<execution>

						<id>add-gensrc</id>
@@ -365,7 +392,7 @@ 


	<profiles>

		<profile>

			<id>ossrh-release</id>

			<id>central-publish</id>

			<properties>

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

			</properties>
@@ -383,7 +410,6 @@ 
					</plugin>

					<plugin>

						<artifactId>maven-javadoc-plugin</artifactId>

						<version>3.3.2</version>

						<executions>

							<execution>

								<id>javadoc</id>
@@ -407,19 +433,20 @@ 
						</executions>

					</plugin>

					<plugin>

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

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

						<version>1.6.13</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>