Skip to content

Commit 60dd938

Browse files
authored
Merge pull request #2592 from objectcomputing/chore-micronaut/upgrade-to-micronaut-4.6.2
[chore] Update to Micronaut 4.6.2
2 parents e4288dd + 1c3822f commit 60dd938

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'java-library'
55
id 'maven-publish'
66
id("com.gradleup.shadow") version "8.3.1"
7-
id("io.micronaut.application") version "4.4.0"
7+
id("io.micronaut.application") version "4.4.2"
88
id "jacoco"
99
id("org.openrewrite.rewrite") version "latest.release"
1010
}

server/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
micronautVersion=4.5.0
1+
micronautVersion=4.6.2
22
seleniumVersion=4.21.0

server/src/test/java/com/objectcomputing/checkins/configuration/CheckInsConfigurationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class CheckInsConfigurationTest {
1515
@Test
1616
void checkConfigurationGetsParsed() {
1717
try (var ctx = ApplicationContext.run(Map.of(
18-
"datasources.enabled", false,
18+
"datasources.default.enabled", false,
1919
"check-ins.web-address", "http://google.com",
2020
"check-ins.application.name", "Fancy app"
2121
))) {
@@ -28,7 +28,7 @@ void checkConfigurationGetsParsed() {
2828
@Test
2929
void checkWebAddressGetsValidated() {
3030
try (var ctx = ApplicationContext.run(Map.of(
31-
"datasources.enabled", false,
31+
"datasources.default.enabled", false,
3232
"check-ins.web-address", "",
3333
"check-ins.application.name", "Fancy app"
3434
))) {
@@ -40,7 +40,7 @@ void checkWebAddressGetsValidated() {
4040
@Test
4141
void checkApplicationNameGetsValidated() {
4242
try (var ctx = ApplicationContext.run(Map.of(
43-
"datasources.enabled", false,
43+
"datasources.default.enabled", false,
4444
"check-ins.web-address", "http://google.com",
4545
"check-ins.application.name", ""
4646
))) {

server/src/test/java/com/objectcomputing/checkins/notifications/email/MailJetConfigurationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void happyConfig() {
1515
String name = "Tim";
1616

1717
try (var ctx = ApplicationContext.run(Map.of(
18-
"datasources.enabled", false,
18+
"datasources.default.enabled", false,
1919
"mail-jet.from-address", email,
2020
"mail-jet.from-name", name
2121
))) {
@@ -25,7 +25,7 @@ void happyConfig() {
2525
}
2626

2727
try (var ctx = ApplicationContext.run(Map.of(
28-
"datasources.enabled", false,
28+
"datasources.default.enabled", false,
2929
"mail-jet.fromAddress", email,
3030
"mail-jet.fromName", name
3131
))) {
@@ -35,7 +35,7 @@ void happyConfig() {
3535
}
3636

3737
try (var ctx = ApplicationContext.run(Map.of(
38-
"datasources.enabled", false,
38+
"datasources.default.enabled", false,
3939
"mailJet.fromAddress", email,
4040
"mailJet.fromName", name
4141
))) {
@@ -45,7 +45,7 @@ void happyConfig() {
4545
}
4646

4747
try (var ctx = ApplicationContext.run(Map.of(
48-
"datasources.enabled", false,
48+
"datasources.default.enabled", false,
4949
"mailJet.from_address", email,
5050
"mailJet.from_name", name
5151
))) {

server/src/test/java/com/objectcomputing/checkins/security/GoogleServiceConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void testConfigurationLoadedCorrectlyFromConfiguration() throws IOException {
6969
Map.entry("encoded-gcp-credentials", ENCODED_EXAMPLE_GOOGLE_SERVICE_CONFIGURATION)
7070
);
7171
try (var ctx = ApplicationContext.run(Map.ofEntries(
72-
Map.entry("datasources.enabled", false),
72+
Map.entry("datasources.default.enabled", false),
7373
Map.entry("service-account-credentials.directory-id", values.get("directory")),
7474
Map.entry("service-account-credentials.encoded-value", values.get("encoded-gcp-credentials"))
7575
))) {

server/src/test/java/com/objectcomputing/checkins/services/github/GithubControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class GithubControllerTest extends TestContainersSuite {
4444
void startClient() {
4545
// Make a GitHub mock application (with no datasource, and security turned off)
4646
mockGithub = ApplicationContext.run(EmbeddedServer.class, Map.of(
47-
"datasources.enabled", StringUtils.FALSE,
47+
"datasources.default.enabled", StringUtils.FALSE,
4848
"micronaut.security.enabled", StringUtils.FALSE,
4949
"spec.name", "GithubControllerTest"
5050
));

0 commit comments

Comments
 (0)