From effe6e8b0442eaa22a6cd38cd7bb4ec351058318 Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler@newrelic.com>
Date: Wed, 2 Aug 2017 12:48:48 -0700
Subject: [PATCH 1/2] Remove pom dependencies for shadow artifacts.

---
 .circleci/config.yml               |  2 +-
 dd-java-agent/dd-java-agent.gradle |  5 +++++
 dd-trace/dd-trace.gradle           | 15 +++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08eb35ce14..7298a9aa5f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,5 +54,5 @@ jobs:
                 -PbintrayUser=${BINTRAY_USER} \
                 -PbintrayApiKey=${BINTRAY_API_KEY} \
                 -PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \
-                artifactoryPublish
+                artifactoryPublish --max-workers=1
             fi
diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle
index ae6df18820..79812c9094 100644
--- a/dd-java-agent/dd-java-agent.gradle
+++ b/dd-java-agent/dd-java-agent.gradle
@@ -117,3 +117,8 @@ shadowJar {
     exclude(dependency('org.projectlombok:lombok:1.16.18'))
   }
 }
+
+// We don't want bundled dependencies to show up in the pom.
+modifyPom {
+  dependencies.removeAll { true }
+}
diff --git a/dd-trace/dd-trace.gradle b/dd-trace/dd-trace.gradle
index 8e462f320e..1f74fbde6a 100644
--- a/dd-trace/dd-trace.gradle
+++ b/dd-trace/dd-trace.gradle
@@ -24,17 +24,22 @@ dependencies {
   compile group: 'io.opentracing', name: 'opentracing-noop', version: '0.30.0'
   compile group: 'io.opentracing', name: 'opentracing-util', version: '0.30.0'
   compile group: 'io.opentracing.contrib', name: 'opentracing-tracerresolver', version: '0.1.0'
+
   compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8'
   compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.8.8'
   compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
   compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
+  
+  testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+
   testCompile group: 'junit', name: 'junit', version: '4.12'
   testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.2'
   testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.22'
-  testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+
   testCompile group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.4'
   testCompile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.4'
   testCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.6'
+
   jmh 'commons-io:commons-io:2.4'
 }
 
@@ -50,9 +55,6 @@ shadowJar {
   // Don't relocate slf4j or opentracing deps.
   relocate 'com.fasterxml', 'dd.deps.com.fasterxml'
   relocate 'com.google', 'dd.deps.com.google'
-  relocate 'javassist', 'dd.deps.javassist'
-  relocate 'org.jboss.byteman', 'dd.deps.org.jboss.byteman'
-  relocate 'org.reflections', 'dd.deps.org.reflections'
   relocate 'org.yaml', 'dd.deps.org.yaml'
 
   dependencies {
@@ -60,6 +62,11 @@ shadowJar {
   }
 }
 
+// We don't want bundled dependencies to show up in the pom.
+modifyPom {
+  dependencies.removeAll { true }
+}
+
 jmh {
   timeUnit = 'us' // Output time unit. Available time units are: [m, s, ms, us, ns].
   benchmarkMode = ['thrpt', 'avgt']

From 92556f3222f1927b1bbf4316395d80c2aace6929 Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler@newrelic.com>
Date: Wed, 2 Aug 2017 12:59:19 -0700
Subject: [PATCH 2/2] Release 0.1.2

---
 dd-trace-java.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle
index 39bb15953e..d115e86afe 100644
--- a/dd-trace-java.gradle
+++ b/dd-trace-java.gradle
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
   group = 'com.datadoghq'
-  version = '0.1.2-SNAPSHOT'
+  version = '0.1.2'
 }
 
 repositories {