diff --git a/common/pom.xml b/common/pom.xml
index 9a25137355..2e80b7abd9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -39,39 +39,57 @@
       scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/common
     </developerConnection>
    </scm>
-   
-   <profiles>
-      <profile>
-         <id>patch</id>
-         <activation>
-            <activeByDefault>false</activeByDefault>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-patch-plugin</artifactId>
-                  <version>1.0</version>
-                  <configuration>
-                     <patches>
-                        <patch>common.patch</patch>
-                     </patches>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>patch</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                           <goal>apply</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
 
+   <build>
+      <plugins>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <configuration>
+                     <tasks>
+                        <delete dir="{project.build.directory}/generated-sources"/>
+                        <copy
+                           todir="${project.build.directory}/generated-sources/main/java">
+                           <fileset dir="src/main/external-java" />
+                        </copy>
+                     </tasks>
+                     <sourceRoot>
+                        ${project.build.directory}/generated-sources/main/java
+              </sourceRoot>
+                     <testSourceRoot>
+                        ${project.build.directory}/generated-sources/test/java
+              </testSourceRoot>
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-patch-plugin</artifactId>
+            <configuration>
+               <patchFile>src/main/patches/common.patch</patchFile>
+               <targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
+            </configuration>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>apply</goal>
+                  </goals>
+               </execution>
+            </executions>
+
+         </plugin>
+
+      </plugins>
+
+   </build>
    <dependencies>
 
       <!-- Solr -->
diff --git a/core/pom.xml b/core/pom.xml
index 2d23c54cf1..c95c3fefa4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,37 +40,58 @@
     </developerConnection>
    </scm>
    
-   <profiles>
-      <profile>
-         <id>patch</id>
-         <activation>
-            <activeByDefault>false</activeByDefault>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-patch-plugin</artifactId>
-                  <version>1.0</version>
+   <build>
+        <plugins>
+        
+                 <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
                   <configuration>
-                     <patches>
-                        <patch>core.patch</patch>
-                     </patches>
+                     <tasks>
+                     
+                        <delete dir="{project.build.directory}/generated-sources"/>
+                        <copy
+                           todir="${project.build.directory}/generated-sources/main/java">
+                           <fileset dir="src/main/external-java" />
+                        </copy>
+                     </tasks>
+                     <sourceRoot>
+                        ${project.build.directory}/generated-sources/main/java
+              </sourceRoot>
+                     <testSourceRoot>
+                        ${project.build.directory}/generated-sources/test/java
+              </testSourceRoot>
                   </configuration>
-                  <executions>
-                     <execution>
-                        <id>patch</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                           <goal>apply</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-patch-plugin</artifactId>
+            <configuration>
+               <patchFile>src/main/patches/core.patch</patchFile>
+               <targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
+            </configuration>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>apply</goal>
+                  </goals>
+               </execution>
+            </executions>
+
+         </plugin>
+        </plugins>
+   
+   </build>
+   
    <dependencies>
 
       <!-- Solr -->
diff --git a/pom.xml b/pom.xml
index 431069bf7c..10beb7e1a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
          <id>maven.dspace.org-snapshot</id>
          <name>DSpace Maven Repository</name>
          <url>scp://maven.dspace.org/var/maven/snapshot</url>
-         <uniqueVersion>false</uniqueVersion>
+         <uniqueVersion>true</uniqueVersion>
       </snapshotRepository>
    </distributionManagement>
 
@@ -122,8 +122,12 @@
                </execution>
             </executions>
          </plugin>
+
+
+
       </plugins>
    </build>
+    
    <dependencies>
       <dependency>
          <groupId>javax.servlet</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index ea503d9c4a..1ebd0fc965 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -38,38 +38,6 @@
       scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/server
     </developerConnection>
    </scm>
-   
-   <profiles>
-      <profile>
-         <id>patch</id>
-         <activation>
-            <activeByDefault>false</activeByDefault>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-patch-plugin</artifactId>
-                  <version>1.0</version>
-                  <configuration>
-                     <patches>
-                        <patch>webapp.patch</patch>
-                     </patches>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>patch</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                           <goal>apply</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
 
    <build>
       <plugins>
@@ -82,6 +50,53 @@
                <classesClassifier>classes</classesClassifier>
             </configuration>
          </plugin>
+         
+                  <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <configuration>
+                     <tasks>
+                     
+                        <delete dir="{project.build.directory}/generated-sources/main/java"/>
+                        <copy
+                           todir="${project.build.directory}/generated-sources/main/java">
+                           <fileset dir="src/main/external-java" />
+                        </copy>
+                     </tasks>
+                     <sourceRoot>
+                        ${project.build.directory}/generated-sources/main/java
+              </sourceRoot>
+                     <testSourceRoot>
+                        ${project.build.directory}/generated-sources/test/java
+              </testSourceRoot>
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-patch-plugin</artifactId>
+            <configuration>
+               <patchFile>src/main/patches/webapp.patch</patchFile>
+               <targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
+            </configuration>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>apply</goal>
+                  </goals>
+               </execution>
+            </executions>
+
+         </plugin>
+         
       </plugins>
    </build>
    
diff --git a/solrj/pom.xml b/solrj/pom.xml
index 634123f76f..040fa8fdce 100644
--- a/solrj/pom.xml
+++ b/solrj/pom.xml
@@ -41,37 +41,57 @@
     </developerConnection>
    </scm>
    
-	<profiles>
-		<profile>
-			<id>patch</id>
-			<activation>
-			     <activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-patch-plugin</artifactId>
-						<version>1.0</version>
-						<configuration>
-							<patches>
-								<patch>solrj.patch</patch>
-							</patches>
-						</configuration>
-						<executions>
-							<execution>
-								<id>patch</id>
-								<phase>process-sources</phase>
-								<goals>
-									<goal>apply</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+   <build>
+    <plugins>
+    
+             <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <configuration>
+                     <tasks>
+                     
+                        <delete dir="{project.build.directory}/generated-sources/main/java"/>
+                        <copy
+                           todir="${project.build.directory}/generated-sources/main/java">
+                           <fileset dir="src/main/external-java" />
+                        </copy>
+                     </tasks>
+                     <sourceRoot>
+                        ${project.build.directory}/generated-sources/main/java
+              </sourceRoot>
+                     <testSourceRoot>
+                        ${project.build.directory}/generated-sources/test/java
+              </testSourceRoot>
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-patch-plugin</artifactId>
+            <configuration>
+               <patchFile>src/main/patches/solrj.patch</patchFile>
+               <targetDirectory>${project.build.directory}/generated-sources/main/java</targetDirectory>
+            </configuration>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>apply</goal>
+                  </goals>
+               </execution>
+            </executions>
+
+         </plugin>
+    </plugins>
+   
+   </build>
 	
 	<dependencies>