Commit 41edf95b authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into develop-jersey

parents 5db57ce4 b7279c4c

pom.xml

+31 −39
Original line number Diff line number Diff line
@@ -44,30 +44,32 @@ 
		<maven.compiler.release>11</maven.compiler.release>

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



		<acs.platform.tag>acs23</acs.platform.tag>

		<acs.platform.tag>acs26</acs.platform.tag>



		<junit.version>5.10.0</junit.version>

		<spring.version>6.0.19</spring.version>

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

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



		<!-- for testing only -->

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

	</properties>



	<dependencies>

		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-client</artifactId>

			<version>3.0.0-jersey</version>

			<version>3.0.4-jersey</version>

		</dependency>

		<dependency>

			<groupId>com.inteligr8.alfresco</groupId>

			<artifactId>acs-public-rest-api</artifactId>

			<version>3.0.0-${acs.platform.tag}</version>

			<version>3.0.2-${acs.platform.tag}</version>

			<scope>provided</scope> <!-- explicitly, bring your own 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>
@@ -85,7 +87,7 @@ 
		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-slf4j-impl</artifactId>

			<version>2.20.0</version>

			<version>2.25.4</version>

			<scope>test</scope>

		</dependency>
@@ -111,6 +113,18 @@ 
	</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>

			</plugins>

		</pluginManagement>

		<plugins>

			<plugin>

				<groupId>org.codehaus.mojo</groupId>
@@ -137,34 +151,12 @@ 
					</execution>

				</executions>

			</plugin>

			<plugin>

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

				<version>3.1.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.1.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>
@@ -182,7 +174,6 @@ 
					</plugin>

					<plugin>

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

						<version>3.3.2</version>

						<executions>

							<execution>

								<id>javadoc</id>
@@ -206,19 +197,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>