diff --git a/instrumentation/anorm-2.0/build.gradle b/instrumentation/anorm-2.0/build.gradle index c70f86f64d..7178e0be53 100644 --- a/instrumentation/anorm-2.0/build.gradle +++ b/instrumentation/anorm-2.0/build.gradle @@ -2,7 +2,8 @@ apply plugin: 'scala' repositories { maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' + mavenCentral() + url 'https://repo.typesafe.com/typesafe/maven-releases/' } } @@ -35,7 +36,7 @@ verifyInstrumentation { passes 'com.typesafe.play:anorm_2.11:[2.0,2.3-M1)' exclude 'com.typesafe.play:anorm_2.11:2.3.2-RC1' - exclude 'com.typesafe.play:anorm_2.11:2.3.8-4c54458f5e54ff63ff58554de5f6099ecede7cd1' +// exclude 'com.typesafe.play:anorm_2.11:2.3.8-4c54458f5e54ff63ff58554de5f6099ecede7cd1' } diff --git a/instrumentation/anorm-2.3/build.gradle b/instrumentation/anorm-2.3/build.gradle index e25084baa2..383afb8fdc 100644 --- a/instrumentation/anorm-2.3/build.gradle +++ b/instrumentation/anorm-2.3/build.gradle @@ -2,7 +2,8 @@ apply plugin: 'scala' repositories { maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' + mavenCentral() + url 'https://repo.typesafe.com/typesafe/maven-releases/' } } diff --git a/instrumentation/anorm-2.4/build.gradle b/instrumentation/anorm-2.4/build.gradle index e96a6f2196..22f48d882b 100644 --- a/instrumentation/anorm-2.4/build.gradle +++ b/instrumentation/anorm-2.4/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'scala' repositories { maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' + mavenCentral() + url 'https://repo.typesafe.com/typesafe/maven-releases/' } } - dependencies { implementation(project(":newrelic-api")) implementation(project(":agent-bridge")) diff --git a/instrumentation/aws-wrap-0.7.0/build.gradle b/instrumentation/aws-wrap-0.7.0/build.gradle index 61681ed1b1..4a7a8cb22d 100644 --- a/instrumentation/aws-wrap-0.7.0/build.gradle +++ b/instrumentation/aws-wrap-0.7.0/build.gradle @@ -1,33 +1,34 @@ apply plugin: 'scala' + repositories { - maven { - // repo for aws-wrap - url 'https://dl.bintray.com/dwhjames/maven' - } + maven { + // repo for aws-wrap + url 'https://dl.bintray.com/dwhjames/maven' + } } dependencies { - implementation(project(":newrelic-api")) - implementation(project(":agent-bridge")) - implementation(project(":newrelic-weaver-api")) - implementation(project(":newrelic-weaver-scala-api")) - // https://dl.bintray.com/dwhjames/maven/com/github/dwhjames/aws-wrap_2.10/0.8.0/aws-wrap_2.10-0.8.0.jar - implementation("com.github.dwhjames:aws-wrap_2.10:0.8.0") - implementation("org.scala-lang:scala-library:2.10.7") + implementation(project(":newrelic-api")) + implementation(project(":agent-bridge")) + implementation(project(":newrelic-weaver-api")) + implementation(project(":newrelic-weaver-scala-api")) + // https://dl.bintray.com/dwhjames/maven/com/github/dwhjames/aws-wrap_2.10/0.8.0/aws-wrap_2.10-0.8.0.jar + implementation("com.github.dwhjames:aws-wrap_2.10:0.9.2") + implementation("org.scala-lang:scala-library:2.10.7") - testImplementation("com.amazonaws:aws-java-sdk:1.10.64") - testImplementation(project(":instrumentation:aws-java-sdk-s3-1.2.13")){ transitive = false } + testImplementation("com.amazonaws:aws-java-sdk:1.10.64") + testImplementation(project(":instrumentation:aws-java-sdk-s3-1.2.13")) { transitive = false } } jar { - manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.aws-wrap-0.7.0' } + manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.aws-wrap-0.7.0' } } verifyInstrumentation { - passesOnly 'com.github.dwhjames:aws-wrap_2.10:[0.7.0,)' - passesOnly 'com.github.dwhjames:aws-wrap_2.11:[0.7.0,)' - excludeRegex '.*v0.8.0.*' + passesOnly 'com.github.dwhjames:aws-wrap_2.10:[0.7.0,)' + passesOnly 'com.github.dwhjames:aws-wrap_2.11:[0.7.0,)' + excludeRegex '.*v0.8.0.*' } site { diff --git a/instrumentation/play-2.3/build.gradle b/instrumentation/play-2.3/build.gradle index b918096424..7cf6b2ed95 100644 --- a/instrumentation/play-2.3/build.gradle +++ b/instrumentation/play-2.3/build.gradle @@ -1,35 +1,31 @@ apply plugin: 'scala' -repositories { - maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' - } -} dependencies { - implementation(project(":newrelic-api")) implementation(project(":agent-bridge")) implementation(project(":newrelic-weaver-api")) - implementation("com.typesafe.play:play_2.10:2.3.0") + implementation("com.typesafe.play:play_2.10:2.3.9") implementation("org.scala-lang:scala-library:2.10.7") } jar { - manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.play-2.3', - 'Implementation-Title-Alias': 'play2_instrumentation' } + manifest { + attributes 'Implementation-Title': 'com.newrelic.instrumentation.play-2.3', + 'Implementation-Title-Alias': 'play2_instrumentation' + } } verifyInstrumentation { - // compiled with scala 2.10 - passes 'com.typesafe.play:play_2.10:[2.3.0,2.4.0-M1)' - fails 'com.typesafe.play:play_2.10:2.2.0' - // compiled with scala 2.11 - passes 'com.typesafe.play:play_2.11:[2.3.0,2.4.0-M1)' - // some random snapshot - exclude 'com.typesafe.play:play_2.10:2.3-20131213005945Z' - // build snapshots - excludeRegex '.*-[a-z0-9]{38}[a-z0-9]*$' - excludeRegex '.*-RC[0-9]+$' + // compiled with scala 2.10 + passes 'com.typesafe.play:play_2.10:[2.3.0,2.4.0-M1)' + fails 'com.typesafe.play:play_2.10:2.2.0' + // compiled with scala 2.11 + passes 'com.typesafe.play:play_2.11:[2.3.0,2.4.0-M1)' + // some random snapshot + exclude 'com.typesafe.play:play_2.10:2.3-20131213005945Z' + // build snapshots + excludeRegex '.*-[a-z0-9]{38}[a-z0-9]*$' + excludeRegex '.*-RC[0-9]+$' } site { diff --git a/instrumentation/play-2.6.13/build.gradle b/instrumentation/play-2.6.13/build.gradle index 14f95dd1a8..4bb4574f53 100644 --- a/instrumentation/play-2.6.13/build.gradle +++ b/instrumentation/play-2.6.13/build.gradle @@ -4,19 +4,13 @@ import play.routes.compiler.RoutesCompiler$ import scala.collection.JavaConversions apply plugin: 'scala' - -repositories { - maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' - } -} +scala.zincVersion = "1.2.5" buildscript { dependencies { classpath 'com.typesafe.play:routes-compiler_2.11:2.6.0' } repositories { - jcenter() mavenCentral() } } diff --git a/instrumentation/play-2.6/build.gradle b/instrumentation/play-2.6/build.gradle index 024070aa9a..86dda3f8e1 100644 --- a/instrumentation/play-2.6/build.gradle +++ b/instrumentation/play-2.6/build.gradle @@ -4,19 +4,13 @@ import play.routes.compiler.RoutesCompiler$ import scala.collection.JavaConversions apply plugin: 'scala' - -repositories { - maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' - } -} +scala.zincVersion = "1.2.5" buildscript { dependencies { classpath 'com.typesafe.play:routes-compiler_2.11:2.6.0' } repositories { - jcenter() mavenCentral() } } diff --git a/instrumentation/play-2.7/build.gradle b/instrumentation/play-2.7/build.gradle index 8543c0a981..32ca04b40c 100644 --- a/instrumentation/play-2.7/build.gradle +++ b/instrumentation/play-2.7/build.gradle @@ -4,19 +4,13 @@ import play.routes.compiler.RoutesCompiler$ import scala.collection.JavaConversions apply plugin: 'scala' - -repositories { - maven { - url 'https://dl.bintray.com/typesafe/maven-releases/' - } -} +scala.zincVersion = "1.2.5" buildscript { dependencies { classpath 'com.typesafe.play:routes-compiler_2.11:2.7.0-M2' } repositories { - jcenter() mavenCentral() } } @@ -58,7 +52,7 @@ verifyInstrumentation { // build snapshots excludeRegex '.*-[0-9]{4}-[0-9]{2}-[0-9]{2}-[a-z0-9]{7}$' // Release Candidates - excludeRegex'.*-RC[0-9]*' + excludeRegex '.*-RC[0-9]*' } test {