From d7ad47315e089da2ec55ecdb73f00ed15ac2987c Mon Sep 17 00:00:00 2001 From: viktorklimin Date: Fri, 22 Nov 2024 20:59:34 +0100 Subject: [PATCH 1/4] Added contract profile, to only build API. Local profile now builds frontend --- api/pom.xml | 99 +++++++++++++++++++++++++++++------------------------ pom.xml | 9 +++++ 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 8452167ce..4df1ff4bc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -399,10 +399,65 @@ + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + ${skipUIBuild} + ../frontend + + ${project.version} + ${git.commit.id.abbrev} + + + + + install node and pnpm + + install-node-and-pnpm + + + ${node.version} + ${pnpm.version} + + + + pnpm install + + pnpm + + + install + + + + pnpm build + + pnpm + + + build + + + + + + !local + + true + + + + !prod + + true + + prod @@ -450,49 +505,6 @@ - - com.github.eirslett - frontend-maven-plugin - ${frontend-maven-plugin.version} - - ${skipUIBuild} - ../frontend - - ${project.version} - ${git.commit.id.abbrev} - - - - - install node and pnpm - - install-node-and-pnpm - - - ${node.version} - ${pnpm.version} - - - - pnpm install - - pnpm - - - install - - - - pnpm build - - pnpm - - - build - - - - io.fabric8 docker-maven-plugin @@ -525,5 +537,4 @@ - diff --git a/pom.xml b/pom.xml index e38658fbb..6a159a866 100644 --- a/pom.xml +++ b/pom.xml @@ -193,4 +193,13 @@ + + + contract + + contract + + + + From 6927e2b878ceeb8f81acff84ce25d8740bd6ce64 Mon Sep 17 00:00:00 2001 From: viktorklimin Date: Sat, 23 Nov 2024 13:48:54 +0100 Subject: [PATCH 2/4] resolves kafbat/kafka-ui#90 Moved parent modules section into profiles Added default profile to build all modules. UI now only runs with local / prod profiles, but skipped by default --- api/pom.xml | 15 +++++++-------- pom.xml | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 4df1ff4bc..aa7e53c6a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,8 +16,10 @@ jacoco reuseReports ${project.basedir}/target/jacoco.exec - ${project.basedir}/target/site/jacoco/jacoco.xml + ${project.basedir}/target/site/jacoco/jacoco.xml + java + true @@ -447,19 +449,16 @@ - !local + local - true + false - !prod + prod - true + false - - - prod diff --git a/pom.xml b/pom.xml index 6a159a866..e557442e2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,12 +10,6 @@ 4.0.0 pom - - contract - api - serde-api - e2e-tests - 17 @@ -194,6 +188,18 @@ + + all + + true + + + api + contract + e2e-tests + serde-api + + contract From f469f71dfbbcda6f1b7078505e6bce0c479ea6e1 Mon Sep 17 00:00:00 2001 From: viktorklimin Date: Sat, 23 Nov 2024 13:51:12 +0100 Subject: [PATCH 3/4] rollback auto format --- api/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index aa7e53c6a..7f0060264 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,8 +16,7 @@ jacoco reuseReports ${project.basedir}/target/jacoco.exec - ${project.basedir}/target/site/jacoco/jacoco.xml - + ${project.basedir}/target/site/jacoco/jacoco.xml java true @@ -536,4 +535,5 @@ + From b1e2e1ed94058abdd6fec9ba8116cf73803fdc15 Mon Sep 17 00:00:00 2001 From: viktorklimin Date: Wed, 4 Dec 2024 00:29:28 +0100 Subject: [PATCH 4/4] removed skipUIbuild, declared frontend as separate maven module with pom packaging --- api/pom.xml | 11 --------- frontend/pom.xml | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 6 ++++- 3 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 frontend/pom.xml diff --git a/api/pom.xml b/api/pom.xml index bcb7ce099..873fab40b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -18,7 +18,6 @@ ${project.basedir}/target/jacoco.exec ${project.basedir}/target/site/jacoco/jacoco.xml java - true @@ -405,7 +404,6 @@ frontend-maven-plugin ${frontend-maven-plugin.version} - ${skipUIBuild} ../frontend ${project.version} @@ -447,17 +445,8 @@ - - local - - false - - prod - - false - diff --git a/frontend/pom.xml b/frontend/pom.xml new file mode 100644 index 000000000..d336014a0 --- /dev/null +++ b/frontend/pom.xml @@ -0,0 +1,61 @@ + + + + kafbat-ui + io.kafbat.ui + 0.0.1-SNAPSHOT + + pom + 4.0.0 + + frontend + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-maven-plugin.version} + + + ${project.version} + ${git.commit.id.abbrev} + + + + + install node and pnpm + + install-node-and-pnpm + + + ${node.version} + ${pnpm.version} + + + + pnpm install + + pnpm + + + install + + + + pnpm build + + pnpm + + + build + + + + + + + + diff --git a/pom.xml b/pom.xml index 166c19b97..90f30dab1 100644 --- a/pom.xml +++ b/pom.xml @@ -194,6 +194,7 @@ true + frontend api contract e2e-tests @@ -201,9 +202,12 @@ - contract + backend + api contract + e2e-tests + serde-api