Skip to content

Commit

Permalink
Merge pull request #634 from newrelic/349-completablefuture
Browse files Browse the repository at this point in the history
issue #344 completable future tokens not expired correctly
  • Loading branch information
twcrone authored Jan 10, 2022
2 parents b0f2663 + 9c91864 commit a2b1d34
Show file tree
Hide file tree
Showing 12 changed files with 561 additions and 624 deletions.
4 changes: 0 additions & 4 deletions functional_test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import com.nr.builder.JarUtil

evaluationDependsOn(":newrelic-agent") // This is important because we need newrelic-agent to be configured before functional_test so the correct ("unversioned") jar name gets used

apply plugin: 'scala'

jar {
manifest { attributes 'Premain-Class': 'com.newrelic.agent.test.agent.FunctionalAgent' }
}
Expand All @@ -17,8 +15,6 @@ dependencies {
implementation(project(":agent-bridge-datastore"))
implementation(project(":newrelic-weaver"))

implementation("org.scala-lang:scala-library:2.10.7")

testImplementation(project(":functional_test:weave_test_impl"))

// the newrelic-agent test classes
Expand Down
Loading

0 comments on commit a2b1d34

Please sign in to comment.