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

Merge branch 'develop' into stable

parents eb5fea69 b9c75778

pom.xml

+37 −19
Original line number Diff line number Diff line
@@ -41,11 +41,10 @@ 
		<maven.compiler.source>11</maven.compiler.source>

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

		<maven.compiler.release>11</maven.compiler.release>

		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>

		

		<jersey.version>3.1.10</jersey.version>

		<cxf.version>4.1.0</cxf.version>

		<jackson.version>2.18.1</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>
@@ -57,7 +56,7 @@ 
		<dependency>

			<groupId>jakarta.activation</groupId>

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

			<version>2.1.3</version>

			<version>2.1.4</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>
@@ -91,10 +90,32 @@ 
				<basePackage>com.inteligr8.alfresco.activiti</basePackage>

			</properties>

			<build>

				<pluginManagement>

					<plugins>

						<plugin>

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

							<version>3.5.0</version>

						</plugin>

						<plugin>

							<groupId>com.googlecode.maven-download-plugin</groupId>

							<artifactId>download-maven-plugin</artifactId>

							<version>1.13.0</version>

						</plugin>

						<plugin>

							<groupId>com.inteligr8</groupId>

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

							<version>1.0.7</version>

						</plugin>

						<plugin>

							<groupId>org.raml.jaxrs</groupId>

							<artifactId>raml-to-jaxrs-maven-plugin</artifactId>

							<version>3.0.7</version>

						</plugin>

					</plugins>

				</pluginManagement>

				<plugins>

					<plugin>

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

						<version>3.1.0</version>

						<configuration>

							<filesets>

								<fileset>
@@ -109,7 +130,6 @@ 
					<plugin>

						<groupId>com.googlecode.maven-download-plugin</groupId>

						<artifactId>download-maven-plugin</artifactId>

						<version>1.6.3</version>

						<executions>

							<execution>

								<id>download-aps-raml</id>
@@ -127,7 +147,6 @@ 
					<plugin>

						<groupId>com.inteligr8</groupId>

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

						<version>1.0.5</version>

						<executions>

							<execution>

								<id>fix-displayName</id>
@@ -186,7 +205,6 @@ 
					<plugin>

						<groupId>org.raml.jaxrs</groupId>

						<artifactId>raml-to-jaxrs-maven-plugin</artifactId>

						<version>3.0.7</version>

						<executions>

							<execution>

								<id>raml-codegen</id>
@@ -209,7 +227,7 @@ 
			</build>

		</profile>

		<profile>

			<id>ossrh-release</id>

			<id>central-publish</id>

			<properties>

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

			</properties>
@@ -227,7 +245,6 @@ 
					</plugin>

					<plugin>

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

						<version>3.3.2</version>

						<executions>

							<execution>

								<id>javadoc</id>
@@ -251,19 +268,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>