Skip to content

Commit

Permalink
Update dependencies (#551)
Browse files Browse the repository at this point in the history
* Bump com.google.cloud:spring-cloud-gcp-dependencies in /server

Bumps [com.google.cloud:spring-cloud-gcp-dependencies](https://github.com/GoogleCloudPlatform/spring-cloud-gcp) from 5.5.0 to 5.8.0.
- [Release notes](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/releases)
- [Changelog](https://github.com/GoogleCloudPlatform/spring-cloud-gcp/blob/main/CHANGELOG.md)
- [Commits](GoogleCloudPlatform/spring-cloud-gcp@v5.5.0...v5.8.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:spring-cloud-gcp-dependencies
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump com.github.ben-manes.versions from 0.21.0 to 0.51.0

Bumps com.github.ben-manes.versions from 0.21.0 to 0.51.0.

---
updated-dependencies:
- dependency-name: com.github.ben-manes.versions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Cleanup dependencies. Update Spring boot to 3.3.5.

* Bump org.apache.httpcomponents:httpmime from 4.5.13 to 4.5.14 in /server

Bumps org.apache.httpcomponents:httpmime from 4.5.13 to 4.5.14.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpmime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Remove nested folder from dependabot configuration to avoid PR duplication.

* Bump commons-io:commons-io from 2.11.0 to 2.17.0 in /server

Bumps commons-io:commons-io from 2.11.0 to 2.17.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
ekharkunov and dependabot[bot] authored Nov 12, 2024
1 parent 7004f46 commit c8949e0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 26 deletions.
3 changes: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,5 @@ updates:
- package-ecosystem: "gradle"
directories:
- "/"
- "/client"
- "/server"
- "/server/manifestmergetool"
schedule:
interval: "weekly"
14 changes: 0 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
plugins {
id 'com.github.ben-manes.versions' version '0.21.0'
id 'maven-publish'
}

Expand All @@ -22,16 +21,3 @@ wrapper {
gradleVersion = '8.4'
distributionType = Wrapper.DistributionType.ALL
}

dependencyUpdates.resolutionStrategy = {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier ->
selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
}
if (rejected) {
selection.reject('Release candidate')
}
}
}
}
4 changes: 2 additions & 2 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jar {

dependencies {
implementation('org.apache.httpcomponents:httpclient:4.5.14')
implementation('org.apache.httpcomponents:httpmime:4.5.13')
implementation('org.apache.httpcomponents:httpmime:4.5.14')
implementation('com.googlecode.json-simple:json-simple:1.1.1') {
exclude module: 'junit'
}
testImplementation('commons-io:commons-io:2.11.0')
testImplementation('commons-io:commons-io:2.17.0')
testImplementation("org.mockito:mockito-core:5.+")
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
}
11 changes: 5 additions & 6 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ buildscript {
plugins {
id 'java'
id 'idea'
id 'eclipse'
id 'org.springframework.boot' version '3.3.4'
id 'org.springframework.boot' version '3.3.5'
}

apply plugin: 'io.spring.dependency-management'
Expand All @@ -41,7 +40,7 @@ targetCompatibility = '17'

dependencyManagement {
imports {
mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:5.5.0'
mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:5.8.0'
}
}

Expand All @@ -57,19 +56,17 @@ dependencies {
implementation('com.google.cloud:spring-cloud-gcp-starter-storage')
implementation('com.google.cloud:spring-cloud-gcp-starter-logging')
implementation('com.google.cloud:google-cloud-compute:1.59.0')
implementation('com.google.guava:guava:33.2.1-jre')
implementation('com.samskivert:jmustache:1.16')
implementation('commons-chain:commons-chain:1.2')
implementation('org.apache.commons:commons-fileupload2-jakarta:2.0.0-M1')
implementation('org.apache.commons:commons-text:1.12.+')
implementation('org.apache.commons:commons-compress:1.27.+')
implementation('org.apache.commons:commons-lang3:3.17.0')
implementation('org.apache.httpcomponents:httpclient:4.5.14')
implementation('org.apache.httpcomponents:httpmime:4.5.13')
implementation('org.apache.httpcomponents:httpmime:4.5.14')
implementation('org.springframework.boot:spring-boot-starter-actuator')
implementation('org.springframework.boot:spring-boot-starter-jetty')
implementation('org.springframework.boot:spring-boot-starter-security')
implementation('org.springframework.security:spring-security-test')
implementation('io.micrometer:micrometer-core:1.13.1')
implementation('io.micrometer:micrometer-tracing:1.3.4')
implementation('io.micrometer:micrometer-tracing-bridge-otel:1.3.4')
Expand All @@ -82,6 +79,8 @@ dependencies {
testImplementation('org.springframework.boot:spring-boot-starter-test')
testImplementation('io.micrometer:micrometer-tracing-test')
testImplementation('io.micrometer:micrometer-tracing-integration-test')
testImplementation('org.springframework.security:spring-security-test')

testImplementation('org.smali:dexlib2:2.5.2')
testImplementation project(':client')
}
Expand Down
2 changes: 1 addition & 1 deletion server/manifestmergetool/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ dependencies {
implementation('org.apache.commons:commons-configuration2:2.11.0')
implementation('commons-codec:commons-codec:1.17.0')

testImplementation('commons-io:commons-io:2.11.0')
testImplementation('commons-io:commons-io:2.17.0')
testImplementation('junit:junit:4.13.2')
}

Expand Down

0 comments on commit c8949e0

Please sign in to comment.