diff --git a/pom.xml b/pom.xml index 97bcf0b59f5962bb162a5f93736b7fc2a9d1d24e..858ffb4c07eb5d62aae2f30d8441ee89e80aed0d 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,6 @@ <orika.version>1.5.4</orika.version> <servlet-api.version>3.0.1</servlet-api.version> <slf4j.version>1.7.36</slf4j.version> - <soapui.plugin.version>5.1.2</soapui.plugin.version> <spring-modules-jakarta-commons.version>0.8</spring-modules-jakarta-commons.version> <spring-boot.version>2.7.10</spring-boot.version> <spring-boot.tomcat.version>9.0.73</spring-boot.tomcat.version> @@ -136,17 +135,6 @@ <tag>HEAD</tag> </scm> - <pluginRepositories> - <pluginRepository> - <id>SmartBearPluginRepository</id> - <url>https://www.soapui.org/repository/maven2/</url> - </pluginRepository> - <pluginRepository> - <id>eviwarePluginRepository</id> - <url>https://www.eviware.com/repository/maven2/</url> - </pluginRepository> - </pluginRepositories> - <repositories> <repository> <id>cefdigital-releases</id> @@ -721,16 +709,6 @@ <artifactId>maven-dependency-plugin</artifactId> <version>3.3.0</version> </plugin> - <plugin> - <groupId>com.smartbear.soapui</groupId> - <artifactId>soapui-pro-maven-plugin</artifactId> - <version>${soapui.plugin.version}</version> - </plugin> - <plugin> - <groupId>com.smartbear.soapui</groupId> - <artifactId>soapui-maven-plugin</artifactId> - <version>${soapui.plugin.version}</version> - </plugin> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> diff --git a/smp-soapui-tests/pom.xml b/smp-soapui-tests/pom.xml index 43c6f7b8ad8a282a0a6586321dcc91cb5583545b..e44b97afa51147ed3c9e026a8241535dfcc83fb9 100644 --- a/smp-soapui-tests/pom.xml +++ b/smp-soapui-tests/pom.xml @@ -12,6 +12,7 @@ <name>smp-soapui-tests</name> <description>Interaction tests suit for SMP</description> + <properties> <!-- Only selected modules are deployed --> <maven.deploy.skip>false</maven.deploy.skip> @@ -20,12 +21,81 @@ <SMPAdminPassword/> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- the soap ui specific dependencies --> + <com.smartbear.soapui.version>5.1.2</com.smartbear.soapui.version> + <org.codehaus.groovy.version>2.9.2-01</org.codehaus.groovy.version> + <org.codehaus.groovy.eclipse-batch.version>2.5.13-01</org.codehaus.groovy.eclipse-batch.version> + <http-builder.version>0.7.1</http-builder.version> <reflection.version>0.9.11</reflection.version> <httpcore.version>4.4.3</httpcore.version> <apache.http4.client.version>4.5.14</apache.http4.client.version> </properties> + + <pluginRepositories> + <pluginRepository> + <id>SmartBearPluginRepository</id> + <url>https://www.soapui.org/repository/maven2/</url> + </pluginRepository> + <pluginRepository> + <id>eviwarePluginRepository</id> + <url>https://www.eviware.com/repository/maven2/</url> + </pluginRepository> + </pluginRepositories> + + <repositories> + <repository> + <id>SmartBearPluginRepository</id> + <url>https://www.soapui.org/repository/maven2/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + + <dependencies> + <!-- for development purposes only. The soapui +has its own groovy library --> + <dependency> + <groupId>com.smartbear.soapui</groupId> + <artifactId>soapui</artifactId> + <version>${com.smartbear.soapui.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerId>groovy-eclipse-compiler</compilerId> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-compiler</artifactId> + <version>${org.codehaus.groovy.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-batch</artifactId> + <version>${org.codehaus.groovy.eclipse-batch.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-compiler</artifactId> + <version>${org.codehaus.groovy.version}</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> <profiles> <!-- soap ui --> <profile> @@ -36,7 +106,7 @@ <plugin> <groupId>com.smartbear.soapui</groupId> <artifactId>soapui-pro-maven-plugin</artifactId> - <version>5.1.2</version> + <version>${com.smartbear.soapui.version}</version> <configuration> <outputFolder>${project.build.directory}/soapui-reports/</outputFolder> <junitReport>true</junitReport> @@ -45,7 +115,7 @@ <soapuiProperties> <property> <name>soapui.scripting.library</name> - <value>${basedir}/groovy</value> + <value>${basedir}/src/main/groovy</value> </property> <property> <name>soapui.logroot</name> @@ -68,39 +138,39 @@ <value>url=${url}</value> <value>SMPAdminUser=${SMPAdminUser}</value> <value>SMPAdminPassword=${SMPAdminPassword}</value> - </projectProperties> - </configuration> - <dependencies> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${reflection.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy.modules.http-builder</groupId> - <artifactId>http-builder</artifactId> - <version>${http-builder.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${httpcore.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${apache.http4.client.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> - </plugin> + </projectProperties> + </configuration> + <dependencies> + <dependency> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${reflection.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy.modules.http-builder</groupId> + <artifactId>http-builder</artifactId> + <version>${http-builder.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${httpcore.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${apache.http4.client.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin> <!-- extract classes so that JACOCO plugin can find the classes to generate a report (use this option to get Code coverage report for SOAPUI project) @@ -117,7 +187,7 @@ </goals> <configuration> <artifactItems> - <artifactItem> + <artifactItem> <groupId>${project.groupId}</groupId> <artifactId>smp-server-library</artifactId> <version>${project.version}</version> @@ -136,7 +206,6 @@ </execution> </executions> </plugin> - </plugins> </build> </profile> diff --git a/smp-soapui-tests/groovy/SMP.groovy b/smp-soapui-tests/src/main/java/SMP.groovy similarity index 100% rename from smp-soapui-tests/groovy/SMP.groovy rename to smp-soapui-tests/src/main/java/SMP.groovy