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
6 changes: 5 additions & 1 deletion .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ jobs:
steps:
- name: Check branch name
run: |
if [[ "${{ github.ref }}" == "refs/heads/main" ]] || [[ "${{ github.ref }}" =~ ^refs/heads/feature/.*$ ]] || [[ "${{ github.ref }}" =~ ^refs/heads/release/v.*$ ]] || [[ "${{ github.ref }}" =~ ^refs/heads/bug/.*$ ]] ; then
if [[ "${{ github.ref }}" == "refs/heads/main" ]] || \
[[ "${{ github.ref }}" =~ ^refs/heads/feature/.*$ ]] || \
[[ "${{ github.ref }}" =~ ^refs/heads/release/v.*$ ]] || \
[[ "${{ github.ref }}" =~ ^refs/heads/bug/.*$ ]] || \
[[ "${{ github.ref }}" == "refs/heads/renovate/all-dependencies" ]] ; then
echo "Branch naming is correct!"
else
echo "Invalid branch name! Correct format: 'feature/<branch-name>' or 'bug/<branch-name>' or release/vx.x.x"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/leanix-github-agent-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Add coverage to PR
id: jacoco
uses: madrapps/jacoco-report@v1.3
uses: madrapps/jacoco-report@94dfcf8dae9680be2cfa714ca37fb37790bd7663 # v1.6
with:
paths: ${{ github.workspace }}/build/jacocoXml/jacocoTestReport.xml
token: ${{secrets.GITHUB_TOKEN}}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-dev-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ jobs:
arguments: build

- name: Log in to the Container registry
uses: docker/login-action@v3.2.0
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5.5.1
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
id: push
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0
with:
context: .
push: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-package-to-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
arguments: build

- name: Log in to the Container registry
uses: docker/login-action@v3.2.0
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
if: (steps.tag-action.outputs.tag != '')
with:
registry: ${{ env.REGISTRY }}
Expand All @@ -114,14 +114,14 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5.5.1
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
if: (steps.tag-action.outputs.tag != '')
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
id: push
uses: docker/build-push-action@v5.3.0
uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5.4.0
if: (steps.tag-action.outputs.tag != '')
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/x86_64 eclipse-temurin:21-jre-alpine
FROM --platform=linux/x86_64 eclipse-temurin:21.0.8_9-jre-alpine@sha256:990397e0495ac088ab6ee3d949a2e97b715a134d8b96c561c5d130b3786a489d

RUN apk --no-cache upgrade && apk --no-cache add curl ca-certificates

Expand Down
30 changes: 15 additions & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import com.expediagroup.graphql.plugin.gradle.tasks.GraphQLGenerateClientTask

plugins {
id("org.springframework.boot") version "3.4.3"
id("io.spring.dependency-management") version "1.1.5"
id("com.expediagroup.graphql") version "8.3.0"
id("io.gitlab.arturbosch.detekt") version "1.23.7"
kotlin("jvm") version "2.0.10"
kotlin("plugin.spring") version "2.0.10"
id("org.springframework.boot") version "3.5.7"
id("io.spring.dependency-management") version "1.1.7"
id("com.expediagroup.graphql") version "8.8.1"
id("io.gitlab.arturbosch.detekt") version "1.23.8"
kotlin("jvm") version "2.0.21"
kotlin("plugin.spring") version "2.0.21"
jacoco
}

Expand All @@ -23,7 +23,7 @@ repositories {
mavenCentral()
}

extra["springCloudVersion"] = "2024.0.0"
extra["springCloudVersion"] = "2025.0.0"

dependencyManagement {
imports {
Expand All @@ -36,22 +36,22 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-aop")
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-cache")
implementation("com.github.ben-manes.caffeine:caffeine:2.8.8")
implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.1.4")
implementation("com.github.ben-manes.caffeine:caffeine:2.9.3")
implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.3.0")
implementation("org.springframework.boot:spring-boot-starter-websocket")
implementation("io.github.resilience4j:resilience4j-spring-boot3")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.1")
implementation("com.expediagroup:graphql-kotlin-spring-client:8.3.0")
developmentOnly("io.netty:netty-resolver-dns-native-macos:4.1.85.Final") {
implementation("com.fasterxml.jackson.core:jackson-annotations:2.20")
implementation("com.expediagroup:graphql-kotlin-spring-client:8.8.1")
developmentOnly("io.netty:netty-resolver-dns-native-macos:4.2.7.Final") {
artifact {
classifier = "osx-aarch_64"
}
}

// Dependencies for generating JWT token
implementation("io.jsonwebtoken:jjwt-impl:0.11.2")
implementation("io.jsonwebtoken:jjwt-jackson:0.11.2")
implementation("io.jsonwebtoken:jjwt-impl:0.13.0")
implementation("io.jsonwebtoken:jjwt-jackson:0.13.0")

testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("com.ninja-squad:springmockk:4.0.2"){
Expand Down Expand Up @@ -83,7 +83,7 @@ detekt {
parallel = true
buildUponDefaultConfig = true
dependencies {
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8")
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ class WebhookEventService(
defaultBranch: String?
) {
val location = getManifestFileLocation(manifestFilePath)
logger.info("Manifest file ${ManifestFileAction.REMOVED} from repository $repositoryFullName under $location")
logger.info(
" Manifest file ${ManifestFileAction.REMOVED} from repository $repositoryFullName under $location"
)
webSocketService.sendMessage(
"/events/manifestFile",
ManifestFileUpdateDto(
Expand Down
Loading