Skip to content

Commit 7c29285

Browse files
authored
Merge branch 'main' into feature/31/jpa-handle-unit-types
2 parents 3d6258d + 98bc22d commit 7c29285

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ plugins {
88
id 'java-library'
99
id 'signing'
1010
id 'maven-publish'
11-
id 'org.springframework.boot' version '2.5.3'
11+
id 'org.springframework.boot' version '2.6.1'
1212
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
1313

1414
// Auto Update Versions
15-
id 'se.patrikerdes.use-latest-versions' version '0.2.17'
15+
id 'se.patrikerdes.use-latest-versions' version '0.2.18'
1616
id 'com.github.ben-manes.versions' version '0.39.0'
1717

1818
// Auto Release
@@ -69,10 +69,10 @@ subprojects {
6969
implementation 'javax.measure:unit-api:2.1.3'
7070
implementation 'org.apache.commons:commons-lang3:3.12.0'
7171

72-
testImplementation 'org.codehaus.groovy:groovy:3.0.8'
72+
testImplementation 'org.codehaus.groovy:groovy:3.0.9'
7373
testImplementation platform("org.spockframework:spock-bom:2.0-groovy-3.0")
7474
testImplementation 'org.spockframework:spock-core'
75-
testRuntimeOnly "net.bytebuddy:byte-buddy:1.11.12"
75+
testRuntimeOnly "net.bytebuddy:byte-buddy:1.12.3"
7676
}
7777
}
7878

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=1.1.7-SNAPSHOT
1+
version=1.1.8-SNAPSHOT
22
org.gradle.caching=true

gradle/scripts/publishing.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publishing {
1313
repositories {
1414
maven {
1515
name = "OSSRH" // OSS Repository Hosting
16-
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
16+
url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
1717
credentials {
1818
username = System.getenv("OSSRH_USERNAME") ?: null
1919
password = System.getenv("OSSRH_PASSWORD") ?: null

jackson-module/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
2-
compileOnly 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
2+
compileOnly 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
33
implementation project(":unit-api-core")
44

5-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
5+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
66
}

jpa-starter/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
testImplementation('org.springframework.boot:spring-boot-starter-test') {
1010
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
1111
}
12-
testImplementation("org.postgresql:postgresql:42.2.23")
13-
testImplementation("org.testcontainers:postgresql:1.16.0")
12+
testImplementation("org.postgresql:postgresql:42.3.1")
13+
testImplementation("org.testcontainers:postgresql:1.16.2")
1414
testImplementation 'org.spockframework:spock-spring'
1515
}

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ nav:
3535
- JavaDoc: javadoc-ref.md
3636
- Contribution: contribution.md
3737
extra:
38-
latest_version: 1.1.6
38+
latest_version: 1.1.7

springdoc-starter/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies {
22
compileOnly 'org.springframework.boot:spring-boot-starter'
3-
compileOnly 'org.springdoc:springdoc-openapi-webmvc-core:1.5.10'
3+
compileOnly 'org.springdoc:springdoc-openapi-webmvc-core:1.5.13'
44
implementation project(":jackson-module")
55
implementation project(":unit-api-core")
66

7-
testImplementation 'org.springdoc:springdoc-openapi-webmvc-core:1.5.10'
7+
testImplementation 'org.springdoc:springdoc-openapi-webmvc-core:1.5.12'
88
testImplementation 'org.springframework.boot:spring-boot-starter'
99
testImplementation('org.springframework.boot:spring-boot-starter-test') {
1010
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'

unit-api-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
implementation("org.reflections:reflections:0.9.12")
2+
implementation("org.reflections:reflections:0.10.2")
33
implementation("si.uom:si-quantity:2.1")
44
}

0 commit comments

Comments
 (0)