From fdfe4b1dc3a17aac960080113d10c0c822eaaf1d Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Wed, 6 Nov 2019 15:12:07 -0500
Subject: [PATCH] More renames due to shadow clashes

---
 dd-java-agent/dd-java-agent.gradle                         | 7 ++++---
 .../datadog/trace/{agent => bootstrap}/AgentBootstrap.java | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename dd-java-agent/src/main/java/datadog/trace/{agent => bootstrap}/AgentBootstrap.java (99%)

diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle
index 5b8c88c96b..95f7895f0f 100644
--- a/dd-java-agent/dd-java-agent.gradle
+++ b/dd-java-agent/dd-java-agent.gradle
@@ -62,9 +62,9 @@ jar {
 
   manifest {
     attributes(
-      "Main-Class": "datadog.trace.agent.AgentBootstrap",
-      "Agent-Class": "datadog.trace.agent.AgentBootstrap",
-      "Premain-Class": "datadog.trace.agent.AgentBootstrap",
+      "Main-Class": "datadog.trace.bootstrap.AgentBootstrap",
+      "Agent-Class": "datadog.trace.bootstrap.AgentBootstrap",
+      "Premain-Class": "datadog.trace.bootstrap.AgentBootstrap",
       "Can-Redefine-Classes": true,
       "Can-Retransform-Classes": true,
     )
@@ -102,6 +102,7 @@ modifyPom {
 }
 
 dependencies {
+  testCompile project(':dd-java-agent:agent-bootstrap')
   testCompile project(':dd-trace-api')
   testCompile project(':dd-trace-ot')
   testCompile project(':utils:gc-utils')
diff --git a/dd-java-agent/src/main/java/datadog/trace/agent/AgentBootstrap.java b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
similarity index 99%
rename from dd-java-agent/src/main/java/datadog/trace/agent/AgentBootstrap.java
rename to dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
index c353fdc501..64838d81ae 100644
--- a/dd-java-agent/src/main/java/datadog/trace/agent/AgentBootstrap.java
+++ b/dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
@@ -1,4 +1,4 @@
-package datadog.trace.agent;
+package datadog.trace.bootstrap;
 
 import java.io.BufferedReader;
 import java.io.File;