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

fixed build and its impact on dep projects

parent afae287f

pom.xml

+20 −15
Original line number Diff line number Diff line
@@ -31,6 +31,26 @@ 
				<type>pom</type>

				<scope>import</scope>

			</dependency>

			<dependency>

				<groupId>com.fasterxml.jackson.core</groupId>

				<artifactId>jackson-core</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>com.fasterxml.jackson.core</groupId>

				<artifactId>jackson-databind</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>com.fasterxml.jackson.core</groupId>

				<artifactId>jackson-annotations</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>com.fasterxml.jackson.module</groupId>

				<artifactId>jjackson-module-jaxb-annotations</artifactId>

				<scope>provided</scope>

			</dependency>

		</dependencies>

	</dependencyManagement>
@@ -39,21 +59,6 @@ 
			<groupId>com.fasterxml.jackson.jaxrs</groupId>

			<artifactId>jackson-jaxrs-json-provider</artifactId>

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

			<exclusions>

				<!-- Provided by ACS -->

				<exclusion>

					<groupId>com.fasterxml.jackson.core</groupId>

					<artifactId>jackson-core</artifactId>

				</exclusion>

				<exclusion>

					<groupId>com.fasterxml.jackson.core</groupId>

					<artifactId>jackson-databind</artifactId>

				</exclusion>

				<exclusion>

					<groupId>com.fasterxml.jackson.core</groupId>

					<artifactId>jackson-annotations</artifactId>

				</exclusion>

			</exclusions>

		</dependency>

	</dependencies>

src/main/resources/alfresco/module/com.inteligr8.alfresco.cxf-jaxrs-platform-module/alfresco-global.properties

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 


platform-module.scan.packages=com.inteligr8.preventStartupFailure

src/main/resources/alfresco/module/com.inteligr8.alfresco.cxf-jaxrs-platform-module/module-bootstrap-context.xml

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8'?>



<!-- Use this file for beans to be loaded in whatever order Alfresco/Spring decides -->

<beans xmlns="http://www.springframework.org/schema/beans"

		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xmlns:context="http://www.springframework.org/schema/context"

		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd

				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">



	<!-- Enable Spring annotation scanning for classes in package -->

	<context:component-scan base-package="${platform-module.scan.packages}" />



</beans>