You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/08/15 19:57:17 UTC
[logging-log4j2] branch master updated: Update sample toolchains
configs to match expected
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new fcb5b5e Update sample toolchains configs to match expected
fcb5b5e is described below
commit fcb5b5e7e34b73e9611a6879bc2a3acc7afa7a13
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Aug 15 14:53:54 2020 -0500
Update sample toolchains configs to match expected
---
toolchains-sample-linux.xml | 18 ++++--------------
toolchains-sample-mac.xml | 20 +++++---------------
toolchains-sample-win.xml | 20 +++++---------------
3 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/toolchains-sample-linux.xml b/toolchains-sample-linux.xml
index ced6843..65dc794 100644
--- a/toolchains-sample-linux.xml
+++ b/toolchains-sample-linux.xml
@@ -20,18 +20,8 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>1.7</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/usr/lib/jvm/java-7-openjdk-amd64</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
<version>1.8</version>
- <vendor>sun</vendor>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>/usr/lib/jvm/java-8-openjdk-amd64</jdkHome>
@@ -40,11 +30,11 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>9</version>
- <vendor>sun</vendor>
+ <version>11</version>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
- <jdkHome>/usr/lib/jvm/java-9-openjdk-amd64</jdkHome>
+ <jdkHome>/usr/lib/jvm/java-11-openjdk-amd64</jdkHome>
</configuration>
</toolchain>
diff --git a/toolchains-sample-mac.xml b/toolchains-sample-mac.xml
index ce360ad..597608d 100644
--- a/toolchains-sample-mac.xml
+++ b/toolchains-sample-mac.xml
@@ -20,31 +20,21 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>1.7</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java7/Contents/Home</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
<version>1.8</version>
- <vendor>sun</vendor>
+ <vendor>adoptopenjdk</vendor>
</provides>
<configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java8/Contents/Home</jdkHome>
+ <jdkHome>/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
- <version>9</version>
- <vendor>sun</vendor>
+ <version>11</version>
+ <vendor>adoptopenjdk</vendor>
</provides>
<configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java9/Contents/Home</jdkHome>
+ <jdkHome>/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home</jdkHome>
</configuration>
</toolchain>
diff --git a/toolchains-sample-win.xml b/toolchains-sample-win.xml
index 8993aae..5be0935 100644
--- a/toolchains-sample-win.xml
+++ b/toolchains-sample-win.xml
@@ -20,31 +20,21 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>1.7</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>C:\Program Files\Java\jdk1.7.0_80</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
<version>1.8</version>
- <vendor>sun</vendor>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
- <jdkHome>C:\Program Files\Java\jdk1.8.0_141</jdkHome>
+ <jdkHome>C:\Program Files\Java\jdk-8</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
- <version>9</version>
- <vendor>sun</vendor>
+ <version>11</version>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
- <jdkHome>C:\Program Files\Java\jdk-9</jdkHome>
+ <jdkHome>C:\Program Files\Java\jdk-11</jdkHome>
</configuration>
</toolchain>