Merge branch 'main' into feat/ldapIntegrationTests

Author: Haarolean

.devcontainer/devcontainer.json

@@ -6,8 +6,8 @@
 	"features": {
 		"ghcr.io/devcontainers/features/java:1": {
 			"version": "none",
-			"installMaven": "true",
-			"installGradle": "false"
+			"installMaven": "false",
+			"installGradle": "true"
 		},
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {}
 	},

.github/CODEOWNERS

@@ -2,7 +2,10 @@
 
 
 # BACKEND
-/pom.xml                    @kafbat/backend
+/build.gradle               @kafbat/backend
+/gradle.properties          @kafbat/backend
+/settings.gradle            @kafbat/backend
+/gradle/                    @kafbat/backend
 /contract/                  @kafbat/backend
 /api/                       @kafbat/backend
 /serde-api/                 @kafbat/backend

.github/dependabot.yml

@@ -1,7 +1,7 @@
 version: 2
 updates:
 
-- package-ecosystem: maven
+- package-ecosystem: gradle
   directory: "/"
   schedule:
     interval: weekly

.github/workflows/aws_ami_publish.yml

@@ -4,7 +4,11 @@ on:
   push:
     branches: [ "main" ]
     paths:
-      - "pom.xml"
+      - "build.gradle"
+      - "gradle.properties"
+      - "settings.gradle"
+      - "gradle/libs.versions.toml"
+
       - "contract/**"
       - "api/**"
       - "serde-api/**"

.github/workflows/backend_main.yml

@@ -5,7 +5,11 @@ on:
   pull_request_target:
     types: [ "opened", "reopened", "synchronize" ]
     paths:
-      - "pom.xml"
+      - "build.gradle"
+      - "gradle.properties"
+      - "settings.gradle"
+      - "gradle/libs.versions.toml"
+
       - "contract/**"
       - "api/**"
       - "serde-api/**"

.github/workflows/backend_pr.yml

@@ -1,4 +1,4 @@
-name: "Backend: build and test"
+name: "Backend: tests & sonar"
 
 on:
   workflow_call:
@@ -14,7 +14,7 @@ permissions:
   pull-requests: write
 
 jobs:
-  build-and-test:
+  tests:
     runs-on: ubuntu-latest
     steps:
 
@@ -30,40 +30,8 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
 
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-
-      - name: "Pull request: Maven tests & sonar"
-        if: ${{ inputs.event_name == 'pull_request' || inputs.event_name == 'pull_request_target' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
-          HEAD_REF: ${{ github.head_ref }}
-          BASE_REF: ${{ github.base_ref }}
-          SKIP_SONAR: "true" # TODO remove when public
-        run: |
-          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          ./mvnw -B -V -ntp verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-          -Dsonar.skip=${SKIP_SONAR} \
-          -Dsonar.projectKey=io.kafbat:kafbat-ui_backend \
-          -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
-          -Dsonar.pullrequest.branch=$HEAD_REF \
-          -Dsonar.pullrequest.base=$BASE_REF
-
-      - name: "Main: Maven tests & sonar"
-        if: ${{ inputs.event_name == 'push' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
-          SKIP_SONAR: "true" # TODO remove when public
+      - name: "Tests"
         run: |
-          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
-          ./mvnw -B -V -ntp verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-          -Dsonar.skip=${SKIP_SONAR} \
-          -Dsonar.projectKey=io.kafbat:kafbat-ui_backend
+          ./gradlew :api:test --info

.github/workflows/backend_tests.yml

@@ -10,4 +10,12 @@ jobs:
         with:
           mode: exactly
           count: 0
-          labels: "status/blocked, status/needs-attention, status/on-hold, status/pending, status/triage, status/pending-backend, status/pending-frontend, status/pending-QA"
+          labels: >
+            status/blocked,
+            status/needs-attention,
+            status/on-hold,
+            status/pending,
+            status/triage,
+            status/pending-backend,
+            status/pending-frontend,
+            status/pending-QA

.github/workflows/block_merge.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Build
         id: build
         run: |
@@ -69,7 +69,7 @@ jobs:
           push: true
           tags: 297478128798.dkr.ecr.eu-central-1.amazonaws.com/kafka-ui:${{ steps.extract_branch.outputs.tag }}
           build-args: |
-            JAR_FILE=api-${{ steps.build.outputs.version }}.jar
+            JAR_FILE=build/libs/api-${{ steps.build.outputs.version }}.jar
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
     outputs:

.github/workflows/branch-deploy.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Build
         id: build
         run: |
@@ -68,7 +68,7 @@ jobs:
           push: true
           tags: ${{ vars.ECR_REGISTRY }}/${{ github.repository }}:${{ steps.extract_branch.outputs.tag }}
           build-args: |
-            JAR_FILE=api-${{ steps.build.outputs.version }}.jar
+            JAR_FILE=build/libs/api-${{ steps.build.outputs.version }}.jar
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: make comment with private deployment link