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
commit 45a396f03791ce5add6e41ded2816d5ce912204f Author: Matt Sicker <[email protected]> AuthorDate: Tue Feb 1 01:27:43 2022 -0600 Simplify build to use only Java 11 Signed-off-by: Matt Sicker <[email protected]> --- .github/workflows/build.yml | 12 +----------- BUILDING.md | 24 ++---------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e4d262..17097fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,15 +20,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Setup JDK 17 - uses: actions/[email protected] - with: - distribution: temurin - java-version: 17 - java-package: jdk - architecture: x64 - cache: 'maven' - - name: Setup JDK 11 uses: actions/[email protected] with: @@ -57,5 +48,4 @@ jobs: ./mvnw \ --show-version --batch-mode --errors --no-transfer-progress \ -DtrimStackTrace=false \ - -Dlog4j2.junit.fileCleanerSleepPeriodMillis=1000 \ - --global-toolchains .github/workflows/maven-toolchains.xml + -Dlog4j2.junit.fileCleanerSleepPeriodMillis=1000 diff --git a/BUILDING.md b/BUILDING.md index d77b14e..7d5791c 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -14,22 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -# Building Log4j 2 +# Building Log4j 3 -To build Log4j 2, you need a JDK implementation version 1.8 or greater, JDK -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 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 -``` +To build Log4j 3, you need a JDK implementation version 11 or greater and Apache Maven 3.x. To perform the license release audit, a.k.a. "RAT check", run. @@ -60,10 +47,3 @@ On UNIX, use a local staging directory, for example: To test, run: mvn clean install - -## Testing in Docker - -In order to run a clean test using the minimum version of the JDK along with a -proper Linux environment, run: - - docker build .
