Skip to content

Commit 3e9c675

Browse files
marki1anmarki1an
committed
Update after review
1 parent 8393c42 commit 3e9c675

1 file changed

Lines changed: 55 additions & 84 deletions

File tree

‎pom.xml‎

Lines changed: 55 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,52 @@
581581
<target>${java.version}</target>
582582
</configuration>
583583
</plugin>
584+
<plugin>
585+
<groupId>org.apache.maven.plugins</groupId>
586+
<artifactId>maven-failsafe-plugin</artifactId>
587+
<version>${maven-failsafe-plugin.version}</version>
588+
<configuration>
589+
<systemPropertyVariables>
590+
<launchContainers>true</launchContainers>
591+
<mockserver.version>${mockserver.version}</mockserver.version>
592+
<pbs.version>${project.version}</pbs.version>
593+
<tests.max-container-count>5</tests.max-container-count>
594+
<tests.fixed-container-ports>false</tests.fixed-container-ports>
595+
</systemPropertyVariables>
596+
</configuration>
597+
<executions>
598+
<execution>
599+
<id>integration-test</id>
600+
<goals>
601+
<goal>integration-test</goal>
602+
<goal>verify</goal>
603+
</goals>
604+
</execution>
605+
</executions>
606+
</plugin>
607+
<plugin>
608+
<groupId>org.codehaus.gmavenplus</groupId>
609+
<artifactId>gmavenplus-plugin</artifactId>
610+
<version>${gmavenplus-plugin.version}</version>
611+
<configuration>
612+
<parallelParsing>true</parallelParsing>
613+
<testSources>
614+
<testSource>
615+
<directory>${project.basedir}/src/test/groovy</directory>
616+
<includes>
617+
<include>**/*.groovy</include>
618+
</includes>
619+
</testSource>
620+
</testSources>
621+
</configuration>
622+
<executions>
623+
<execution>
624+
<goals>
625+
<goal>compileTests</goal>
626+
</goals>
627+
</execution>
628+
</executions>
629+
</plugin>
584630
</plugins>
585631
</build>
586632

@@ -592,13 +638,10 @@
592638
<plugin>
593639
<groupId>org.apache.maven.plugins</groupId>
594640
<artifactId>maven-surefire-plugin</artifactId>
595-
<version>${maven-surefire-plugin.version}</version>
596641
<configuration>
597642
<systemPropertyVariables>
598643
<launchContainers>true</launchContainers>
599644
</systemPropertyVariables>
600-
<skipTests>${skipUnitTests}</skipTests>
601-
<excludeJUnit5Engines>spock</excludeJUnit5Engines>
602645
</configuration>
603646
</plugin>
604647
</plugins>
@@ -634,54 +677,18 @@
634677
<plugin>
635678
<groupId>org.codehaus.gmavenplus</groupId>
636679
<artifactId>gmavenplus-plugin</artifactId>
637-
<configuration>
638-
<parallelParsing>true</parallelParsing>
639-
<testSources>
640-
<testSource>
641-
<directory>${project.basedir}/src/test/groovy</directory>
642-
<includes>
643-
<include>**/*.groovy</include>
644-
</includes>
645-
</testSource>
646-
</testSources>
647-
</configuration>
648-
<executions>
649-
<execution>
650-
<goals>
651-
<goal>compileTests</goal>
652-
</goals>
653-
</execution>
654-
</executions>
655680
</plugin>
656681
<plugin>
657682
<groupId>org.apache.maven.plugins</groupId>
658683
<artifactId>maven-failsafe-plugin</artifactId>
659684
<configuration>
660-
<systemPropertyVariables>
661-
<mockserver.version>${mockserver.version}</mockserver.version>
662-
<pbs.version>${project.version}</pbs.version>
663-
<tests.max-container-count>5</tests.max-container-count>
664-
<!-- Run only one application container instance on fixed ports for debugging purposes -->
665-
<tests.fixed-container-ports>false</tests.fixed-container-ports>
666-
</systemPropertyVariables>
685+
<excludes>
686+
<exclude>**/tests/module/**/*Spec</exclude>
687+
</excludes>
688+
<includes>
689+
<include>**/*Spec</include>
690+
</includes>
667691
</configuration>
668-
<executions>
669-
<execution>
670-
<id>general-functional-tests</id>
671-
<goals>
672-
<goal>integration-test</goal>
673-
<goal>verify</goal>
674-
</goals>
675-
<configuration>
676-
<excludes>
677-
<exclude>**/tests/module/**/*Spec</exclude>
678-
</excludes>
679-
<includes>
680-
<include>**/*Spec</include>
681-
</includes>
682-
</configuration>
683-
</execution>
684-
</executions>
685692
</plugin>
686693
</plugins>
687694
</build>
@@ -699,51 +706,15 @@
699706
<plugin>
700707
<groupId>org.codehaus.gmavenplus</groupId>
701708
<artifactId>gmavenplus-plugin</artifactId>
702-
<configuration>
703-
<parallelParsing>true</parallelParsing>
704-
<testSources>
705-
<testSource>
706-
<directory>${project.basedir}/src/test/groovy</directory>
707-
<includes>
708-
<include>**/*.groovy</include>
709-
</includes>
710-
</testSource>
711-
</testSources>
712-
</configuration>
713-
<executions>
714-
<execution>
715-
<goals>
716-
<goal>compileTests</goal>
717-
</goals>
718-
</execution>
719-
</executions>
720709
</plugin>
721710
<plugin>
722711
<groupId>org.apache.maven.plugins</groupId>
723712
<artifactId>maven-failsafe-plugin</artifactId>
724713
<configuration>
725-
<systemPropertyVariables>
726-
<mockserver.version>${mockserver.version}</mockserver.version>
727-
<pbs.version>${project.version}</pbs.version>
728-
<tests.max-container-count>5</tests.max-container-count>
729-
<!-- Run only one application container instance on fixed ports for debugging purposes -->
730-
<tests.fixed-container-ports>false</tests.fixed-container-ports>
731-
</systemPropertyVariables>
714+
<includes>
715+
<include>**/tests/module/**/*Spec</include>
716+
</includes>
732717
</configuration>
733-
<executions>
734-
<execution>
735-
<id>module-functional-tests</id>
736-
<goals>
737-
<goal>integration-test</goal>
738-
<goal>verify</goal>
739-
</goals>
740-
<configuration>
741-
<includes>
742-
<include>**/tests/module/**/*Spec</include>
743-
</includes>
744-
</configuration>
745-
</execution>
746-
</executions>
747718
</plugin>
748719
</plugins>
749720
</build>

0 commit comments

Comments
 (0)