Skip to content

Commit df38a23

Browse files
[CORE-69]: Bump the minor-patch-dependencies group with 18 updates (#227)
* [CORE-69]: Bump the minor-patch-dependencies group with 18 updates Bumps the minor-patch-dependencies group with 18 updates: | Package | From | To | | --- | --- | --- | | io.swagger.core.v3:swagger-annotations | `2.1.13` | `2.2.28` | | io.swagger.codegen.v3:swagger-codegen-cli | `3.0.47` | `3.0.67` | | [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) | `1.1.4` | `1.1.7` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.2.3` | `3.4.2` | | com.google.cloud.tools.jib | `3.4.3` | `3.4.4` | | [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) | `26.28.0` | `26.53.0` | | [org.immutables:value](https://github.com/immutables/immutables) | `2.9.2` | `2.10.1` | | [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) | `1.78` | `1.80` | | [org.codehaus.janino:janino](https://github.com/janino-compiler/janino) | `3.1.9` | `3.1.12` | | [au.com.dius.pact.provider:junit5](https://github.com/pact-foundation/pact-jvm) | `4.3.19` | `4.6.16` | | [au.com.dius.pact.provider:junit5spring](https://github.com/pact-foundation/pact-jvm) | `4.3.19` | `4.6.16` | | [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) | `1.21.0-alpha` | `1.30.0-rc.1` | | [com.google.cloud.opentelemetry:exporter-trace](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java) | `0.25.2` | `0.33.0` | | org.apache.commons:commons-compress | `1.26.0` | `1.27.1` | | com.github.ben-manes.versions | `0.42.0` | `0.52.0` | | com.gorylenko.gradle-git-properties | `2.4.0` | `2.4.2` | | [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.8.2` | `5.11.4` | | com.google.auth:google-auth-library-oauth2-http | `1.5.3` | `1.31.0` | Updates `io.swagger.core.v3:swagger-annotations` from 2.1.13 to 2.2.28 Updates `io.swagger.codegen.v3:swagger-codegen-cli` from 3.0.47 to 3.0.67 Updates `io.spring.dependency-management` from 1.1.4 to 1.1.7 - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](spring-gradle-plugins/dependency-management-plugin@v1.1.4...v1.1.7) Updates `org.springframework.boot` from 3.2.3 to 3.4.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.2.3...v3.4.2) Updates `com.google.cloud.tools.jib` from 3.4.3 to 3.4.4 Updates `com.google.cloud:libraries-bom` from 26.28.0 to 26.53.0 - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](googleapis/java-cloud-bom@v26.28.0...v26.53.0) Updates `org.immutables:value` from 2.9.2 to 2.10.1 - [Release notes](https://github.com/immutables/immutables/releases) - [Commits](immutables/immutables@2.9.2...2.10.1) Updates `org.bouncycastle:bcprov-jdk18on` from 1.78 to 1.80 - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) Updates `org.codehaus.janino:janino` from 3.1.9 to 3.1.12 - [Release notes](https://github.com/janino-compiler/janino/releases) - [Commits](janino-compiler/janino@v3.1.9...v3.1.12) Updates `au.com.dius.pact.provider:junit5` from 4.3.19 to 4.6.16 - [Release notes](https://github.com/pact-foundation/pact-jvm/releases) - [Changelog](https://github.com/pact-foundation/pact-jvm/blob/master/CHANGELOG.md) - [Commits](https://github.com/pact-foundation/pact-jvm/commits) Updates `au.com.dius.pact.provider:junit5spring` from 4.3.19 to 4.6.16 - [Release notes](https://github.com/pact-foundation/pact-jvm/releases) - [Changelog](https://github.com/pact-foundation/pact-jvm/blob/master/CHANGELOG.md) - [Commits](https://github.com/pact-foundation/pact-jvm/commits) Updates `io.opentelemetry.semconv:opentelemetry-semconv` from 1.21.0-alpha to 1.30.0-rc.1 - [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases) - [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits/v1.30.0-rc.1) Updates `com.google.cloud.opentelemetry:exporter-trace` from 0.25.2 to 0.33.0 - [Release notes](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java/releases) - [Commits](GoogleCloudPlatform/opentelemetry-operations-java@v0.25.2...v0.33.0) Updates `org.apache.commons:commons-compress` from 1.26.0 to 1.27.1 Updates `com.github.ben-manes.versions` from 0.42.0 to 0.52.0 Updates `com.gorylenko.gradle-git-properties` from 2.4.0 to 2.4.2 Updates `org.junit.jupiter:junit-jupiter-api` from 5.8.2 to 5.11.4 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit-framework@r5.8.2...r5.11.4) Updates `com.google.auth:google-auth-library-oauth2-http` from 1.5.3 to 1.31.0 --- updated-dependencies: - dependency-name: io.swagger.core.v3:swagger-annotations dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: io.swagger.codegen.v3:swagger-codegen-cli dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.google.cloud.tools.jib dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.immutables:value dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.codehaus.janino:janino dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: au.com.dius.pact.provider:junit5 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: au.com.dius.pact.provider:junit5spring dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: io.opentelemetry.semconv:opentelemetry-semconv dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.google.cloud.opentelemetry:exporter-trace dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: org.apache.commons:commons-compress dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.gorylenko.gradle-git-properties dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-dependencies - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies - dependency-name: com.google.auth:google-auth-library-oauth2-http dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * fix compile error * update terra-common-lib and otel * update sentry --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Douglas Voet <[email protected]>
1 parent d13e65e commit df38a23

File tree

5 files changed

+60
-28
lines changed

5 files changed

+60
-28
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
44
plugins {
55
id 'idea'
66

7-
id 'io.spring.dependency-management' version '1.1.4' apply false
8-
id 'org.springframework.boot' version '3.2.3' apply false
7+
id 'io.spring.dependency-management' version '1.1.7' apply false
8+
id 'org.springframework.boot' version '3.4.2' apply false
99
id 'com.diffplug.spotless' version '6.3.0' apply false
1010
// ^^ for some reason, can't use spotless in multiple subprojects without this ^^
11-
id 'com.google.cloud.tools.jib' version '3.4.3' apply false
11+
id 'com.google.cloud.tools.jib' version '3.4.4' apply false
1212
// ^^ see https://github.com/GoogleContainerTools/jib/blob/master/docs/faq.md#i-am-seeing-method-not-found-or-class-not-found-errors-when-building
1313
id 'org.sonarqube' version '5.1.0.4882' apply false
1414
id 'io.freefair.lombok' version '6.4.1' apply false
@@ -36,8 +36,8 @@ subprojects {
3636
}
3737

3838
dependencies {
39-
dependency 'io.swagger.core.v3:swagger-annotations:2.1.13'
40-
dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.47'
39+
dependency 'io.swagger.core.v3:swagger-annotations:2.2.28'
40+
dependency 'io.swagger.codegen.v3:swagger-codegen-cli:3.0.67'
4141
}
4242
}
4343

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/* copied from https://github.com/swagger-api/swagger-codegen-generators/pull/1117 because the spring Base64 encoder was removed */
2+
package {{invokerPackage}}.auth;
3+
4+
import java.io.UnsupportedEncodingException;
5+
import java.nio.charset.StandardCharsets;
6+
import java.util.Base64;
7+
8+
import org.springframework.http.HttpHeaders;
9+
import org.springframework.util.MultiValueMap;
10+
11+
{{>generatedAnnotation}}
12+
public class HttpBasicAuth implements Authentication {
13+
private String username;
14+
private String password;
15+
16+
public String getUsername() {
17+
return username;
18+
}
19+
20+
public void setUsername(String username) {
21+
this.username = username;
22+
}
23+
24+
public String getPassword() {
25+
return password;
26+
}
27+
28+
public void setPassword(String password) {
29+
this.password = password;
30+
}
31+
32+
@Override
33+
public void applyToParams(MultiValueMap<String, String> queryParams, HttpHeaders headerParams) {
34+
if (username == null && password == null) {
35+
return;
36+
}
37+
String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
38+
headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));
39+
}
40+
}

client-resttemplate/swagger.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ generateSwaggerCode {
1414
inputFile = file('../common/openapi.yml')
1515
language = 'java'
1616
library = 'resttemplate'
17+
templateDir = file("${projectDir}/src/main/resources/swaggercodegen")
1718

1819
components = [
1920
apiDocs : false, apiTests: false,

integration/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ repositories {
1212
}
1313

1414
dependencies {
15-
implementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
15+
implementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
1616

1717
// Google Dependencies
18-
implementation 'com.google.auth:google-auth-library-oauth2-http:1.5.3'
18+
implementation 'com.google.auth:google-auth-library-oauth2-http:1.31.0'
1919

2020
// ECM client library
2121
implementation project(':client-resttemplate')

service/build.gradle

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ plugins {
44
id 'org.springframework.boot'
55

66
id 'com.diffplug.spotless'
7-
id 'com.github.ben-manes.versions' version '0.42.0'
7+
id 'com.github.ben-manes.versions' version '0.52.0'
88
id 'com.github.spotbugs' version '5.1.3'
99
id 'com.google.cloud.tools.jib'
10-
id 'com.gorylenko.gradle-git-properties' version '2.4.0'
10+
id 'com.gorylenko.gradle-git-properties' version '2.4.2'
1111
id 'io.freefair.lombok'
1212
id 'org.hidetake.swagger.generator'
1313
id 'org.sonarqube'
@@ -30,18 +30,18 @@ dependencies {
3030
implementation 'org.broadinstitute.dsde.workbench:sam-client_2.13:v0.0.208'
3131

3232
// google
33-
implementation platform('com.google.cloud:libraries-bom:26.28.0')
33+
implementation platform('com.google.cloud:libraries-bom:26.53.0')
3434
implementation 'com.google.cloud:google-cloud-pubsub'
3535
implementation 'com.google.cloud:google-cloud-datastore'
3636
implementation 'com.google.cloud:spring-cloud-gcp-starter-logging:4.9.0'
3737

38-
annotationProcessor 'org.immutables:value:2.9.2'
39-
implementation('bio.terra:terra-common-lib:0.1.9-SNAPSHOT') {
38+
annotationProcessor 'org.immutables:value:2.10.1'
39+
implementation('bio.terra:terra-common-lib:1.1.35-SNAPSHOT') {
4040
exclude group: 'io.kubernetes', module: 'client-java'
4141
}
4242
// https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on
43-
implementation 'org.bouncycastle:bcprov-jdk18on:1.78'
44-
implementation 'org.codehaus.janino:janino:3.1.9' // Provides if/else xml parsing for logback config
43+
implementation 'org.bouncycastle:bcprov-jdk18on:1.80'
44+
implementation 'org.codehaus.janino:janino:3.1.12' // Provides if/else xml parsing for logback config
4545

4646
// for testing with mock web server
4747
testImplementation('org.mock-server:mockserver-netty:5.15.0') {
@@ -51,26 +51,17 @@ dependencies {
5151
// https://mvnrepository.com/artifact/org.mockito/mockito-core
5252
testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.4.0'
5353

54-
testImplementation("au.com.dius.pact.provider:junit5:4.3.19")
55-
testImplementation('au.com.dius.pact.provider:junit5spring:4.3.19')
54+
testImplementation("au.com.dius.pact.provider:junit5:4.6.16")
55+
testImplementation('au.com.dius.pact.provider:junit5spring:4.6.16')
5656
testImplementation project(':client-resttemplate')
5757

58-
// OpenTelemetry
59-
var openTelemetryVersion = '1.32.0'
60-
implementation "io.opentelemetry:opentelemetry-api:${openTelemetryVersion}"
61-
implementation "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}"
62-
implementation "io.opentelemetry:opentelemetry-sdk-metrics:${openTelemetryVersion}"
63-
implementation "io.opentelemetry:opentelemetry-exporter-logging:${openTelemetryVersion}"
64-
implementation "io.opentelemetry.semconv:opentelemetry-semconv:1.21.0-alpha"
65-
implementation "io.opentelemetry.instrumentation:opentelemetry-spring-webmvc-6.0:${openTelemetryVersion}-alpha"
66-
implementation "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:${openTelemetryVersion}"
67-
implementation "io.opentelemetry.instrumentation:opentelemetry-spring-boot:${openTelemetryVersion}-alpha"
68-
implementation "com.google.cloud.opentelemetry:exporter-trace:0.25.2"
58+
implementation "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.12.0"
59+
implementation "com.google.cloud.opentelemetry:exporter-trace:0.33.0"
6960

7061
// For Micrometer metrics gathering
7162
implementation 'io.micrometer:micrometer-registry-prometheus'
7263

73-
implementation 'org.apache.commons:commons-compress:1.26.0'
64+
implementation 'org.apache.commons:commons-compress:1.27.1'
7465

7566
}
7667

0 commit comments

Comments
 (0)