Merge branch 'develop' into stable

pom.xml

@@ -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>
 
@@ -40,27 +60,6 @@
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
-		</dependency>
-		
-		<!-- ACS Provided Libraries -->
-		<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>
 	</dependencies>
 
 	<build>
@@ -78,9 +77,6 @@
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-module-tile:[1.0.0,2.0.0)</tile>
 						<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-self-it-tile
 						<tile>com.inteligr8.ootbee:beedk-acs-platform-self-it-tile:[1.0.0,2.0.0)</tile> -->
-						
-						<!-- Distribution Management -->
-						<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
 					</tiles>
 				</configuration>
 			</plugin>
@@ -103,7 +99,7 @@
 	
 	<repositories>
 		<repository>
-			<id>inteligr8-releases</id>
+			<id>inteligr8-public</id>
 			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
 		</repository>
 		<repository>
@@ -114,8 +110,19 @@
 
 	<pluginRepositories>
 		<pluginRepository>
-			<id>inteligr8-releases</id>
+			<id>inteligr8-public</id>
 			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
 		</pluginRepository>
 	</pluginRepositories>
+
+	<distributionManagement>
+		<repository>
+			<id>inteligr8-releases</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
+		</repository>
+		<snapshotRepository>
+			<id>inteligr8-snapshots</id>
+			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>

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

@@ -1,2 +0,0 @@
-
-platform-module.scan.packages=com.inteligr8.preventStartupFailure

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

@@ -1,13 +0,0 @@
-<?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>