Commit 9b8d4d2d authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into develop-jersey

parents c0ce11dd fc0f19fc

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ 
		<dependency>

			<groupId>com.inteligr8</groupId>

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

			<version>2.0.1-jersey</version>

			<version>2.0.4-jersey</version>

		</dependency>

		<dependency>

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

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

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

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

			<scope>provided</scope> <!-- explicitly, bring your own version -->

		</dependency>

		<dependency>