[libspring-java] 11/19: Updated the patch removing the WebSphere support

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit 2d7a5f9ffa27a0aa5c6eb812610f56711d542491
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 3 15:17:24 2014 +0100

    Updated the patch removing the WebSphere support
---
 debian/patches/0003_no_ibm_websphere.diff | 39 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index 7246f52..9240310 100644
--- a/debian/patches/0003_no_ibm_websphere.diff
+++ b/debian/patches/0003_no_ibm_websphere.diff
@@ -2,21 +2,26 @@ Description: IBM Websphere is non-free (remove it from source)
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2010-06-20
 Forwarded: not-needed
---- a/projects/org.springframework.transaction/build.xml
-+++ b/projects/org.springframework.transaction/build.xml
-@@ -4,4 +4,15 @@
- 	<property file="${basedir}/../build.versions"/>
- 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
- 	<import file="${basedir}/../spring-build/standard/default.xml"/>
+--- a/build.gradle
++++ b/build.gradle
+@@ -364,10 +364,19 @@
+ 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+ 		optional("javax.resource:connector-api:1.5")
+ 		optional("javax.ejb:ejb-api:3.0")
+-		optional("com.ibm.websphere:uow:6.0.2.17")
++		//optional("com.ibm.websphere:uow:6.0.2.17")
+ 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
+ 		testCompile("javax.persistence:persistence-api:1.0")
+ 	}
 +
-+        <macrodef name="pre-compile">
-+                <attribute name="classpath.id"/>
-+                <attribute name="input.dir"/>
-+                <attribute name="output.dir"/>
-+                <attribute name="resources.dir"/>
-+                <sequential>
-+			<delete file="${basedir}/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java"/>
-+		</sequential>
-+        </macrodef>
-+
- </project>
++	sourceSets {
++		main {
++			java {
++				srcDir 'src/java'
++				exclude '**/WebSphereUowTransactionManager.java'
++			}
++		}
++	}
+ }
+ 
+ project("spring-oxm") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git