diff --git a/pom.xml b/pom.xml
index eb774ba5280e308500af340b03b96fbe530836f1..e6c0615398246465dfca1e4ce7d088aebb00c904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,15 +739,6 @@
<configuration>
<runOrder>alphabetical</runOrder>
</configuration>
- <dependencies>
- <!-- Force using the latest JUnit 47 provider -->
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- </dependency>
- </dependencies>
-
</plugin>
<!-- jacoco start -->
<plugin>
diff --git a/smp-aggregator/pom.xml b/smp-aggregator/pom.xml
index 487bbbaf31b1eb75e90bbd9ad4d8a676b15a5d15..003ce3bbf88a6c3ff22023f927efd59c00d0e26d 100644
--- a/smp-aggregator/pom.xml
+++ b/smp-aggregator/pom.xml
@@ -9,6 +9,11 @@
<artifactId>smp-aggregator</artifactId>
<dependencies>
+ <dependency>
+ <groupId>eu.europa.ec.edelivery</groupId>
+ <artifactId>oasis-smp-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-spi</artifactId>
diff --git a/smp-resource-extensions/oasis-cppa3-spi/pom.xml b/smp-resource-extensions/oasis-cppa3-spi/pom.xml
index 239932e03f0aa6870089e64ffb10189723208e16..3312dbb6ecedc00a8840c26f78cbf778f4f29b06 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/pom.xml
+++ b/smp-resource-extensions/oasis-cppa3-spi/pom.xml
@@ -112,16 +112,6 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit-jupiter.version}</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/smp-resource-extensions/oasis-smp-spi/pom.xml b/smp-resource-extensions/oasis-smp-spi/pom.xml
index 03aa5ad9d5bdc8df18193f22b7b41d0af36822a8..e8d6d2e99efb6089e09a06156142236e0279e327 100644
--- a/smp-resource-extensions/oasis-smp-spi/pom.xml
+++ b/smp-resource-extensions/oasis-smp-spi/pom.xml
@@ -104,22 +104,7 @@
</dependencies>
<build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <!--dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-surefire-provider</artifactId>
- <version>1.3.2</version>
- </dependency-->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit-jupiter.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ServiceGroupConverterTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ServiceGroupConverterTest.java
index 6241e5e0623198aa6a87fdd5d34210d3ef63384a..4eb083c284bdab068ccde4716d0f6d71f20a3726 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ServiceGroupConverterTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ServiceGroupConverterTest.java
@@ -32,7 +32,7 @@ class ServiceGroupConverterTest {
OasisSMP10ServiceGroupReader testInstance = new OasisSMP10ServiceGroupReader();
- private static final String RES_PATH = "/examples/conversion/";
+ private static final String RES_PATH = "/examples/oasis-smp-1.0/";
@Test
@@ -46,8 +46,6 @@ class ServiceGroupConverterTest {
//then
assertNotNull(serviceGroup);
- assertTrue(serviceGroup.getExtensions().isEmpty());
- assertEquals("http://poland.pl", serviceGroup.getServiceMetadataReferenceCollection().getServiceMetadataReferences().get(0).getHref());
}
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 9ea48f9ba8e090cd1cbd2b2113fd022f33314e4b..9e548aced6ca12543bd1cdf5593ed01e6d72e22b 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -263,6 +263,21 @@
</testResource>
</testResources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <runOrder>alphabetical</runOrder>
+ </configuration>
+ <dependencies>
+ <!-- Force using the latest JUnit 47 provider. Remove this when moving to JUNIT5 -->
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index 099ea45a633401ecb98317e09c27fe054b5c63a8..7cb23c94b797ea62ac6c705201146760380829c8 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
@@ -51,7 +52,7 @@
<groupId>eu.europa.ec.dynamic-discovery</groupId>
<artifactId>dynamic-discovery-client</artifactId>
</dependency>
-<!-- end oasis SMP is included by default to smp deployment-->
+ <!-- end oasis SMP is included by default to smp deployment-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
@@ -146,6 +147,22 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <runOrder>alphabetical</runOrder>
+ </configuration>
+ <dependencies>
+ <!-- Force using the latest JUnit 47 provider Remove this when moving to JUNIT5 -->
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </dependency>
+ </dependencies>
+
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>