Skip to content

Commit 21c61b4

Browse files
committed
Switch back to Java 8 (still works with 11)
1 parent 6764fbb commit 21c61b4

File tree

14 files changed

+22
-13
lines changed

14 files changed

+22
-13
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ interpolated-pom.xml
77
*~
88
build.log
99
_site/
10+
.vscode/
1011

1112
### STS ###
1213
.apt_generated

benchmarks/README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
== How to run
44

5-
You need to have Java 11 to run the benchmarks. The Exec Maven Plugin will run the benschmarks.jar file to start the benchmarking process:
5+
The Exec Maven Plugin will run the `benchmarks.jar` file to start the benchmarking process:
66

77
```
88
$ cd benchmarks

benchmarks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<java.version>11</java.version>
25+
<java.version>8</java.version>
2626
<jmh.version>1.23</jmh.version>
2727
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2828
<start-class>org.openjdk.jmh.Main</start-class>

benchmarks/src/main/java/com/bench/ProcessLauncherState.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.openjdk.jmh.util.Utils;
3232
import org.slf4j.Logger;
3333
import org.slf4j.LoggerFactory;
34+
import org.springframework.boot.system.JavaVersion;
3435

3536
import com.example.InterceptorApplication;
3637

@@ -52,7 +53,7 @@ public ProcessLauncherState(String dir, String... args) {
5253
this.args.add(count++, System.getProperty("java.home") + "/bin/java");
5354
this.args.add(count++, "-Xmx128m");
5455
this.args.add(count++, "-cp");
55-
this.args.add(count++, getClasspathJdk9());
56+
this.args.add(count++, getClasspath());
5657
this.args.add(count++, "-Djava.security.egd=file:/dev/./urandom");
5758
this.args.add(count++, "-XX:TieredStopAtLevel=1"); // zoom
5859
if (System.getProperty("bench.args") != null) {
@@ -74,6 +75,13 @@ public void setJvmArgs(String... extraArgs) {
7475
this.jvmArgs = Arrays.asList(extraArgs);
7576
}
7677

78+
String getClasspath() {
79+
if (JavaVersion.getJavaVersion().isOlderThan(JavaVersion.NINE)) {
80+
return getClasspathJdk8();
81+
}
82+
return getClasspathJdk9();
83+
}
84+
7785
String getClasspathJdk8() {
7886
StringBuilder builder = new StringBuilder();
7987

ctw/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>11</java.version>
24+
<java.version>8</java.version>
2525
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2626
</properties>
2727

ltw/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<java.version>11</java.version>
25+
<java.version>8</java.version>
2626
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2727
</properties>
2828

multi-ctw/ctw-app/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>11</java.version>
24+
<java.version>8</java.version>
2525
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2626
</properties>
2727

multi-ctw/ctw-aspects/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>11</java.version>
24+
<java.version>8</java.version>
2525
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2626
</properties>
2727

multi-ctw/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</modules>
2121

2222
<properties>
23-
<java.version>11</java.version>
23+
<java.version>8</java.version>
2424
</properties>
2525

2626
<build>

multi-ltw/ltw-app/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25-
<java.version>11</java.version>
25+
<java.version>8</java.version>
2626
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2727
<timing.version>1.0.0-SNAPSHOT</timing.version>
2828
</properties>

multi-ltw/ltw-aspects/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>11</java.version>
24+
<java.version>8</java.version>
2525
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2626
</properties>
2727

multi-ltw/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</modules>
2121

2222
<properties>
23-
<java.version>11</java.version>
23+
<java.version>8</java.version>
2424
</properties>
2525

2626
<build>

spring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>11</java.version>
24+
<java.version>8</java.version>
2525
<thin-jar.version>1.0.24.RELEASE</thin-jar.version>
2626
</properties>
2727

timing/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24-
<java.version>11</java.version>
24+
<java.version>8</java.version>
2525
</properties>
2626

2727
<dependencies>

0 commit comments

Comments
 (0)