From 02e36ee83169a651180e8a104b4f05968981a8fa Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Fri, 4 Dec 2015 09:12:04 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    119501 jphuynh:
 ACE-4799: Created an alfresco-one-installer-resources jar equivalent to the
 community version but with the correct alfresco-global.properties.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9a967a06..4702a3e90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,9 @@
         <artifactId>alfresco-enterprise-packaging</artifactId>
         <version>5.1.1-SNAPSHOT</version>
     </parent>
-    <artifactId>alfresco-one-platform-installer</artifactId>
-    <packaging>pom</packaging>
-    <name>Alfresco Platform Enterprise Installers</name>
+    <artifactId>alfresco-one-installer-resources</artifactId>
+    <packaging>jar</packaging>
+    <name>Alfresco One Installer Resources + Platform Installers</name>
 
     <properties>
         <binaries.folder>${user.home}/binaries</binaries.folder>
@@ -249,6 +249,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -266,6 +272,7 @@
                                     <artifactId>alfresco-installer-resources</artifactId>
                                     <version>${project.version}</version>
                                     <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                    <excludes>bitrock/bitrock/alfresco/shared/alfresco-global.properties</excludes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
@@ -296,27 +303,6 @@
                 </executions>
             </plugin>
 
-            <!-- Override local resources - alfresco-global.properties, etc. -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>override-local-resources</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <nonFilteredFileExtensions>
-                                <nonFilteredFileExtension>properties</nonFilteredFileExtension>
-                            </nonFilteredFileExtensions>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>