From 2c54b7eaa7734193d0ec7a7c9986bbeeb4d9081d Mon Sep 17 00:00:00 2001 From: denise-khuu <74537227+denise-khuu@users.noreply.github.com> Date: Mon, 14 Dec 2020 07:51:19 +0100 Subject: [PATCH 1/5] Upstream --- runners/katacoda/index.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/runners/katacoda/index.ts b/runners/katacoda/index.ts index 0ef680ca..1d78cce2 100644 --- a/runners/katacoda/index.ts +++ b/runners/katacoda/index.ts @@ -140,15 +140,17 @@ export class Katacoda extends Runner { runBuildJava(step: Step, command: Command): RunResult{ - let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw", "workspaces", "main", command.parameters[0]));; + let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw", "workspaces", "main", command.parameters[0])); - let skipTestDescr = ""; - let skipTest = ""; - - if(command.parameters[1] == true){ - skipTest = '-Dmaven.test.skip=' + command.parameters[1]; - skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'." + let skipTest = "-Dmaven.test.skip=true"; + let skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; + + if(command.parameters.length == 2 && command.parameters[1] == true){ + skipTest = ""; + skipTestDescr = ""; } + + this.steps.push({ "title": "Build the java project", "text": "step" + this.stepsCount + ".md" From 6ba302fd9fb13d6d1c7157b65f0af2f5213038fc Mon Sep 17 00:00:00 2001 From: denise-khuu <74537227+denise-khuu@users.noreply.github.com> Date: Mon, 14 Dec 2020 08:27:35 +0100 Subject: [PATCH 2/5] Katacoda buildJava --- documentation/Functions.md | 2 ++ runners/katacoda/index.ts | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/documentation/Functions.md b/documentation/Functions.md index 8ab678f7..97518c04 100644 --- a/documentation/Functions.md +++ b/documentation/Functions.md @@ -47,6 +47,7 @@ createDevon4jProject("cobigenexample") #### parameter 1. The project directory 2. Indicator whether tests should be run + #### example buildJava("cobigenexample", true) @@ -56,6 +57,7 @@ buildJava("cobigenexample", true) #### parameter 1. Path of the file to be created (relative path to the workspace directory) 2. (Optional) Path of the file to get the content from. Relative to the playbook directory + #### example createFile("cobigenexample/core/src/main/java/com/example/application/cobigenexample/customermanagement/dataaccess/api/CustomerEntity.java", "files/CustomerEntity.java") diff --git a/runners/katacoda/index.ts b/runners/katacoda/index.ts index 1d78cce2..302672eb 100644 --- a/runners/katacoda/index.ts +++ b/runners/katacoda/index.ts @@ -142,12 +142,15 @@ export class Katacoda extends Runner { let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw", "workspaces", "main", command.parameters[0])); - let skipTest = "-Dmaven.test.skip=true"; - let skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; + let skipTest; + let skipTestDescr; if(command.parameters.length == 2 && command.parameters[1] == true){ skipTest = ""; skipTestDescr = ""; + }else{ + skipTest = "-Dmaven.test.skip=true"; + skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; } From 2076583bfad742bd3a0ab22fe9d5f7e74a48c9cd Mon Sep 17 00:00:00 2001 From: denise-khuu <74537227+denise-khuu@users.noreply.github.com> Date: Mon, 14 Dec 2020 08:29:51 +0100 Subject: [PATCH 3/5] Katacoda buildJava --- documentation/Functions.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/documentation/Functions.md b/documentation/Functions.md index 97518c04..8ab678f7 100644 --- a/documentation/Functions.md +++ b/documentation/Functions.md @@ -47,7 +47,6 @@ createDevon4jProject("cobigenexample") #### parameter 1. The project directory 2. Indicator whether tests should be run - #### example buildJava("cobigenexample", true) @@ -57,7 +56,6 @@ buildJava("cobigenexample", true) #### parameter 1. Path of the file to be created (relative path to the workspace directory) 2. (Optional) Path of the file to get the content from. Relative to the playbook directory - #### example createFile("cobigenexample/core/src/main/java/com/example/application/cobigenexample/customermanagement/dataaccess/api/CustomerEntity.java", "files/CustomerEntity.java") From e698abb02a5d42c00c9ddf7833e91302480bcb12 Mon Sep 17 00:00:00 2001 From: denise-khuu <74537227+denise-khuu@users.noreply.github.com> Date: Mon, 14 Dec 2020 11:25:08 +0100 Subject: [PATCH 4/5] katacodaBuildJava --- runners/katacoda/index.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/runners/katacoda/index.ts b/runners/katacoda/index.ts index 302672eb..7d8b169a 100644 --- a/runners/katacoda/index.ts +++ b/runners/katacoda/index.ts @@ -142,17 +142,13 @@ export class Katacoda extends Runner { let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw", "workspaces", "main", command.parameters[0])); - let skipTest; - let skipTestDescr; + let skipTest = "-Dmaven.test.skip=true"; + let skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; if(command.parameters.length == 2 && command.parameters[1] == true){ skipTest = ""; skipTestDescr = ""; - }else{ - skipTest = "-Dmaven.test.skip=true"; - skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; } - this.steps.push({ "title": "Build the java project", From 2f28446aaec7b3be59bf1a1065005e1d25adf284 Mon Sep 17 00:00:00 2001 From: denise-khuu <74537227+denise-khuu@users.noreply.github.com> Date: Mon, 14 Dec 2020 11:36:12 +0100 Subject: [PATCH 5/5] katacodaBuildJava --- runners/katacoda/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/katacoda/index.ts b/runners/katacoda/index.ts index 7d8b169a..6ed86299 100644 --- a/runners/katacoda/index.ts +++ b/runners/katacoda/index.ts @@ -143,7 +143,7 @@ export class Katacoda extends Runner { let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw", "workspaces", "main", command.parameters[0])); let skipTest = "-Dmaven.test.skip=true"; - let skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; + let skipTestDescr = "We do not need to execute the test cases, so we can skip them by using the option '-Dmaven.test.skip=true'."; if(command.parameters.length == 2 && command.parameters[1] == true){ skipTest = "";