My typical development follow 1 of 2 paths. 1. I am doing a patch or new feature targeted at the 2.x release train. I do my initial development on the release-2.x branch. Once it is fully tested I cherry-pick it (when possible) to the master branch. If I can’t cherry-pick it I manually copy the changes. For both release-2.x and master I ALWAYS run full builds before committing. I only run the builds on Mac OS. 2. I am creating a patch or new feature only targeted at master. I do all my development and testing on master. I ALWAYS run a full build before committing. I only run the builds on Mac OS.
Frequently I notice that the Jenkins builds on Windows fail. I recently fixed the bad tests on the release-2.x branch as I don’t want to cut a release knowing there are failing unit tests. Since we have no plans to cut a 3.0 release soon I haven’t worried about Windows too much since, while I find the emails annoying, they aren’t blocking me. I can’t recall ever seeing the error below. It implies that the log4j-plugins module is being built before the log4j-api module, which never happens for me. I suppose it would happen if you try to build the log4j-plugin module from its directory without having built the rest of log4j. Ralph > On Mar 4, 2020, at 4:51 AM, Volkan Yazıcı <volkan.yaz...@gmail.com> wrote: > > Hello, > > While developing it is really difficult to keep up with the master > branch, it continuously gets broken. master and release-2.x diverge a > lot as well, hence I am sitting on the fence for whether I should base > my changes on master or release-2.x. This is my current state: > > $ git remote -v > origin g...@github.com:vy/log4j2.git (fetch) > origin g...@github.com:vy/log4j2.git (push) > upstream https://github.com/apache/logging-log4j2.git (fetch) > upstream https://github.com/apache/logging-log4j2.git (push) > $ git fetch -pP upstream > $ git rebase upstream/master > Current branch master is up to date. > $ git diff master..upstream/master > $ rm -rf ~/.m2/repository/org/apache/logging > $ ./mvnw clean package -Dmaven.test.skip=true > ... > [ERROR] Failed to execute goal on project log4j-plugins: Could not > resolve dependencies for project > org.apache.logging.log4j:log4j-plugins:jar:3.0.0-SNAPSHOT: Could not > find artifact org.apache.logging.log4j:log4j-api:jar:tests:3.0.0-SNAPSHOT > > I have checked Travis[1] and Jenkins[2], their end doesn't look bright either. > > How do you people deal with this? How do you develop? Which branch > shall I use to base JsonTemplateLayout? > > Kind regards. > > [1] https://travis-ci.org/apache/logging-log4j2/builds > [2] https://builds.apache.org/view/L/view/Logging/ >
