From a5d56d8724f0d16e04dd4d06aa6a3c42bf57346d Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Thu, 2 Nov 2017 15:06:07 -0500
Subject: [PATCH] Update to Aspectj 1.8.12

Fixes gh-4778
---
 aspects/pom.xml                    | 2 +-
 config/pom.xml                     | 2 +-
 core/pom.xml                       | 2 +-
 gradle/javaprojects.gradle         | 2 +-
 itest/context/pom.xml              | 2 +-
 samples/javaconfig/aspectj/pom.xml | 2 +-
 samples/xml/aspectj/pom.xml        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aspects/pom.xml b/aspects/pom.xml
index 1c6477cb5d..d3d7ce8de2 100644
--- a/aspects/pom.xml
+++ b/aspects/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.12</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/config/pom.xml b/config/pom.xml
index cdf23b9907..e9e3168e67 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.12</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/core/pom.xml b/core/pom.xml
index ec871c8561..b410c2b3f8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.12</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 12e100510f..7b62ca4f76 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -9,7 +9,7 @@ sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
 ext.apacheDsVersion = '1.5.5'
-ext.aspectjVersion = '1.8.4'
+ext.aspectjVersion = '1.8.12'
 ext.casClientVersion = '3.4.1'
 ext.cglibVersion = '3.1'
 ext.commonsCodecVersion = '1.10'
diff --git a/itest/context/pom.xml b/itest/context/pom.xml
index 89555addde..734da404e7 100644
--- a/itest/context/pom.xml
+++ b/itest/context/pom.xml
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/samples/javaconfig/aspectj/pom.xml b/samples/javaconfig/aspectj/pom.xml
index d43478489c..424a771798 100644
--- a/samples/javaconfig/aspectj/pom.xml
+++ b/samples/javaconfig/aspectj/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.12</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
diff --git a/samples/xml/aspectj/pom.xml b/samples/xml/aspectj/pom.xml
index 2362f61dfc..0e3f951297 100644
--- a/samples/xml/aspectj/pom.xml
+++ b/samples/xml/aspectj/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.12</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>