Skip to content

Commit

Permalink
Bump org.springframework.boot:spring-boot-gradle-plugin from 3.3.5 to…
Browse files Browse the repository at this point in the history
… 3.4.0 (#286)

* Bump org.springframework.boot:spring-boot-gradle-plugin

Bumps [org.springframework.boot:spring-boot-gradle-plugin](https://github.com/spring-projects/spring-boot) from 3.3.5 to 3.4.0.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.5...v3.4.0)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Fix broken build for spring-boot-gradle-plugin upgrade

* Update build.gradle

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Conor H <[email protected]>
  • Loading branch information
dependabot[bot] and conorheffron authored Nov 29, 2024
1 parent c3f7617 commit 2955f3a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
springBootVersion = '3.3.5'
springBootVersion = '3.4.0'
}
repositories {
mavenCentral()
Expand All @@ -18,7 +18,7 @@ apply plugin: 'war'
apply plugin: 'maven-publish'

group = 'conorheffron'
version = '5.3.8'
version = '5.3.9'
description = "Sample Data Manager"

sourceCompatibility = 21
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/ironoc/db/config/IronocDbConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,15 @@
@Slf4j
public class IronocDbConfig {

@Autowired
private Environment environment;

@Autowired
private GoogleCloudClient googleCloudClient;

@Bean
@Profile("h2")
@Autowired
public DataSource dataSource(Environment environment, GoogleCloudClient googleCloudClient) {
public DataSource dataSource() {
DataSourceBuilder dsBuilder = DataSourceBuilder.create();
dsBuilder.driverClassName(environment.getRequiredProperty(DataSourceKey.DRIVER_CLASS_NAME.getKey()));
dsBuilder.url(environment.getRequiredProperty(DataSourceKey.DS_URL.getKey()));
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ironoc/db/config/IronocDbConfigTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void test_dataSource_success() {
when(googleCloudClientMock.getSecret(TEST_SECRET_KEY)).thenReturn(TEST_SECRET_DATA);

// when
DataSource result = ironocDbConfig.dataSource(environmentMock, googleCloudClientMock);
DataSource result = ironocDbConfig.dataSource();

// then
dataSourceBuilderMockedStatic.verify(() -> DataSourceBuilder.create());
Expand Down

0 comments on commit 2955f3a

Please sign in to comment.