From 4f2be71d105281d28ba5e1b1859188edbf54180b Mon Sep 17 00:00:00 2001 From: radovanradic Date: Mon, 13 May 2024 15:51:51 +0200 Subject: [PATCH 1/4] Update json view to use expected identifier column name --- java/micronaut-jsonview-demo-app/build.gradle | 9 +++++---- java/micronaut-jsonview-demo-app/gradle.properties | 2 +- .../src/main/resources/db/migration/V2__view.sql | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/micronaut-jsonview-demo-app/build.gradle b/java/micronaut-jsonview-demo-app/build.gradle index b90fbe36..d72e4410 100644 --- a/java/micronaut-jsonview-demo-app/build.gradle +++ b/java/micronaut-jsonview-demo-app/build.gradle @@ -1,7 +1,7 @@ plugins { id "com.github.johnrengelman.shadow" version "8.1.1" - id "io.micronaut.application" version "4.0.2" - id "io.micronaut.test-resources" version "4.0.2" + id "io.micronaut.application" version "4.3.5" + id "io.micronaut.test-resources" version "4.3.5" } version = "0.1" @@ -9,13 +9,14 @@ group = "com.example.micronaut" repositories { mavenCentral() + mavenLocal() } dependencies { - annotationProcessor "io.micronaut.data:micronaut-data-processor" + annotationProcessor "io.micronaut.data:micronaut-data-processor:4.8.0-SNAPSHOT" annotationProcessor "io.micronaut:micronaut-http-validation" implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.data:micronaut-data-jdbc" + implementation "io.micronaut.data:micronaut-data-jdbc:4.8.0-SNAPSHOT" implementation "io.micronaut.validation:micronaut-validation" implementation "io.micronaut.serde:micronaut-serde-oracle-jdbc-json" implementation "io.micronaut.serde:micronaut-serde-jackson" diff --git a/java/micronaut-jsonview-demo-app/gradle.properties b/java/micronaut-jsonview-demo-app/gradle.properties index 20729705..7a75b8eb 100644 --- a/java/micronaut-jsonview-demo-app/gradle.properties +++ b/java/micronaut-jsonview-demo-app/gradle.properties @@ -1 +1 @@ -micronautVersion=4.0.5 \ No newline at end of file +micronautVersion=4.3.5 \ No newline at end of file diff --git a/java/micronaut-jsonview-demo-app/src/main/resources/db/migration/V2__view.sql b/java/micronaut-jsonview-demo-app/src/main/resources/db/migration/V2__view.sql index 0c7a8210..97d48a5b 100644 --- a/java/micronaut-jsonview-demo-app/src/main/resources/db/migration/V2__view.sql +++ b/java/micronaut-jsonview-demo-app/src/main/resources/db/migration/V2__view.sql @@ -5,7 +5,7 @@ CREATE OR REPLACE JSON RELATIONAL DUALITY VIEW "STUDENT_SCHEDULE" AS -- <1> SELECT JSON{ - 'studentId': s."ID", -- <2> + '_id': s."ID", -- <2> 'student': s."NAME" WITH UPDATE, -- <3> 'averageGrade': s."AVERAGE_GRADE" WITH UPDATE, 'schedule': [SELECT JSON{'id': sc."ID", -- <4> From 510655e14fe2c011922787594ebf1a82bf90e1e3 Mon Sep 17 00:00:00 2001 From: radovanradic Date: Fri, 31 May 2024 18:20:20 +0200 Subject: [PATCH 2/4] Update micronaut-data version to 4.8.0 --- java/micronaut-jsonview-demo-app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/micronaut-jsonview-demo-app/build.gradle b/java/micronaut-jsonview-demo-app/build.gradle index d72e4410..4f47805d 100644 --- a/java/micronaut-jsonview-demo-app/build.gradle +++ b/java/micronaut-jsonview-demo-app/build.gradle @@ -13,10 +13,10 @@ repositories { } dependencies { - annotationProcessor "io.micronaut.data:micronaut-data-processor:4.8.0-SNAPSHOT" + annotationProcessor "io.micronaut.data:micronaut-data-processor:4.8.0" annotationProcessor "io.micronaut:micronaut-http-validation" implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.data:micronaut-data-jdbc:4.8.0-SNAPSHOT" + implementation "io.micronaut.data:micronaut-data-jdbc:4.8.0" implementation "io.micronaut.validation:micronaut-validation" implementation "io.micronaut.serde:micronaut-serde-oracle-jdbc-json" implementation "io.micronaut.serde:micronaut-serde-jackson" From fd381af57a2775f633b7cec1295eb0d72a87d6c1 Mon Sep 17 00:00:00 2001 From: radovanradic Date: Fri, 31 May 2024 18:21:26 +0200 Subject: [PATCH 3/4] Update build.gradle --- java/micronaut-jsonview-demo-app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/java/micronaut-jsonview-demo-app/build.gradle b/java/micronaut-jsonview-demo-app/build.gradle index 4f47805d..6ef0c5d2 100644 --- a/java/micronaut-jsonview-demo-app/build.gradle +++ b/java/micronaut-jsonview-demo-app/build.gradle @@ -9,7 +9,6 @@ group = "com.example.micronaut" repositories { mavenCentral() - mavenLocal() } dependencies { From 8b52f529299cf3d93e630a15537d2ec39acba2e9 Mon Sep 17 00:00:00 2001 From: radovanradic Date: Fri, 5 Jul 2024 10:21:04 +0200 Subject: [PATCH 4/4] Update Micronaut dependencies --- java/micronaut-jsonview-demo-app/build.gradle | 8 ++++---- java/micronaut-jsonview-demo-app/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../src/main/resources/application.yml | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/java/micronaut-jsonview-demo-app/build.gradle b/java/micronaut-jsonview-demo-app/build.gradle index 6ef0c5d2..42317a77 100644 --- a/java/micronaut-jsonview-demo-app/build.gradle +++ b/java/micronaut-jsonview-demo-app/build.gradle @@ -1,7 +1,7 @@ plugins { id "com.github.johnrengelman.shadow" version "8.1.1" - id "io.micronaut.application" version "4.3.5" - id "io.micronaut.test-resources" version "4.3.5" + id "io.micronaut.application" version "4.4.0" + id "io.micronaut.test-resources" version "4.4.0" } version = "0.1" @@ -12,10 +12,10 @@ repositories { } dependencies { - annotationProcessor "io.micronaut.data:micronaut-data-processor:4.8.0" + annotationProcessor "io.micronaut.data:micronaut-data-processor" annotationProcessor "io.micronaut:micronaut-http-validation" implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.data:micronaut-data-jdbc:4.8.0" + implementation "io.micronaut.data:micronaut-data-jdbc" implementation "io.micronaut.validation:micronaut-validation" implementation "io.micronaut.serde:micronaut-serde-oracle-jdbc-json" implementation "io.micronaut.serde:micronaut-serde-jackson" diff --git a/java/micronaut-jsonview-demo-app/gradle.properties b/java/micronaut-jsonview-demo-app/gradle.properties index 7a75b8eb..1918e8f2 100644 --- a/java/micronaut-jsonview-demo-app/gradle.properties +++ b/java/micronaut-jsonview-demo-app/gradle.properties @@ -1 +1 @@ -micronautVersion=4.3.5 \ No newline at end of file +micronautVersion=4.5.0 \ No newline at end of file diff --git a/java/micronaut-jsonview-demo-app/gradle/wrapper/gradle-wrapper.properties b/java/micronaut-jsonview-demo-app/gradle/wrapper/gradle-wrapper.properties index 37aef8d3..20db9ad5 100644 --- a/java/micronaut-jsonview-demo-app/gradle/wrapper/gradle-wrapper.properties +++ b/java/micronaut-jsonview-demo-app/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java/micronaut-jsonview-demo-app/src/main/resources/application.yml b/java/micronaut-jsonview-demo-app/src/main/resources/application.yml index 89d1659f..13d79298 100644 --- a/java/micronaut-jsonview-demo-app/src/main/resources/application.yml +++ b/java/micronaut-jsonview-demo-app/src/main/resources/application.yml @@ -11,7 +11,6 @@ datasources: test-resources: containers: oracle: - image-name: gvenzl/oracle-free:latest startup-timeout: 360s db-name: test flyway: