This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 68097f8e29 LOG4J2-3520 Update outdated Maven Toolchains instructions.
(#894)
68097f8e29 is described below
commit 68097f8e29fa91ff5cb9fcf09dddf7d6b0c0cca5
Author: Michael Ernst <[email protected]>
AuthorDate: Fri May 27 14:19:10 2022 -0700
LOG4J2-3520 Update outdated Maven Toolchains instructions. (#894)
---
BUILDING.md | 13 ++++--------
toolchains-sample-linux.xml | 52 ---------------------------------------------
toolchains-sample-mac.xml | 52 ---------------------------------------------
toolchains-sample-win.xml | 52 ---------------------------------------------
4 files changed, 4 insertions(+), 165 deletions(-)
diff --git a/BUILDING.md b/BUILDING.md
index 09b5708322..cf837125a2 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -20,15 +20,10 @@ To build Log4j 2.x, you need Java 8 and Java 11 compilers,
and Apache Maven 3.x.
Log4j 2.x uses the Java 11 compiler in addition to
the Java version installed in the path. This is accomplished by using Maven's
toolchains support.
-Log4j 2 provides sample toolchains XML files in the root folder. This may be
used by
-modifying it and installing the file as toolchains.xml in the .m2 folder or by
using the
-following when invoking Maven.
-
-```
-[Macintosh] -t ./toolchains-sample-mac.xml
-[Windows] -t ./toolchains-sample-win.xml
-[Linux] -t ./toolchains-sample-linux.xml
-```
+You must set environment variables `JAVA_HOME`, `JAVA_HOME_8_X64`, and
+`JAVA_HOME_11_X64`, and then pass the following when invoking Maven.
+
+ --global-toolchains ".github/workflows/maven-toolchains.xml"
To perform the license release audit, a.k.a. "RAT check", run.
diff --git a/toolchains-sample-linux.xml b/toolchains-sample-linux.xml
deleted file mode 100644
index ced6843911..0000000000
--- a/toolchains-sample-linux.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache license, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the license for the specific language governing permissions and
- ~ limitations under the license.
- -->
-<toolchains>
- <!-- JDK toolchains -->
- <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>
- </provides>
- <configuration>
- <jdkHome>/usr/lib/jvm/java-8-openjdk-amd64</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>9</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/usr/lib/jvm/java-9-openjdk-amd64</jdkHome>
- </configuration>
- </toolchain>
-
- <!-- other toolchains -->
-</toolchains>
diff --git a/toolchains-sample-mac.xml b/toolchains-sample-mac.xml
deleted file mode 100644
index ce360ad6b9..0000000000
--- a/toolchains-sample-mac.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache license, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the license for the specific language governing permissions and
- ~ limitations under the license.
- -->
-<toolchains>
- <!-- JDK toolchains -->
- <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>
- </provides>
- <configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java8/Contents/Home</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>9</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/Library/Java/JavaVirtualMachines/java9/Contents/Home</jdkHome>
- </configuration>
- </toolchain>
-
- <!-- other toolchains -->
-</toolchains>
diff --git a/toolchains-sample-win.xml b/toolchains-sample-win.xml
deleted file mode 100644
index a1c9a5e2de..0000000000
--- a/toolchains-sample-win.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache license, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the license for the specific language governing permissions and
- ~ limitations under the license.
- -->
-<toolchains>
- <!-- JDK toolchains -->
- <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>
- </provides>
- <configuration>
- <jdkHome>C:\Program Files\Java\jdk1.8.0_171</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>9</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>C:\Program Files\Java\jdk-9</jdkHome>
- </configuration>
- </toolchain>
-
- <!-- other toolchains -->
-</toolchains>
