Merge branch 'xray-gettingstarted' into xray

mwunderl · mwunderl · commit cab263347647 · 2018-04-03T00:16:45.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -49,7 +49,7 @@ dependencies {
 dependencyManagement {
     imports {
         mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")
-        mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.2.0")
+        mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.3.1")
     }
 }
 task wrapper(type: Wrapper) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ dependencies {`
`49`	`49`	`dependencyManagement {`
`50`	`50`	`imports {`
`51`	`51`	`mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")`
`52`		`- mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.2.0")`
	`52`	`+ mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.3.1")`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`task wrapper(type: Wrapper) {`