From ba34795ef650932d31fec233f32fb8c6c62b4b81 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Thu, 9 Jun 2016 14:51:27 +0100
Subject: [PATCH 1/8] Remove unwanted jar such as jetty

---
 search-services/alfresco-solr/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index cf266ba30..8d45163a1 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -181,6 +181,7 @@
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
+                            <excludeTransitive>true</excludeTransitive>
                         </configuration>
                     </execution>
                 </executions>

From 21fa9d972775465f947b2ef00db37829d1553208 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Thu, 9 Jun 2016 21:56:56 +0100
Subject: [PATCH 2/8] Amend pom to exclude libs that are not needed such as
 jetty

---
 search-services/alfresco-solr/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index 8d45163a1..d63d026a7 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -176,12 +176,11 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeScope>compile</includeScope>
                             <outputDirectory>${project.build.outputDirectory}/libs</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
-                            <excludeTransitive>true</excludeTransitive>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -207,9 +206,6 @@
                         </goals>
                         <configuration>
                             <classifier>libs</classifier>
-                            <includes>
-                                <include>libs/*.jar</include>
-                            </includes>
                         </configuration>
                     </execution>
                 </executions>

From 32cb67cd697af6d5d87b04f4b9532cac409220b9 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Fri, 10 Jun 2016 10:45:21 +0100
Subject: [PATCH 3/8] Added list of of libs to exclude instead of using scope
 to filter out the unwanted libs

---
 search-services/alfresco-solr/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index d63d026a7..5fa38510c 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -180,7 +180,6 @@
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
-                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -206,6 +205,12 @@
                         </goals>
                         <configuration>
                             <classifier>libs</classifier>
+                            <excludes>
+                                <exclude>**/jetty-*.jar</exclude>
+                                <exclude>**/junit*.jar</exclude>
+                                <exclude>**/mock*.jar</exclude>
+                                <exclude>**/opencmis*.jar</exclude>
+                            </excludes>
                         </configuration>
                     </execution>
                 </executions>

From b578b01fac486f4e52ee4f7a9a553cac91d4dee2 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Fri, 10 Jun 2016 11:28:41 +0100
Subject: [PATCH 4/8] Remove contents of org solr folder as it is a surplus

---
 search-services/alfresco-solr/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index 5fa38510c..e41aa3e86 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -206,6 +206,8 @@
                         <configuration>
                             <classifier>libs</classifier>
                             <excludes>
+                                <exclude>solr/**/*</exclude>
+                                <exclude>org/**/*</exclude>
                                 <exclude>**/jetty-*.jar</exclude>
                                 <exclude>**/junit*.jar</exclude>
                                 <exclude>**/mock*.jar</exclude>

From 27cc6a36d4fa8d91b57433339c98e0f162a0d5a7 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Thu, 9 Jun 2016 14:51:27 +0100
Subject: [PATCH 5/8] Remove unwanted jar such as jetty

---
 search-services/alfresco-solr/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index cf266ba30..8d45163a1 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -181,6 +181,7 @@
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
+                            <excludeTransitive>true</excludeTransitive>
                         </configuration>
                     </execution>
                 </executions>

From 981f32fc19a1e0f95911849d8dae00398cb15b86 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Thu, 9 Jun 2016 21:56:56 +0100
Subject: [PATCH 6/8] Amend pom to exclude libs that are not needed such as
 jetty

---
 search-services/alfresco-solr/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index 8d45163a1..d63d026a7 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -176,12 +176,11 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeScope>compile</includeScope>
                             <outputDirectory>${project.build.outputDirectory}/libs</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
-                            <excludeTransitive>true</excludeTransitive>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -207,9 +206,6 @@
                         </goals>
                         <configuration>
                             <classifier>libs</classifier>
-                            <includes>
-                                <include>libs/*.jar</include>
-                            </includes>
                         </configuration>
                     </execution>
                 </executions>

From 9f851d3485148f23f8e0c8e3e8a22a4a54700487 Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Fri, 10 Jun 2016 10:45:21 +0100
Subject: [PATCH 7/8] Added list of of libs to exclude instead of using scope
 to filter out the unwanted libs

---
 search-services/alfresco-solr/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index d63d026a7..5fa38510c 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -180,7 +180,6 @@
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
-                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -206,6 +205,12 @@
                         </goals>
                         <configuration>
                             <classifier>libs</classifier>
+                            <excludes>
+                                <exclude>**/jetty-*.jar</exclude>
+                                <exclude>**/junit*.jar</exclude>
+                                <exclude>**/mock*.jar</exclude>
+                                <exclude>**/opencmis*.jar</exclude>
+                            </excludes>
                         </configuration>
                     </execution>
                 </executions>

From dd554d630b5bf4a27b19329df90f850c8dccea2b Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@alfresco.com>
Date: Fri, 10 Jun 2016 11:28:41 +0100
Subject: [PATCH 8/8] Remove contents of org solr folder as it is a surplus

---
 search-services/alfresco-solr/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/search-services/alfresco-solr/pom.xml b/search-services/alfresco-solr/pom.xml
index 5fa38510c..e41aa3e86 100644
--- a/search-services/alfresco-solr/pom.xml
+++ b/search-services/alfresco-solr/pom.xml
@@ -206,6 +206,8 @@
                         <configuration>
                             <classifier>libs</classifier>
                             <excludes>
+                                <exclude>solr/**/*</exclude>
+                                <exclude>org/**/*</exclude>
                                 <exclude>**/jetty-*.jar</exclude>
                                 <exclude>**/junit*.jar</exclude>
                                 <exclude>**/mock*.jar</exclude>