From 1518cfc298754c7e8c2f09ae5a89bae1a8553e92 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Mon, 21 Oct 2019 07:55:17 +0200
Subject: [PATCH] TSK-925: refactored taskana-simplehistory-spring-test
---
.../taskana-simplehistory-provider/pom.xml | 1 +
.../pom.xml | 1 +
.../taskana-simplehistory-rest-spring/pom.xml | 1 +
.../taskana-simplehistory-spring-test/pom.xml | 333 +++++++++---------
.../rest/ExampleDocumentationApplication.java | 2 +-
rest/taskana-rest-spring-example/pom.xml | 1 +
web/pom.xml | 2 +-
7 files changed, 173 insertions(+), 168 deletions(-)
diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml
index 58844772d..3899bc0c0 100644
--- a/history/taskana-simplehistory-provider/pom.xml
+++ b/history/taskana-simplehistory-provider/pom.xml
@@ -12,6 +12,7 @@
pro.taskana.simplehistory
taskana-simplehistory-parent
1.1.5-SNAPSHOT
+ ../pom.xml
diff --git a/history/taskana-simplehistory-rest-spring-example/pom.xml b/history/taskana-simplehistory-rest-spring-example/pom.xml
index 72243aba4..47ecb392a 100644
--- a/history/taskana-simplehistory-rest-spring-example/pom.xml
+++ b/history/taskana-simplehistory-rest-spring-example/pom.xml
@@ -12,6 +12,7 @@
pro.taskana.simplehistory
taskana-simplehistory-parent
1.1.5-SNAPSHOT
+ ../pom.xml
diff --git a/history/taskana-simplehistory-rest-spring/pom.xml b/history/taskana-simplehistory-rest-spring/pom.xml
index 9abc47992..bd1790a0f 100644
--- a/history/taskana-simplehistory-rest-spring/pom.xml
+++ b/history/taskana-simplehistory-rest-spring/pom.xml
@@ -12,6 +12,7 @@
pro.taskana.simplehistory
taskana-simplehistory-parent
1.1.5-SNAPSHOT
+ ../pom.xml
diff --git a/history/taskana-simplehistory-spring-test/pom.xml b/history/taskana-simplehistory-spring-test/pom.xml
index 1b727aa6b..48a107f56 100644
--- a/history/taskana-simplehistory-spring-test/pom.xml
+++ b/history/taskana-simplehistory-spring-test/pom.xml
@@ -1,172 +1,173 @@
-
- 4.0.0
- taskana-simplehistory-spring-test
- 1.1.5-SNAPSHOT
- ${project.groupId}:${project.artifactId}
-
- org.springframework.boot
- spring-boot-dependencies
- 2.0.2.RELEASE
-
-
+
+ 4.0.0
+ taskana-simplehistory-spring-test
-
-
- The Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
+ ${project.groupId}:${project.artifactId}
+ Exclusive test module. Contains integration tests and build rest-doc.
-
- UTF-8
- UTF-8
- 1.8
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
-
- com.h2database
- h2
-
-
- pro.taskana.simplehistory
- taskana-simplehistory-rest-spring
- ${project.version}
-
-
- org.springframework.plugin
- spring-plugin-core
-
-
- junit
- junit
- test
-
-
- org.springframework
- spring-test
- 5.0.6.RELEASE
- test
-
-
- org.springframework.boot
- spring-boot-test
- test
-
-
- org.springframework.restdocs
- spring-restdocs-core
- test
-
-
- org.springframework.restdocs
- spring-restdocs-mockmvc
- test
-
-
+
+ pro.taskana.simplehistory
+ taskana-simplehistory-parent
+ 1.1.5-SNAPSHOT
+ ../pom.xml
+
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
-
- **/*Plugin*Test.java
-
-
- **/*Test.java
- **/*Documentation.java
-
-
- -Xms1024m -Xmx2048m
-
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
- 1.5.3
-
-
- generate-docs
- prepare-package
-
- process-asciidoc
-
-
- html
- book
-
- target/generated-snippets
- shared
-
-
-
-
-
-
- maven-resources-plugin
-
-
- copy-rest-docs
- prepare-package
-
- copy-resources
-
-
-
- ${project.build.outputDirectory}/static/docs/rest
-
-
-
-
- ${project.build.directory}/generated-docs
-
-
-
- ${project.basedir}/src/js
-
-
-
-
-
- copy-documentation-to-taskana-simplehistory-rest-spring-example
- prepare-package
-
- copy-resources
-
-
-
- ../taskana-simplehistory-rest-spring-example/target/generated-docs
-
-
-
-
- ${project.build.outputDirectory}/static/docs/rest
-
-
-
-
-
-
-
-
-
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${version.spring.boot}
+ pom
+ import
+
+
+
+
+
+
+ pro.taskana.simplehistory
+ taskana-simplehistory-rest-spring
+ ${project.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+
+
+ com.h2database
+ h2
+ ${version.h2}
+
+
+ org.springframework.plugin
+ spring-plugin-core
+
+
+ junit
+ junit
+ ${version.junit}
+ test
+
+
+ org.springframework
+ spring-test
+ test
+
+
+ org.springframework.boot
+ spring-boot-test
+ test
+
+
+ org.springframework.restdocs
+ spring-restdocs-core
+ test
+
+
+ org.springframework.restdocs
+ spring-restdocs-mockmvc
+ test
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${version.maven.surefire}
+
+
+
+ **/*Plugin*Test.java
+
+
+ **/*Test.java
+ **/*Documentation.java
+
+
+ -Xms1024m -Xmx2048m
+
+
+
+ org.asciidoctor
+ asciidoctor-maven-plugin
+ ${version.maven.asciidoctor}
+
+
+ generate-docs
+ prepare-package
+
+ process-asciidoc
+
+
+ html
+ book
+
+ target/generated-snippets
+ shared
+
+
+
+
+
+
+ maven-resources-plugin
+ ${version.maven.resources}
+
+
+ copy-rest-docs
+ prepare-package
+
+ copy-resources
+
+
+
+ ${project.build.outputDirectory}/static/docs/rest
+
+
+
+
+ ${project.build.directory}/generated-docs
+
+
+
+ ${project.basedir}/src/js
+
+
+
+
+
+ copy-documentation-to-taskana-simplehistory-rest-spring-example
+ prepare-package
+
+ copy-resources
+
+
+
+ ../taskana-simplehistory-rest-spring-example/target/generated-docs
+
+
+
+
+ ${project.build.outputDirectory}/static/docs/rest
+
+
+
+
+
+
+
+
+
diff --git a/history/taskana-simplehistory-spring-test/src/main/java/pro/taskana/rest/ExampleDocumentationApplication.java b/history/taskana-simplehistory-spring-test/src/main/java/pro/taskana/rest/ExampleDocumentationApplication.java
index 90895e969..0e94735f0 100644
--- a/history/taskana-simplehistory-spring-test/src/main/java/pro/taskana/rest/ExampleDocumentationApplication.java
+++ b/history/taskana-simplehistory-spring-test/src/main/java/pro/taskana/rest/ExampleDocumentationApplication.java
@@ -26,7 +26,7 @@ import pro.taskana.rest.simplehistory.sampledata.SampleDataGenerator;
*/
@SpringBootApplication
@ComponentScan(basePackages = "pro.taskana.rest.simplehistory")
-@Import( {TaskHistoryRestConfiguration.class})
+@Import({TaskHistoryRestConfiguration.class})
public class ExampleDocumentationApplication {
@Value("${taskana.schemaName:TASKANA}")
diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml
index 5118b16db..e7b7841bf 100644
--- a/rest/taskana-rest-spring-example/pom.xml
+++ b/rest/taskana-rest-spring-example/pom.xml
@@ -14,6 +14,7 @@
1.1.5-SNAPSHOT
../pom.xml
+
diff --git a/web/pom.xml b/web/pom.xml
index c2e32eff1..909cbcaa8 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -10,7 +10,7 @@
pro.taskana
taskana-rest-parent
1.1.5-SNAPSHOT
- ../rest
+ ../rest/pom.xml