Commit 93af3639 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 0d402f60 6d0441a7

pom.xml

+20 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ 
			<version>${aps.version}</version>

			<classifier>classes</classifier>

			<scope>provided</scope>

			<exclusions>

				<exclusion>

					<groupId>com.activiti</groupId>

					<artifactId>aspose-transformation</artifactId>

				</exclusion>

				<exclusion>

					<groupId>org.alfresco.officeservices</groupId>

					<artifactId>aoservices</artifactId>

				</exclusion>

			</exclusions>

		</dependency>

		<!-- Needed for the Activiti App Public API -->

		<dependency>
@@ -51,6 +61,16 @@ 
			<artifactId>activiti-app-logic</artifactId>

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

			<scope>provided</scope>

			<exclusions>

				<exclusion>

					<groupId>com.activiti</groupId>

					<artifactId>aspose-transformation</artifactId>

				</exclusion>

				<exclusion>

					<groupId>org.alfresco.officeservices</groupId>

					<artifactId>aoservices</artifactId>

				</exclusion>

			</exclusions>

		</dependency>

	</dependencies>