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

Merge branch 'develop' into stable

parents aad2ed64 410013c7

pom.xml

+15 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

	<modelVersion>4.0.0</modelVersion>

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

	<artifactId>activiti-java-enterprise-api</artifactId>

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

	<version>1.0.0-v1</version>

	<name>Alfresco Process Services ReST API Client for Java</name>
@@ -16,10 +16,10 @@ 
			installation -->

		<aps.baseUrl>https://activiti.alfresco.com</aps.baseUrl>



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

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

		<spring-boot.version>2.3.10.RELEASE</spring-boot.version>

		<jersey.version>2.34</jersey.version>

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

	</properties>



	<dependencies>
@@ -59,7 +59,7 @@ 
		<dependency>

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

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

			<version>5.7.2</version>

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

			<scope>test</scope>

		</dependency>

		<dependency>
@@ -79,7 +79,18 @@ 
					<dependency>

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

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

						<version>5.7.2</version>

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

					</dependency>

				</dependencies>

			</plugin>

			<plugin>

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

				<version>3.0.0-M5</version>

				<dependencies>

					<dependency>

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

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

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

					</dependency>

				</dependencies>

			</plugin>