From 9793f9734b2f6b826cfd9d024e05829d1f313715 Mon Sep 17 00:00:00 2001 From: Armel Soro Date: Thu, 19 Oct 2023 13:50:23 +0200 Subject: [PATCH 1/2] Pin the parent Devfile version to 1.2.0 The default version of the parent Stack will be updated in [1] to use JDK 17, so that users on recent versions of Spring Boot can use such Stack. This is to make sure this sample does not break with such change, and continues to work as before, since it is using Sprint Boot 2.x (and expects JDK 11). Signed-off-by: Armel Soro --- devfile.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/devfile.yaml b/devfile.yaml index 18fd490e..8b517d71 100644 --- a/devfile.yaml +++ b/devfile.yaml @@ -17,6 +17,7 @@ metadata: parent: id: java-springboot registryUrl: 'https://registry.devfile.io' + version: 1.2.0 components: - name: image-build image: From f9c708eb415990c76748f39c82aa13d861373e8b Mon Sep 17 00:00:00 2001 From: Armel Soro Date: Thu, 19 Oct 2023 13:56:24 +0200 Subject: [PATCH 2/2] Git-ignore the whole '.odo' folder Recent versions of odo add additional files to this folder. Signed-off-by: Armel Soro --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5fe52b5c..d885f1bb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .project .settings target -.odo/env +.odo .idea -.DS_Store \ No newline at end of file +.DS_Store +