From 886b5b6756d5d6016d493213eeff5342232d52b4 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Thu, 9 May 2013 21:29:25 +0000
Subject: [PATCH] HADOOP-9550. Remove aspectj dependency. (kkambatl via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480784 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-client/pom.xml                           |  4 ----
 hadoop-common-project/hadoop-common/CHANGES.txt |  2 ++
 hadoop-project/pom.xml                          | 10 ----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index af41e003693..8f086acdcaa 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -99,10 +99,6 @@
           <groupId>org.eclipse.jdt</groupId>
           <artifactId>core</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.aspectj</groupId>
-          <artifactId>aspectjrt</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.avro</groupId>
           <artifactId>avro-ipc</artifactId>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 528de3b20ad..7cd4d658d6d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -148,6 +148,8 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9455. HADOOP_CLIENT_OPTS appended twice causes JVM failures.
     (Chris Nauroth via suresh)
 
+    HADOOP-9550. Remove aspectj dependency. (kkambatl via tucu)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 86df21bd7b1..7be88ab8278 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -575,16 +575,6 @@
         <artifactId>jackson-xc</artifactId>
         <version>1.8.8</version>
       </dependency>
-      <dependency>
-        <groupId>org.aspectj</groupId>
-        <artifactId>aspectjtools</artifactId>
-        <version>1.6.5</version>
-      </dependency>
-      <dependency>
-        <groupId>org.aspectj</groupId>
-        <artifactId>aspectjrt</artifactId>
-        <version>1.6.5</version>
-      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>