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 2022/02/01 07:28:04 UTC
[logging-log4j2] branch master updated (9ec6886 -> 45a396f)
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 9ec6886 No need for toolchains
new ec7960f Disable api test parallelism by default
new 9692d49 Stop rerunning failed tests
new 45a396f Simplify build to use only Java 11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build.yml | 13 +------------
BUILDING.md | 24 ++----------------------
log4j-api-test/pom.xml | 34 ++++++++++++++++++++++++----------
3 files changed, 27 insertions(+), 44 deletions(-)
[logging-log4j2] 02/03: Stop rerunning failed tests
Posted by ma...@apache.org.
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 9692d49b1f2257f89dc5e5c10eb2134bb82737d2
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Tue Feb 1 01:24:53 2022 -0600
Stop rerunning failed tests
I have yet to see this do something besides fail three times instead of just once.
Signed-off-by: Matt Sicker <ma...@apache.org>
---
.github/workflows/build.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc03a3a..3e4d262 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,6 +57,5 @@ jobs:
./mvnw \
--show-version --batch-mode --errors --no-transfer-progress \
-DtrimStackTrace=false \
- -Dsurefire.rerunFailingTestsCount=2 \
-Dlog4j2.junit.fileCleanerSleepPeriodMillis=1000 \
--global-toolchains .github/workflows/maven-toolchains.xml
[logging-log4j2] 03/03: Simplify build to use only Java 11
Posted by ma...@apache.org.
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 <ma...@apache.org>
AuthorDate: Tue Feb 1 01:27:43 2022 -0600
Simplify build to use only Java 11
Signed-off-by: Matt Sicker <ma...@apache.org>
---
.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/setup-java@v2.5.0
- with:
- distribution: temurin
- java-version: 17
- java-package: jdk
- architecture: x64
- cache: 'maven'
-
- name: Setup JDK 11
uses: actions/setup-java@v2.5.0
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 .
[logging-log4j2] 01/03: Disable api test parallelism by default
Posted by ma...@apache.org.
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 ec7960f9414041ea0f9edd34fced71dfc1b41413
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Tue Feb 1 01:22:36 2022 -0600
Disable api test parallelism by default
This has proven to be too unreliable with some tests. This is now available in the "parallel-tests" profile.
Signed-off-by: Matt Sicker <ma...@apache.org>
---
log4j-api-test/pom.xml | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index 7b3d2f1..9031a0b 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-api-test</artifactId>
<packaging>jar</packaging>
@@ -155,15 +154,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <properties>
- <configurationParameters>
- <!-- LOG4J2-2921: use parallel test execution by default -->
- junit.jupiter.execution.parallel.enabled = true
- junit.jupiter.execution.parallel.mode.default = fork
- </configurationParameters>
- </properties>
- <forkCount>1C</forkCount>
- <reuseForks>true</reuseForks>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<excludedGroups>performance,smoke</excludedGroups>
</configuration>
@@ -297,5 +287,29 @@
</plugin>
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>parallel-tests</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <properties>
+ <configurationParameters>
+ <!-- LOG4J2-2921: use parallel test execution by default -->
+ junit.jupiter.execution.parallel.enabled = true
+ junit.jupiter.execution.parallel.mode.default = concurrent
+ </configurationParameters>
+ </properties>
+ <forkCount>1C</forkCount>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>