diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b7f27938..d78cd338 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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:
@@ -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:
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index c5d070d1..dce9f9cb 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -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:
@@ -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:
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 216df058..bb58b3c2 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -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
diff --git a/pom.xml b/pom.xml
index d6138926..649d0665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
2026.1.0
1.79.0
- 4.36.1
+ 4.36.2
2.0.16
2.26.1
@@ -62,7 +62,7 @@
5.24.0
2.0.5
- 5.6.4
+ 5.6.5
2.1.11
3.6.0
0.11.0