From 7df55876767419bd5efe30cb595f25b9193856ec Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 6 Oct 2020 16:20:51 +0200 Subject: [PATCH] TSK-1277: created taskana-common-parent and its children modules --- common/pom.xml | 22 +++++++++++++++++++ .../taskana-common-data}/pom.xml | 4 ++-- .../sampledata/SampleDataGenerator.java | 0 .../sampledata/SampleDataProvider.java | 0 .../pro/taskana/sampledata/SqlReplacer.java | 0 .../src/main/resources/sql/clear/clear-db.sql | 0 .../main/resources/sql/clear/drop-tables.sql | 0 .../sql/monitor-data/monitor-sample-data.sql | 0 .../resources/sql/sample-data/attachment.sql | 0 .../sql/sample-data/classification.sql | 0 .../sql/sample-data/distribution-targets.sql | 0 .../sql/sample-data/object-reference.sql | 0 .../sql/sample-data/task-comment.sql | 0 .../sql/sample-data/task-history-event.sql | 0 .../main/resources/sql/sample-data/task.sql | 0 .../sample-data/workbasket-access-list.sql | 0 .../resources/sql/sample-data/workbasket.sql | 0 .../resources/sql/test-data/attachment.sql | 0 .../classification-history-event.sql | 0 .../sql/test-data/classification.sql | 0 .../sql/test-data/distribution-targets.sql | 0 .../sql/test-data/object-reference.sql | 0 .../resources/sql/test-data/task-comment.sql | 0 .../sql/test-data/task-history-event.sql | 0 .../src/main/resources/sql/test-data/task.sql | 0 .../sql/test-data/workbasket-access-list.sql | 0 .../test-data/workbasket-history-event.sql | 0 .../resources/sql/test-data/workbasket.sql | 0 .../sampledata/SampleDataProviderTest.java | 0 .../taskana/sampledata/SqlReplacerTest.java | 0 common/taskana-common-test/pom.xml | 19 ++++++++++++++++ common/taskana-common/pom.xml | 18 +++++++++++++++ .../taskana-simplehistory-provider/pom.xml | 2 +- lib/pom.xml | 1 - lib/taskana-cdi/pom.xml | 7 +----- lib/taskana-spring-example/pom.xml | 7 +----- lib/taskana-spring/pom.xml | 7 +----- pom.xml | 1 + .../pom.xml | 2 +- rest/taskana-rest-spring/pom.xml | 2 +- 40 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 common/pom.xml rename {lib/taskana-data => common/taskana-common-data}/pom.xml (92%) rename {lib/taskana-data => common/taskana-common-data}/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/java/pro/taskana/sampledata/SampleDataProvider.java (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/java/pro/taskana/sampledata/SqlReplacer.java (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/clear/clear-db.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/clear/drop-tables.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/monitor-data/monitor-sample-data.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/attachment.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/classification.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/distribution-targets.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/object-reference.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/task-comment.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/task-history-event.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/task.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/workbasket-access-list.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/sample-data/workbasket.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/attachment.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/classification-history-event.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/classification.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/distribution-targets.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/object-reference.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/task-comment.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/task-history-event.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/task.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/workbasket-access-list.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/workbasket-history-event.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/main/resources/sql/test-data/workbasket.sql (100%) rename {lib/taskana-data => common/taskana-common-data}/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java (100%) rename {lib/taskana-data => common/taskana-common-data}/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java (100%) create mode 100644 common/taskana-common-test/pom.xml create mode 100644 common/taskana-common/pom.xml diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 000000000..3008e6caf --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + taskana-common-parent + pom + + ${project.groupId}:${project.artifactId} + This pom is parent to all taskana common modules and serves the common build. + + + pro.taskana + taskana-parent + 4.1.1-SNAPSHOT + ../pom.xml + + + + taskana-common + taskana-common-data + taskana-common-test + + diff --git a/lib/taskana-data/pom.xml b/common/taskana-common-data/pom.xml similarity index 92% rename from lib/taskana-data/pom.xml rename to common/taskana-common-data/pom.xml index 6135f1685..46ac33bed 100644 --- a/lib/taskana-data/pom.xml +++ b/common/taskana-common-data/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - taskana-data + taskana-common-data ${project.groupId}:${project.artifactId} The helper module to import data for testing. pro.taskana - taskana-lib-parent + taskana-common-parent 4.1.1-SNAPSHOT ../pom.xml diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java similarity index 100% rename from lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java rename to common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java similarity index 100% rename from lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java rename to common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java similarity index 100% rename from lib/taskana-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java rename to common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java diff --git a/lib/taskana-data/src/main/resources/sql/clear/clear-db.sql b/common/taskana-common-data/src/main/resources/sql/clear/clear-db.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/clear/clear-db.sql rename to common/taskana-common-data/src/main/resources/sql/clear/clear-db.sql diff --git a/lib/taskana-data/src/main/resources/sql/clear/drop-tables.sql b/common/taskana-common-data/src/main/resources/sql/clear/drop-tables.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/clear/drop-tables.sql rename to common/taskana-common-data/src/main/resources/sql/clear/drop-tables.sql diff --git a/lib/taskana-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql b/common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql rename to common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/attachment.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/classification.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/classification.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/distribution-targets.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/distribution-targets.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/object-reference.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/object-reference.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/task-comment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/task-comment.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/task-history-event.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/task-history-event.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/task.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/task.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/task.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/sample-data/workbasket.sql rename to common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/attachment.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/classification-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/classification-history-event.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/classification.sql b/common/taskana-common-data/src/main/resources/sql/test-data/classification.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/classification.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/classification.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/distribution-targets.sql b/common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/distribution-targets.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/object-reference.sql b/common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/object-reference.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task-comment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/task-comment.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/task.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/task.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql similarity index 100% rename from lib/taskana-data/src/main/resources/sql/test-data/workbasket.sql rename to common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql diff --git a/lib/taskana-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java b/common/taskana-common-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java similarity index 100% rename from lib/taskana-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java rename to common/taskana-common-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java diff --git a/lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java b/common/taskana-common-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java similarity index 100% rename from lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java rename to common/taskana-common-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java diff --git a/common/taskana-common-test/pom.xml b/common/taskana-common-test/pom.xml new file mode 100644 index 000000000..d6d61bd3e --- /dev/null +++ b/common/taskana-common-test/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + taskana-common-test + + ${project.groupId}:${project.artifactId} + The helper module for test utils + + + taskana-common-parent + pro.taskana + 4.1.1-SNAPSHOT + ../pom.xml + + + + \ No newline at end of file diff --git a/common/taskana-common/pom.xml b/common/taskana-common/pom.xml new file mode 100644 index 000000000..fe33ad3b3 --- /dev/null +++ b/common/taskana-common/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + taskana-common + + ${project.groupId}:${project.artifactId} + The global helper module + + + taskana-common-parent + pro.taskana + 4.1.1-SNAPSHOT + + + + \ No newline at end of file diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml index a055e249b..41207ab55 100644 --- a/history/taskana-simplehistory-provider/pom.xml +++ b/history/taskana-simplehistory-provider/pom.xml @@ -34,7 +34,7 @@ pro.taskana - taskana-data + taskana-common-data ${project.version} test diff --git a/lib/pom.xml b/lib/pom.xml index 866d6ae3f..a56f0bbc6 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -15,7 +15,6 @@ - taskana-data taskana-core taskana-cdi taskana-spring diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml index 0d122f754..7a56222c3 100644 --- a/lib/taskana-cdi/pom.xml +++ b/lib/taskana-cdi/pom.xml @@ -43,12 +43,7 @@ org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml index 41be0f0b1..8dad579a3 100644 --- a/lib/taskana-spring-example/pom.xml +++ b/lib/taskana-spring-example/pom.xml @@ -35,12 +35,7 @@ org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml index 6ac2654e4..6591558e1 100644 --- a/lib/taskana-spring/pom.xml +++ b/lib/taskana-spring/pom.xml @@ -57,12 +57,7 @@ org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/pom.xml b/pom.xml index 3daf52109..1262e3e05 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ http://taskana.pro + common lib rest diff --git a/rest/taskana-rest-spring-example-common/pom.xml b/rest/taskana-rest-spring-example-common/pom.xml index 56222fd82..5af0cc420 100644 --- a/rest/taskana-rest-spring-example-common/pom.xml +++ b/rest/taskana-rest-spring-example-common/pom.xml @@ -23,7 +23,7 @@ pro.taskana - taskana-data + taskana-common-data ${project.version} diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml index a20576484..263b0b759 100644 --- a/rest/taskana-rest-spring/pom.xml +++ b/rest/taskana-rest-spring/pom.xml @@ -87,7 +87,7 @@ pro.taskana - taskana-data + taskana-common-data ${project.version} test