You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/05/05 08:31:02 UTC
logging-log4j2 git commit: Sample toolchains.xml for Linux
Repository: logging-log4j2
Updated Branches:
refs/heads/master afe9295b9 -> 1b9bcd19e
Sample toolchains.xml for Linux
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1b9bcd19
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1b9bcd19
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1b9bcd19
Branch: refs/heads/master
Commit: 1b9bcd19e99eee344efb31420de679f6ffee229b
Parents: afe9295
Author: Mikael Ståldal <mi...@magine.com>
Authored: Fri May 5 10:26:44 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Fri May 5 10:28:50 2017 +0200
----------------------------------------------------------------------
BUILDING.md | 12 +++++++---
src/site/markdown/build.md | 3 ++-
toolchains-sample-linux.xml | 52 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b9bcd19/BUILDING.md
----------------------------------------------------------------------
diff --git a/BUILDING.md b/BUILDING.md
index 305641c..06497cd 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -21,9 +21,15 @@ version 9, and Apache Maven 3.x.
Log4j 2.x uses the Java 9 compiler in addition to
the Java version installed in the path. This is accomplished by using Maven's toolchains support.
-Log4j 2 provides a sample toolchains XML file 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
-`-t ./toolchains-sample.xml` when invoking Maven.
+Log4j 2 provides sample toolchains XML filea 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
+```
To perform the license release audit, a.k.a. "RAT check", run.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b9bcd19/src/site/markdown/build.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/build.md b/src/site/markdown/build.md
index a4ccc7a..43e5c35 100644
--- a/src/site/markdown/build.md
+++ b/src/site/markdown/build.md
@@ -29,7 +29,7 @@ most current source code can be found at
obtained by downloading it using the instructions at [Log4j Downloads](download.html).
Log4j 2.x uses Maven 3 as its build tool. Log4j 2.x uses the Java 9 compiler in addition to
-the Java version installed in the path. This is accomplished by usin Maven's toolchains support.
+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.
@@ -37,6 +37,7 @@ following when invoking Maven.
```
[Macintosh] -t ./toolchains-sample-mac.xml
[Windows] -t ./toolchains-sample-win.xml
+[Linux] -t ./toolchains-sample-linux.xml
```
To build and install Log4j in your local Maven cache, from the parent project directory, and
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b9bcd19/toolchains-sample-linux.xml
----------------------------------------------------------------------
diff --git a/toolchains-sample-linux.xml b/toolchains-sample-linux.xml
new file mode 100644
index 0000000..ced6843
--- /dev/null
+++ b/toolchains-sample-linux.xml
@@ -0,0 +1,52 @@
+<?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>