From 7d33b47ec82e89aa7cd4800ab19858b22ebc768f Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Wed, 3 Nov 2021 15:43:59 +0100 Subject: [PATCH 1/4] chore: reorganized build to run in two phases, create coverage aggregate report, made PRs be not checked by sonar, fix #199 --- .github/workflows/main.yml | 25 +-- .github/workflows/pullrequest.yml | 25 +-- CONTRIBUTING.md | 21 +++ coverage-report-generator/pom.xml | 69 ++++++++ ...va => KafkaPropertiesIntegrationTest.java} | 2 +- ...afkaAutoConfigurationIntegrationTest.java} | 2 +- kafka/pom.xml | 5 - ....java => AsyncFetcherIntegrationTest.java} | 2 +- ...efaultConsumerFactoryIntegrationTest.java} | 2 +- ...ucerFactoryClusteringIntegrationTest.java} | 2 +- ...efaultProducerFactoryIntegrationTest.java} | 2 +- ...ava => KafkaPublisherIntegrationTest.java} | 2 +- .../util/KafkaContainerClusterTest.java | 2 +- pom.xml | 152 +++++++++++++++--- 14 files changed, 250 insertions(+), 63 deletions(-) create mode 100644 coverage-report-generator/pom.xml rename kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/{KafkaPropertiesTest.java => KafkaPropertiesIntegrationTest.java} (98%) rename kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/{KafkaAutoConfigurationTest.java => KafkaAutoConfigurationIntegrationTest.java} (99%) rename kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/{AsyncFetcherTest.java => AsyncFetcherIntegrationTest.java} (99%) rename kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/{DefaultConsumerFactoryTest.java => DefaultConsumerFactoryIntegrationTest.java} (97%) rename kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/{DefaultProducerFactoryClusteringTest.java => DefaultProducerFactoryClusteringIntegrationTest.java} (98%) rename kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/{DefaultProducerFactoryTest.java => DefaultProducerFactoryIntegrationTest.java} (99%) rename kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/{KafkaPublisherTest.java => KafkaPublisherIntegrationTest.java} (99%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2578acf6..1f2d5e25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,12 +40,16 @@ jobs: restore-keys: | ${{ runner.os }}-maven - - name: Maven operation with Sonar - if: matrix.sonar-enabled + - name: Regular build run: | - mvn -B -U -Pcoverage \ - clean verify \ - sonar:sonar \ + mvn -B -U clean verify + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Sonar analysis + if: matrix.sonar-enabled + run: | # no clean + mvn -B sonar:sonar \ -Dsonar.projectKey=AxonFramework_extension-kafka \ -Dsonar.organization=axonframework \ -Dsonar.host.url=https://sonarcloud.io \ @@ -53,17 +57,16 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Maven operation without Sonar - if: matrix.sonar-enabled != true - run: | - mvn -B -U clean verify + - name: Run integration tests + run: | # no clean + mvn -B -Pitest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy to Sonatype if: success() - run: | - ./mvnw -B -U deploy -DskipTests=true + run: | # no clean, no tests, no examples + ./mvnw -B -U deploy -DskipTests=true -DskipExamples=true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAVEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_ID }} diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 5a7aa9c2..7a1aa827 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -11,9 +11,8 @@ jobs: matrix: include: - java-version: 8 - sonar-enabled: false - java-version: 11 - sonar-enabled: true + fail-fast: false # run both to the end steps: - name: Checkout code @@ -36,22 +35,10 @@ jobs: restore-keys: | ${{ runner.os }}-maven - - name: Maven operation with Sonar - if: matrix.sonar-enabled - run: | - mvn -B -U -Pcoverage \ - clean verify \ - sonar:sonar \ - -Dsonar.projectKey=AxonFramework_extension-kafka \ - -Dsonar.organization=axonframework \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.login=${{ secrets.SONAR_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Maven operation without Sonar - if: matrix.sonar-enabled != true + - name: Run regular build run: | mvn -B -U clean verify - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Run integration tests + run: | # no clean + mavn -B -Pitest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 882481a3..5464a611 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,3 +36,24 @@ If you're using IntelliJ IDEA, you can download the code style definition [here](https://github.com/AxonFramework/AxonFramework/blob/master/axon_code_style.xml). Simply import the XML file in under "Settings -> Code Style -> Scheme -> Import Scheme". Doing so should make the code style selectable immediately. + +### Project Build + +The project is built with Apache Maven, supplied by the Maven Wrapper `mvnw`. For separate aspects of the build Maven +profiles are used. + +For a **regular** build, execute from your command line: `./mvnw`. This will run the build and execute JUnit tests +of all modules and package the resulting artifacts. + +There is an example project supplied, and you can skip its build by passing `-DskipExamples` to your build command. + +The long-running integration tests (starting Spring Boot Application and/or running Kafka in a TestContainer) are +provided and **ARE NOT** executed by default. A special **itest** build is needed to run those long-running tests. +If you want to run them, please call `./mvnw -Pitest` from your command line. If you need to provide additional +integration tests, make sure the class name ends with `IntegrationTest`. + +The project uses JaCoCo to measure test coverage of the code and will automatically generate coverage reports on regular +and itest build. If you are interested in the overall test coverage, please run `./mvnw -Pcoverage-aggregate` +(without calling `clean`) after your run the **regular** and **itest** builds and check the resulting aggregated report +in `./coverage-report-generator/target/site/jacoco-aggregate/index.html` + diff --git a/coverage-report-generator/pom.xml b/coverage-report-generator/pom.xml new file mode 100644 index 00000000..ac0480da --- /dev/null +++ b/coverage-report-generator/pom.xml @@ -0,0 +1,69 @@ + + + + + 4.0.0 + + + org.axonframework.extensions.kafka + axon-kafka-parent + 4.6.0-SNAPSHOT + + + axon-kafka-coverage-report-generator + 4.6.0-SNAPSHOT + + Axon Framework Kafka Extension - Coverage Report Generator + Coverage Report Generator for the Axon Kafka Extension + + + AxonIQ B.V. + https://axoniq.io + + + + + org.axonframework.extensions.kafka + axon-kafka + ${project.version} + + + org.axonframework.extensions.kafka + axon-kafka-spring-boot-autoconfigure + ${project.version} + + + + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + + + + + + diff --git a/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/KafkaPropertiesTest.java b/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/KafkaPropertiesIntegrationTest.java similarity index 98% rename from kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/KafkaPropertiesTest.java rename to kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/KafkaPropertiesIntegrationTest.java index 18903829..e8b855d0 100644 --- a/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/KafkaPropertiesTest.java +++ b/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/KafkaPropertiesIntegrationTest.java @@ -35,7 +35,7 @@ @EnableAutoConfiguration @ExtendWith(SpringExtension.class) @TestPropertySource("classpath:application-map-style.properties") -class KafkaPropertiesTest { +class KafkaPropertiesIntegrationTest { private static final String PROPERTY_KEY_ONE = "keyOne"; private static final String PROPERTY_VALUE_ONE = "valueOne"; diff --git a/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/KafkaAutoConfigurationTest.java b/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/KafkaAutoConfigurationIntegrationTest.java similarity index 99% rename from kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/KafkaAutoConfigurationTest.java rename to kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/KafkaAutoConfigurationIntegrationTest.java index 12d003ed..f67e403d 100644 --- a/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/KafkaAutoConfigurationTest.java +++ b/kafka-spring-boot-autoconfigure/src/test/java/org/axonframework/extensions/kafka/autoconfig/KafkaAutoConfigurationIntegrationTest.java @@ -69,7 +69,7 @@ * @author Nakul Mishra * @author Steven van Beelen */ -class KafkaAutoConfigurationTest { +class KafkaAutoConfigurationIntegrationTest { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(KafkaAutoConfiguration.class)); diff --git a/kafka/pom.xml b/kafka/pom.xml index a3c4fae2..50d728c3 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -68,11 +68,6 @@ ${jmh-core.version} test - - org.junit.jupiter - junit-jupiter - test - org.testcontainers junit-jupiter diff --git a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/AsyncFetcherTest.java b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/AsyncFetcherIntegrationTest.java similarity index 99% rename from kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/AsyncFetcherTest.java rename to kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/AsyncFetcherIntegrationTest.java index 1099421b..3e0809db 100644 --- a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/AsyncFetcherTest.java +++ b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/AsyncFetcherIntegrationTest.java @@ -59,7 +59,7 @@ * @author Steven van Beelen */ -class AsyncFetcherTest extends KafkaContainerTest { +class AsyncFetcherIntegrationTest extends KafkaContainerTest { private static final String TEST_TOPIC = "some-topic"; private static final int TEST_PARTITION = 0; diff --git a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/DefaultConsumerFactoryTest.java b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/DefaultConsumerFactoryIntegrationTest.java similarity index 97% rename from kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/DefaultConsumerFactoryTest.java rename to kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/DefaultConsumerFactoryIntegrationTest.java index ec5ba03f..314e3059 100644 --- a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/DefaultConsumerFactoryTest.java +++ b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/consumer/DefaultConsumerFactoryIntegrationTest.java @@ -40,7 +40,7 @@ * @author Nakul Mishra * @author Steven van Beelen */ -class DefaultConsumerFactoryTest extends KafkaContainerTest { +class DefaultConsumerFactoryIntegrationTest extends KafkaContainerTest { private static final String TEST_TOPIC = "testCreatedConsumer_ValidConfig_CanCommunicateToKafka"; diff --git a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryClusteringTest.java b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryClusteringIntegrationTest.java similarity index 98% rename from kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryClusteringTest.java rename to kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryClusteringIntegrationTest.java index f88dd85e..46e52f49 100644 --- a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryClusteringTest.java +++ b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryClusteringIntegrationTest.java @@ -41,7 +41,7 @@ * @author Lucas Campos * @author Nakul Mishra */ -class DefaultProducerFactoryClusteringTest extends KafkaContainerClusterTest { +class DefaultProducerFactoryClusteringIntegrationTest extends KafkaContainerClusterTest { private static final String TOPIC = "testSendingMessagesUsingMultipleTransactionalProducers"; diff --git a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryTest.java b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryIntegrationTest.java similarity index 99% rename from kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryTest.java rename to kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryIntegrationTest.java index 1764cfc1..223aa7e8 100644 --- a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryTest.java +++ b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/DefaultProducerFactoryIntegrationTest.java @@ -49,7 +49,7 @@ * @author Steven van Beelen * @author Nakul Mishra */ -class DefaultProducerFactoryTest extends KafkaContainerTest { +class DefaultProducerFactoryIntegrationTest extends KafkaContainerTest { private static final String[] TOPICS = { "testProducerCreation", diff --git a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/KafkaPublisherTest.java b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/KafkaPublisherIntegrationTest.java similarity index 99% rename from kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/KafkaPublisherTest.java rename to kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/KafkaPublisherIntegrationTest.java index 1f14f13c..815691ab 100644 --- a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/KafkaPublisherTest.java +++ b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/producer/KafkaPublisherIntegrationTest.java @@ -70,7 +70,7 @@ * @author Steven van Beelen * @author Nakul Mishra */ -class KafkaPublisherTest extends KafkaContainerTest { +class KafkaPublisherIntegrationTest extends KafkaContainerTest { private static final String[] TOPICS = { "testPublishMessagesWithAckModeNoUnitOfWorkShouldBePublishedAndReadSuccessfully", diff --git a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/util/KafkaContainerClusterTest.java b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/util/KafkaContainerClusterTest.java index 25b53308..ef699979 100644 --- a/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/util/KafkaContainerClusterTest.java +++ b/kafka/src/test/java/org/axonframework/extensions/kafka/eventhandling/util/KafkaContainerClusterTest.java @@ -9,7 +9,7 @@ * @author Lucas Campos */ @Testcontainers -public class KafkaContainerClusterTest { +public abstract class KafkaContainerClusterTest { @Container protected static final KafkaContainerCluster KAFKA_CLUSTER = new KafkaContainerCluster("5.4.3", 3, 1); diff --git a/pom.xml b/pom.xml index 65acc6f9..483531ab 100644 --- a/pom.xml +++ b/pom.xml @@ -16,19 +16,19 @@ --> - + 4.0.0 org.axonframework.extensions.kafka axon-kafka-parent 4.6.0-SNAPSHOT + + pom + kafka kafka-spring-boot-autoconfigure kafka-spring-boot-starter - kafka-axon-example + - pom - - 4.0.0 Axon Framework - Kafka Extension An Axon Framework extension allowing Kafka integration @@ -60,8 +60,8 @@ 5.8.1 4.0.0 2.13.0 - - 0.8.7 + **/*Test.* + **/*IntegrationTest.* @@ -108,7 +108,6 @@ - org.junit.jupiter junit-jupiter @@ -124,7 +123,6 @@ mockito-junit-jupiter test - javax.inject javax.inject @@ -180,6 +178,7 @@ + clean package @@ -190,6 +189,21 @@ maven-install-plugin 2.5.2 + + org.jacoco + jacoco-maven-plugin + 0.8.7 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.2 + @@ -235,14 +249,14 @@ maven-surefire-plugin - 2.22.2 + + ${pattern.class.itest} + - **/*Test.java - **/*Tests.java - **/*Test_*.java - **/*Tests_*.java + ${pattern.class.test} + -Djava.awt.headless=true ${surefireArgLine} ${slf4j.version} ${log4j.version} @@ -313,10 +327,51 @@ + + org.jacoco + jacoco-maven-plugin + + + prepare-unit-test + + prepare-agent + + + surefireArgLine + ${project.build.directory}/jacoco-ut.exec + + + + report-unit-test + test + + report + + + ${project.build.directory}/jacoco-ut.exec + ${project.reporting.outputDirectory}/jacoco-ut + + ${pattern.class.itest} + + + + + + + examples + + + !skipExamples + + + + kafka-axon-example + + release-sign-artifacts @@ -345,34 +400,82 @@ - - coverage + itest + + false + + verify org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} - + prepare-integration-test + pre-integration-test prepare-agent + + failsafeArgLine + ${project.build.directory}/jacoco-it.exec + - report - prepare-package + report-integration-test + post-integration-test report + + ${project.build.directory}/jacoco-it.exec + ${project.reporting.outputDirectory}/jacoco-it + + ${pattern.class.test} + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + run-integration-tests + + integration-test + + + -Djava.awt.headless=true ${failsafeArgLine} + + ${pattern.class.itest} + + + + coverage-aggregate + + verify + + + coverage-report-generator + + @@ -421,5 +524,14 @@ Lead Developer + + Simon Zambrovski + simon.zambrovskin@holisticon.de + Holisticon AG + https://holisticon.de + + Developer + + From c431275c00366b1d10b38c944f2cb765d63a8f54 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Wed, 3 Nov 2021 15:54:32 +0100 Subject: [PATCH 2/4] chore: typo in build script --- .github/workflows/pullrequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 7a1aa827..a196788a 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -41,4 +41,4 @@ jobs: - name: Run integration tests run: | # no clean - mavn -B -Pitest + mvn -B -Pitest From cddaa67c20e3fe75a4487abf80b774f773c42b5e Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 8 Nov 2021 23:07:28 +0100 Subject: [PATCH 3/4] Update CONTRIBUTING.md Co-authored-by: Steven van Beelen --- CONTRIBUTING.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5464a611..1c77bbbe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,18 +42,19 @@ immediately. The project is built with Apache Maven, supplied by the Maven Wrapper `mvnw`. For separate aspects of the build Maven profiles are used. -For a **regular** build, execute from your command line: `./mvnw`. This will run the build and execute JUnit tests +For a **regular** build, execute from your command line: `./mvnw`. This operation will run the build and execute JUnit tests of all modules and package the resulting artifacts. -There is an example project supplied, and you can skip its build by passing `-DskipExamples` to your build command. +This repository contains an example project. +You can skip its build by adding `-DskipExamples` to your build command. -The long-running integration tests (starting Spring Boot Application and/or running Kafka in a TestContainer) are -provided and **ARE NOT** executed by default. A special **itest** build is needed to run those long-running tests. -If you want to run them, please call `./mvnw -Pitest` from your command line. If you need to provide additional -integration tests, make sure the class name ends with `IntegrationTest`. +There are long-running integration tests present (starting Spring Boot Application and/or running Kafka in a TestContainer), which **ARE NOT** executed by default. +A unique `itest` build is needed to run those long-running tests. +If you want to run them, please call `./mvnw -Pitest` from your command line. +When introducing additional integration tests, make sure the class name ends with `IntegrationTest`. -The project uses JaCoCo to measure test coverage of the code and will automatically generate coverage reports on regular -and itest build. If you are interested in the overall test coverage, please run `./mvnw -Pcoverage-aggregate` -(without calling `clean`) after your run the **regular** and **itest** builds and check the resulting aggregated report +The project uses JaCoCo to measure test coverage of the code and automatically generate coverage reports on regular +and `itest` builds. If you are interested in the overall test coverage, please run `./mvnw -Pcoverage-aggregate` +(without calling `clean`) after you run the **regular** and `itest` builds and check the resulting aggregated report in `./coverage-report-generator/target/site/jacoco-aggregate/index.html` From f63048d13e7e8ef350490a3b773a49298403beef Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Wed, 24 Nov 2021 22:13:35 +0100 Subject: [PATCH 4/4] fix proposals of @lfgcampos --- .github/workflows/main.yml | 12 +++--------- .github/workflows/pullrequest.yml | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f2d5e25..387dec46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,26 +42,20 @@ jobs: - name: Regular build run: | - mvn -B -U clean verify - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ./mvnw -B -U clean verify - name: Sonar analysis if: matrix.sonar-enabled run: | # no clean - mvn -B sonar:sonar \ + ./mvnw -B sonar:sonar \ -Dsonar.projectKey=AxonFramework_extension-kafka \ -Dsonar.organization=axonframework \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.login=${{ secrets.SONAR_TOKEN }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Run integration tests run: | # no clean - mvn -B -Pitest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ./mvnw -B -Pitest - name: Deploy to Sonatype if: success() diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index a196788a..1b95249a 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -37,8 +37,8 @@ jobs: - name: Run regular build run: | - mvn -B -U clean verify + ./mvnw -B -U clean verify - name: Run integration tests run: | # no clean - mvn -B -Pitest + ./mvnw -B -Pitest