From 114c93ed8b9b8b5d5b7fd6414377736a4a79602a Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Tue, 16 Jan 2024 07:29:41 +0100
Subject: [PATCH] Fix build
---
domismp-tests/domismp-tests-ui/pom.xml | 14 ++++++++------
domismp-tests/pom.xml | 4 ++--
pom.xml | 9 +++------
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/domismp-tests/domismp-tests-ui/pom.xml b/domismp-tests/domismp-tests-ui/pom.xml
index 77661a489..b6825a260 100644
--- a/domismp-tests/domismp-tests-ui/pom.xml
+++ b/domismp-tests/domismp-tests-ui/pom.xml
@@ -12,6 +12,9 @@
<properties>
<!-- configuration example-->
<test.properties.path>./src/main/resources/myLocal.properties</test.properties.path>
+ <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <!-- dependencies versions-->
<commons-csv_version>1.10.0</commons-csv_version>
<selenium-chrome-driver_version>4.16.1</selenium-chrome-driver_version>
<selenium-java_version>4.16.1</selenium-java_version>
@@ -24,12 +27,14 @@
<javax.ws.rs-api_version>2.1.1</javax.ws.rs-api_version>
<javax.ws.rs-api_version>2.1.1</javax.ws.rs-api_version>
<xmlunit_version>1.6</xmlunit_version>
- <maven-surefire-plugin_version>3.2.2</maven-surefire-plugin_version>
<testng_version>7.8.0</testng_version>
<logback-classic_version>1.4.11</logback-classic_version>
<extentreports_version>5.1.1</extentreports_version>
<commons-lang3_version>3.13.0</commons-lang3_version>
<commons-io_version>2.15.0</commons-io_version>
+ <!-- plugin versions-->
+ <maven-surefire-plugin_version>3.2.2</maven-surefire-plugin_version>
+ <maven-compiler-plugin>3.11.0</maven-compiler-plugin>
</properties>
<build>
@@ -37,13 +42,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.0</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
+ <version>${maven-compiler-plugin}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin_version}</version>
<configuration>
diff --git a/domismp-tests/pom.xml b/domismp-tests/pom.xml
index c82b66365..ec03dc97a 100644
--- a/domismp-tests/pom.xml
+++ b/domismp-tests/pom.xml
@@ -26,7 +26,7 @@
<description>The sub-modules contains DomiSMP artefacts/plans for integration/end-to-end testing.</description>
<modules>
<module>domismp-docker</module>
- <module>domismp-soapui</module>
- <module>domismp-ui</module>
+ <module>domismp-tests-api</module>
+ <module>domismp-tests-ui</module>
</modules>
</project>
diff --git a/pom.xml b/pom.xml
index defb1d94d..353f20de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ See the Licence for the specific language governing permissions and limitations
<module>smp-resource-extensions</module>
<module>smp-webapp</module>
<module>smp-springboot</module>
- <module>smp-soapui-tests</module>
+ <module>domismp-tests</module>
<module>smp-examples</module>
<module>smp-aggregator</module>
</modules>
@@ -47,6 +47,8 @@ See the Licence for the specific language governing permissions and limitations
Alternative ${session.executionRootDirectory} -->
<project.root.baseUri>${maven.multiModuleProjectDirectory}</project.root.baseUri>
+ <!-- Note: domismp application target is JDK 8, but minimal build JDK version must be Java 11 due to domismp-tests modules
+ -->
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -259,11 +261,6 @@ See the Licence for the specific language governing permissions and limitations
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
- <dependency>
- <groupId>eu.europa.ec.cipa</groupId>
- <artifactId>cipa-edelivery-common</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
--
GitLab