Skip to content

Exclude akka http build outside the CI #9192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+65 −67
Draft

Exclude akka http build outside the CI #9192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 65 additions & 67 deletions dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,90 +3,88 @@ ext {
minJavaVersionForTests = JavaVersion.VERSION_11
}

apply from: "$rootDir/gradle/java.gradle"
apply plugin: 'scala'
apply plugin: 'call-site-instrumentation'
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just put all the module under this if. The diff looks more because of the formatting but it's just that


apply from: "$rootDir/gradle/java.gradle"
apply plugin: 'scala'
apply plugin: 'call-site-instrumentation'

muzzle {
pass {
group = 'com.typesafe.akka'
module = 'akka-http_2.13'
versions = "[10.6.0,)"
javaVersion = "11"
extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0'

if (project.rootProject.hasProperty("akkaRepositoryToken")) {
muzzle {
pass {
group = 'com.typesafe.akka'
module = 'akka-http_2.13'
versions = "[10.6.0,)"
javaVersion = "11"
extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0'

extraRepository('akka', "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure")
} else {
extraRepository('akka', 'https://repo.akka.io/maven')
assertInverse = true
}

assertInverse = true
}

}

repositories {
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
maven {
url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure"
}
} else {
maven {
url "https://repo.akka.io/maven"
repositories {
if (project.rootProject.hasProperty("akkaRepositoryToken")) {
maven {
url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure"
}
} else {
maven {
url "https://repo.akka.io/maven"
}
}
}
}

addTestSuiteForDir('latestDepTest', 'test')
addTestSuiteForDir('latestDepTest', 'test')

[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each {
it.configure {
setJavaVersion(it, 11)
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each {
it.configure {
setJavaVersion(it, 11)
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}
}

compileTestGroovy {
javaLauncher = getJavaLauncherFor(11)
dependsOn compileTestScala
classpath += files(compileTestScala.destinationDirectory)
}
compileTestGroovy {
javaLauncher = getJavaLauncherFor(11)
dependsOn compileTestScala
classpath += files(compileTestScala.destinationDirectory)
}

compileLatestDepTestGroovy {
javaLauncher = getJavaLauncherFor(11)
dependsOn compileLatestDepTestScala
classpath += files(compileLatestDepTestScala.destinationDirectory)
}
compileLatestDepTestGroovy {
javaLauncher = getJavaLauncherFor(11)
dependsOn compileLatestDepTestScala
classpath += files(compileLatestDepTestScala.destinationDirectory)
}

dependencies {
main_java11CompileOnly libs.scala213
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'
dependencies {
main_java11CompileOnly libs.scala213
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'

//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '10.6.0'
testImplementation libs.scala213
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '10.6.0'
testImplementation libs.scala213
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')

latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-pki_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-protobuf-v3_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '+'
latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.0.+'
}
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-pki_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-protobuf-v3_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '+'
latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.0.+'
}

configurations.getByName("latestDepTestRuntimeClasspath").resolutionStrategy {
it.force libs.slf4j
configurations.getByName("latestDepTestRuntimeClasspath").resolutionStrategy {
it.force libs.slf4j
}
}