Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ jobs:
matrix:
include:
- java-version: 11
sonar-enabled: false
deploy-enabled: true
- java-version: 17
sonar-enabled: true
deploy-enabled: false
- java-version: 21
sonar-enabled: false
deploy-enabled: false

steps:
Expand All @@ -40,18 +37,7 @@ jobs:
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

- name: Build and Test with Sonar Analysis
if: matrix.sonar-enabled
run: |
./mvnw -B -U -Dstyle.color=always -Pcoverage clean verify \
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Dsonar.projectKey=AxonIQ_axonserver-connector-java
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.CONNECTOR_SONAR_TOKEN }}

- name: Build and Test without Sonar Analysis
if: matrix.sonar-enabled != true
- name: Build
run: |
mvn -B -U -Dstyle.color=always clean verify
env:
Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ jobs:
matrix:
include:
- java-version: 11
sonar-enabled: false
- java-version: 17
sonar-enabled: true
- java-version: 21
sonar-enabled: true
fail-fast: false # run both to the end

steps:
Expand All @@ -32,18 +29,7 @@ jobs:
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

- name: Build and Test with Sonar Analysis
if: matrix.sonar-enabled
run: |
./mvnw -B -U -Dstyle.color=always -Pcoverage clean verify \
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Dsonar.projectKey=AxonIQ_axonserver-connector-java
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.CONNECTOR_SONAR_TOKEN }}

- name: Build and Test without Sonar Analysis
if: matrix.sonar-enabled != true
- name: Build
run: |
mvn -B -U -Dstyle.color=always clean verify
env:
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<axonserver.api.version>2026.1.0</axonserver.api.version>

<grpc.version>1.79.0</grpc.version>
<protobuf.version>4.36.1</protobuf.version>
<protobuf.version>4.36.2</protobuf.version>

<slf4j.version>2.0.16</slf4j.version>
<log4j.version>2.26.1</log4j.version>
Expand All @@ -62,7 +62,7 @@
<mockito.version>5.24.0</mockito.version>
<testcontainers.version>2.0.5</testcontainers.version>

<httpclient5.version>5.6.4</httpclient5.version>
<httpclient5.version>5.6.5</httpclient5.version>
<toxiproxy.version>2.1.11</toxiproxy.version>
<maven.surefire.plugin.version>3.6.0</maven.surefire.plugin.version>
<central-publishing-maven-plugin.version>0.11.0</central-publishing-maven-plugin.version>
Expand Down
Loading