diff --git a/.github/workflows/crosschecks.yml b/.github/workflows/crosschecks.yml index ba2490701d..9ec1330744 100644 --- a/.github/workflows/crosschecks.yml +++ b/.github/workflows/crosschecks.yml @@ -37,11 +37,6 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] steps: - - name: Start PostgreSQL on Windows - if: runner.os == 'Windows' - run: | - sc.exe config postgresql-x64-14 start=auto - sc.exe start postgresql-x64-14 - name: Checkout repository uses: actions/checkout@v4 - name: Setup Java JDK @@ -65,5 +60,10 @@ jobs: run: mvn -T 1C checkstyle:check tools:verify-legal-files modernizer:modernizer apache-rat:check - name: Test run: mvn -T 1C clean test '-Dinvoker.streamLogs=true' '-Dmodernizer.skip=true' '-Dianal.phase=none' '-Drat.skip=true' '-Dcheckstyle.skip=true' '-Dsass.skip=true' + - name: Start PostgreSQL on Windows + if: runner.os == 'Windows' + run: | + sc.exe config postgresql-x64-14 start=auto + sc.exe start postgresql-x64-14 - name: Verify run: mvn -f fit/core-reference/pom.xml verify '-Dit.test=RESTITCase' '-Dinvoker.streamLogs=true' '-Dmodernizer.skip=true' '-Drat.skip=true' '-Dcheckstyle.skip=true' '-Djacoco.skip=true' diff --git a/fit/core-reference/src/main/resources/log4j2.xml b/fit/core-reference/src/main/resources/log4j2.xml index 37ab4dd580..7bf54970d0 100644 --- a/fit/core-reference/src/main/resources/log4j2.xml +++ b/fit/core-reference/src/main/resources/log4j2.xml @@ -20,171 +20,107 @@ under the License. - - - %d{HH:mm:ss.SSS} %notEmpty{[operation.id=%X{operation.id}] }%-5level %logger - %msg%n - - - - - - - - - %d{HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - + + + - - - %d{HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - - - %d{HH:mm:ss.SSS} %-5level %msg%n - - - - - - - - - - - + - + - + - + - - - - - - - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - - - - - - - + - + diff --git a/pom.xml b/pom.xml index ef8ba14924..423a6951a4 100644 --- a/pom.xml +++ b/pom.xml @@ -1610,8 +1610,8 @@ under the License. 1.10.14 - ${project.build.directory}/log/cargo.log - ${project.build.directory}/log/cargo-output.log + ${project.build.directory}/test-classes file:${bundles.directory}/