Skip to content

Commit cd68061

Browse files
authored
Update docs about needing java 11 to build (#412)
1 parent f50a410 commit cd68061

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
Pull requests for bug fixes are welcome, but before submitting new features or changes to current functionality [open an issue](https://github.com/open-telemetry/opentelemetry-auto-instr-java/issues/new)
44
and discuss your ideas or propose the changes you wish to make. After a resolution is reached a PR can be submitted for review.
55

6-
In order to fully build and test this whole repository you need the following:
7-
* Installed both JDK 8 and 9.
8-
* Java 8 should be set as default: `java -version` should give you version 8.
9-
* Defined environment variables `JAVA_8_HOME` and `JAVA_9_HOME` which point to the corresponding java homes.
6+
In order to build and test this whole repository you need JDK 11+.
7+
Some instrumentations and tests may put constraints on which java versions they support.
8+
See [Executing tests with specific java version](#Executing tests with specific java version) below.
109

1110
### Plugin structure
1211
OpenTelemetry Auto Instrumentation java agent's jar can logically be divided into 3 parts.

instrumentation/akka-http-10.0/akka-http-10.0.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ compileLatestDepTestGroovy {
112112
// They all use the same constraints as the main test source set.
113113
lagomTest {
114114
onlyIf {
115-
executable == toExecutable(findJavaHome(JavaVersion.VERSION_1_8))
115+
String java8Home = findJavaHome(JavaVersion.VERSION_1_8)
116+
java8Home != null && executable == toExecutable(java8Home)
116117
}
117118
}

instrumentation/java-concurrent/java-concurrent.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ test.dependsOn slickTest
4040
// force this one test to run on java8 only
4141
slickTest {
4242
onlyIf {
43-
executable == toExecutable(findJavaHome(JavaVersion.VERSION_1_8))
43+
String java8Home = findJavaHome(JavaVersion.VERSION_1_8)
44+
java8Home != null && executable == toExecutable(java8Home)
4445
}
4546
}

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ test.dependsOn resteasy31Test
5656
// force this one test to run on java8 only
5757
resteasy31Test {
5858
onlyIf {
59-
executable == toExecutable(findJavaHome(JavaVersion.VERSION_1_8))
59+
String java8Home = findJavaHome(JavaVersion.VERSION_1_8)
60+
java8Home != null && executable == toExecutable(java8Home)
6061
}
6162
}

0 commit comments

Comments
 (0)