Skip to content

Commit 1d5eb2e

Browse files
committed
Making aws-wrap instrumentation depend on proprietary jars
1 parent 5e1effd commit 1d5eb2e

File tree

3 files changed

+29
-9
lines changed

3 files changed

+29
-9
lines changed
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## Building
2+
3+
New Relic does not distribute the jar(s) required to build this instrumentation module nor are they available from a public repository such as Maven Central or jcenter.
4+
5+
To build this instrumentation module you must provide the jar(s) and place them into the `/lib` subdirectory as follows:
6+
7+
```groovy
8+
instrumentation/aws-wrap-0.7.0/lib/aws-wrap_2.10-0.9.2.jar
9+
```
10+
11+
## Required jar versions
12+
`aws-wrap_2.10` - 0.9.0 or above

instrumentation/aws-wrap-0.7.0/build.gradle

+15-9
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,33 @@ apply plugin: 'scala'
22

33
isScalaProjectEnabled(project, "scala-2.10")
44

5-
repositories {
6-
maven {
7-
// repo for aws-wrap
8-
url 'https://dl.bintray.com/dwhjames/maven'
9-
}
10-
}
11-
125
dependencies {
136
implementation(project(":newrelic-api"))
147
implementation(project(":agent-bridge"))
158
implementation(project(":newrelic-weaver-api"))
169
implementation(project(":newrelic-weaver-scala-api"))
17-
// https://dl.bintray.com/dwhjames/maven/com/github/dwhjames/aws-wrap_2.10/0.8.0/aws-wrap_2.10-0.8.0.jar
18-
implementation("com.github.dwhjames:aws-wrap_2.10:0.9.2")
1910
implementation("org.scala-lang:scala-library:2.10.7")
11+
// com.github.dwhjames:aws-wrap_2.10:0.9.2 is expected to be in the lib folder
12+
implementation(fileTree(include: ["*.jar"], dir: "lib"))
2013

2114
testImplementation("com.amazonaws:aws-java-sdk:1.10.64")
2215
testImplementation(project(":instrumentation:aws-java-sdk-s3-1.2.13")){ transitive = false }
2316
}
2417

18+
def shouldBuild = fileTree(include: ["*.jar"], dir: "lib").size() > 0
19+
20+
compileJava {
21+
enabled(shouldBuild)
22+
}
23+
24+
compileTestJava {
25+
enabled(shouldBuild)
26+
}
27+
28+
tasks.getByName("writeCachedWeaveAttributes").enabled(shouldBuild)
29+
2530
jar {
31+
enabled(shouldBuild)
2632
manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.aws-wrap-0.7.0' }
2733
}
2834

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)