Skip to content

Commit

Permalink
Merge branch 'develop' into EPMRPP-93641-JDK-21-jakarta
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	jitpack.yml
#	jooq.gradle
#	project-properties.gradle
  • Loading branch information
grabsefx committed Dec 7, 2024
2 parents 7e0085d + 1e6fe09 commit d6414fc
Show file tree
Hide file tree
Showing 13 changed files with 251 additions and 189 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ on:

env:
GH_USER_NAME: github.actor
SCRIPTS_VERSION: 5.11.0
BOM_VERSION: 5.11.7
MIGRATIONS_VERSION: 5.11.0
RELEASE_VERSION: 5.11.6
SCRIPTS_VERSION: 5.12.0
BOM_VERSION: 5.12.1
MIGRATIONS_VERSION: 5.12.0
RELEASE_VERSION: 5.12.1

jobs:
release:
Expand Down
12 changes: 5 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id 'io.spring.dependency-management' version '1.1.6'
id 'java'
id 'java-library'
id 'org.owasp.dependencycheck' version '11.1.0'
id 'org.owasp.dependencycheck' version '11.1.1'
id "org.jooq.jooq-codegen-gradle" version "${jooqVersion}"
}

Expand All @@ -16,7 +16,6 @@ apply from: "$scriptsUrl/copy-database-scripts.gradle"
//apply from: "$scriptsUrl/jacoco.gradle" // TODO: fix scripts
apply from: 'jooq.gradle'


repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }

Expand All @@ -34,7 +33,7 @@ ext['spring-boot.version'] = "${springBootVersion}"

dependencyManagement {
imports {
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.11.7' : 'com.epam.reportportal:commons-bom:5.11.7')
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
mavenBom('io.zonky.test.postgres:embedded-postgres-binaries-bom:16.2.0')
}
}
Expand Down Expand Up @@ -62,9 +61,9 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-cache'
implementation 'com.github.ben-manes.caffeine:caffeine'

implementation 'io.minio:minio:8.5.12'
implementation 'io.minio:minio:8.5.14'

implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"

implementation 'org.apache.commons:commons-collections4:4.4'
Expand All @@ -79,7 +78,7 @@ dependencies {
implementation 'org.flywaydb:flyway-core:10.15.2'
implementation 'org.flywaydb:flyway-database-postgresql:10.20.0'

implementation "org.apache.jclouds.api:s3:${jcloudsVersion}"
api "org.apache.jclouds.api:s3:${jcloudsVersion}"
implementation "org.apache.jclouds.provider:aws-s3:${jcloudsVersion}"
implementation "org.apache.jclouds.api:filesystem:${jcloudsVersion}"
api 'com.google.guava:guava:33.2.1-jre'
Expand Down Expand Up @@ -114,7 +113,6 @@ tasks.withType(JavaCompile) {
options.debugOptions.debugLevel = "source,lines,vars"
}


checkCommitNeeded.dependsOn removeScripts
test.dependsOn copyTestDatabaseScripts
//build.dependsOn jacocoTestReport
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version=5.11.7
springBootVersion=3.3.5
lombokVersion=1.18.34
version=5.12.2
springBootVersion=3.4.0
lombokVersion=1.18.36
jooqVersion=3.19.13
jdbcDriverVersion=42.7.4
jcloudsVersion=2.6.0
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
100755 → 100644
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit d6414fc

Please sign in to comment.