From f2fee74880881fcdb7ca5174166b31116b453aa6 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 26 Nov 2015 15:31:09 +0000
Subject: [PATCH] Excludes aspectjrt from javanica

The aspectjweaver jar includes all of aspectjrt, and the former is
used at runtime in a number of places (tests fail if you remove
it). Both are not needed so we have picked one (the other one than
recommended in gh-666).

Fixes gh-666
---
 pom.xml                           | 4 ++++
 spring-cloud-netflix-core/pom.xml | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b08c418b..9cd5d976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,6 +376,10 @@
 						<groupId>com.google.code.findbugs</groupId>
 						<artifactId>annotations</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.aspectj</groupId>
+						<artifactId>aspectjrt</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index ed1623a4..d4a9e575 100644
--- a/spring-cloud-netflix-core/pom.xml
+++ b/spring-cloud-netflix-core/pom.xml
@@ -208,15 +208,10 @@
 			<artifactId>h2</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>