[libspring-java] 14/19: Removed the AspectJ patch

[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 174db31aa5eda324fa7784dcf7a6f631b7a31a97
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 3 15:21:25 2014 +0100

    Removed the AspectJ patch
---
 debian/patches/0006_aspectj_classpath.diff | 30 ------------------------------
 debian/patches/series                      |  1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/0006_aspectj_classpath.diff b/debian/patches/0006_aspectj_classpath.diff
deleted file mode 100644
index 1a2ef9c..0000000
--- a/debian/patches/0006_aspectj_classpath.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix iajc (AspectJ compiler) classpath:
- - include JPA API
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-06-20
-Forwarded: not-needed
---- a/projects/org.springframework.aspects/build.xml
-+++ b/projects/org.springframework.aspects/build.xml
-@@ -1,9 +1,21 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<project name="org.springframework.aspects">
-+<project name="org.springframework.aspects" xmlns:ivy="antlib:org.apache.ivy.ant">
- 	<property file="${basedir}/../build.properties"/>
- 	<property file="${basedir}/../build.versions"/>
- 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
- 	<import file="${basedir}/../spring-build/aspect/default.xml"/>
-+
-+	<target name="resolve.compile" depends="resolve.init">
-+		<ivy:cachepath resolveId="compile.classpath.pre" pathid="compile.classpath.pre"
-+                                conf="compile,optional,provided,dm-server-provided" type="jar" log="download-only"/>
-+
-+		<path id="compile.classpath">
-+			<path refid="compile.classpath.pre"/>
-+			<pathelement location="/usr/share/java/commons-logging.jar"/>
-+			<pathelement location="/usr/share/java/glassfish-jpa.jar"/>
-+		</path>
-+	</target>
-+
- 	
- 	<target name="test.do" depends="ivy.init, resolve.test, resolve.aspects, compile.init, test.init" if="test.exists">
- 		<path id="test.compile.classpath">
diff --git a/debian/patches/series b/debian/patches/series
index 4d30582..32c04d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0003_no_ibm_websphere.diff
 0005_commonj.diff
-0006_aspectj_classpath.diff
 0007_remove_backport_util_concurrent.patch
 0008_jpa_20_api.diff
 0009_hibernate_validator_41.diff

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