Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump versions #97

Merged
merged 6 commits into from
Jul 5, 2024
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
10 changes: 0 additions & 10 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

16 changes: 6 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ java {
}

dependencies {
// BOM
implementation(platform("org.springframework.boot:spring-boot-dependencies:${property("springBootVersion")}"))
implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}"))

// KOTLIN
implementation("org.jetbrains.kotlin:kotlin-stdlib:${property("kotlinVersion")}")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${property("serializationJSONVersion")}")
Expand Down Expand Up @@ -131,17 +135,15 @@ dependencies {
runtimeOnly("org.postgresql:postgresql")

// FLYWAY
implementation("org.flywaydb:flyway-core")
implementation("org.flywaydb:flyway-core:${property("flywayVersion")}")
implementation("org.flywaydb:flyway-database-postgresql:${property("flywayVersion")}")

// S3
implementation("com.amazonaws:aws-java-sdk-s3:${property("awsSDKVersion")}")

// MICROMETER
runtimeOnly("io.micrometer:micrometer-registry-prometheus")

// PASSAY - for password validation
implementation("org.passay:passay:${property("passayVersion")}")

// GOOGLE Core Libraries
implementation("com.google.guava:guava:${property("guavaVersion")}")

Expand Down Expand Up @@ -173,12 +175,6 @@ dependencies {
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
}

dependencyManagement {
imports {
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
}
}

detekt {
autoCorrect = true
allRules = false
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

x-carp-base-config: &carp-base-config
networks:
- carp
Expand Down
21 changes: 10 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
carpCoreVersion=1.2.0

springBootVersion=3.2.4
springBootVersion=3.3.1
springCloudVersion=2023.0.1
springDependencyManagementVersion=1.1.4
springCloudStarterVersion=4.1.2
Expand All @@ -13,18 +13,17 @@ serializationJSONVersion=1.6.3
detektVersion=1.23.6
ktlintVersion=12.1.1

keycloakVersion=21.0.2
springAddonsVersion=7.6.12
keycloakVersion=22.0.4
springAddonsVersion=7.8.4
hibernateVersion=6.4.4.Final
hibernateTypesVersion=3.7.3
commonsIOVersion=2.11.0
commonsIOVersion=2.15.1
commonsCompressVersion=1.26.2
rsqlParserVersion=2.1.0
jacksonVersion=2.13.3
flywayVersion=7.7.0
passayVersion=1.6.1
guavaVersion=31.1-jre
springdocVersion=1.6.12
swaggerCoreVersion=2.2.4
awsSDKVersion=1.12.421
okhttpVersion=4.11.0
flywayVersion=10.10.0
guavaVersion=33.1.0-jre
springdocVersion=1.7.0
swaggerCoreVersion=2.2.22
awsSDKVersion=1.12.666
okhttpVersion=4.12.0
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling
import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
import java.util.concurrent.Executor
import java.util.concurrent.Executors
import java.util.concurrent.ThreadPoolExecutor

@Configuration
Expand All @@ -34,7 +35,7 @@ class AsyncConfiguration : AsyncConfigurer {
threadPoolTaskExecutor.maxPoolSize = cores * MAX_POOL_SIZE

// Queue is using when all core pool are filled.
threadPoolTaskExecutor.setQueueCapacity(cores * QUEUE_CAPACITY)
threadPoolTaskExecutor.queueCapacity = cores * QUEUE_CAPACITY

// The thread invokes itself on rejected pool (increasing queue capacity).
threadPoolTaskExecutor.setRejectedExecutionHandler(ThreadPoolExecutor.CallerRunsPolicy())
Expand All @@ -55,6 +56,6 @@ class AsyncConfiguration : AsyncConfigurer {

@Bean
fun taskScheduler(): TaskScheduler {
return ConcurrentTaskScheduler()
return ConcurrentTaskScheduler(Executors.newSingleThreadScheduledExecutor())
}
}
Loading