diff --git a/pom.xml b/pom.xml
index 3f91e7307861e67d98ceb1713413c12152b77f9f..f000fb60ae6c4fc515abc663c05648eb0afb3253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,12 +40,29 @@
<edelivery.ssl-auth.version>1.14-SNAPSHOT</edelivery.ssl-auth.version>
<edelivery.dynamic-discovery-client.version>2.1-SNAPSHOT</edelivery.dynamic-discovery-client.version>
<bdmsl-api.version>4.3-SNAPSHOT</bdmsl-api.version>
+ <!-- plugin versions -->
+ <plugin.build-helper-maven-plugin.version>1.9.1</plugin.build-helper-maven-plugin.version>
+ <plugin.dependency-check-maven.version>8.4.0</plugin.dependency-check-maven.version>
+ <plugin.jacoco-maven-plugin.version>0.8.10</plugin.jacoco-maven-plugin.version>
+ <plugin.license-maven-plugin.version>2.0.0</plugin.license-maven-plugin.version>
+ <plugin.maven-antrun-plugin.version>3.1.0</plugin.maven-antrun-plugin.version>
+ <plugin.maven-assembly-plugin.version>3.6.0</plugin.maven-assembly-plugin.version>
+ <plugin.maven-bundle-plugin.version>3.0.0</plugin.maven-bundle-plugin.version>
+ <plugin.maven-clean-plugin.version>3.3.1</plugin.maven-clean-plugin.version>
+ <plugin.maven-compiler-plugin.version>3.11.0</plugin.maven-compiler-plugin.version>
+ <plugin.maven-dependency-plugin.version>3.3.0</plugin.maven-dependency-plugin.version>
+ <plugin.maven-failsafe-plugin.version>3.1.2</plugin.maven-failsafe-plugin.version>
+ <plugin.maven-jar-plugin.version>3.3.0</plugin.maven-jar-plugin.version>
+ <plugin.maven-release-plugin.version>3.0.1</plugin.maven-release-plugin.version>
+ <plugin.maven-resources-plugin.version>3.3.1</plugin.maven-resources-plugin.version>
+ <plugin.maven-surefire-plugin.version>3.1.2</plugin.maven-surefire-plugin.version>
+ <plugin.maven-war-plugin.version>3.4.0</plugin.maven-war-plugin.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<ant-commons-net.version>1.6.5</ant-commons-net.version>
<aspectj.version>1.9.20.1</aspectj.version>
- <build.helper.maven.version>1.9.1</build.helper.maven.version>
+
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-io.version>2.13.0</commons-io.version>
@@ -86,15 +103,15 @@
<servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>2.0.9</slf4j.version>
<spring-modules-jakarta-commons.version>0.8</spring-modules-jakarta-commons.version>
- <spring-boot.version>2.7.15</spring-boot.version>
+ <spring-boot.version>2.7.16</spring-boot.version>
<spring-boot.tomcat.version>9.0.80</spring-boot.tomcat.version>
- <spring.security.version>5.8.6</spring.security.version>
- <spring.version>5.3.29</spring.version>
+ <spring.security.version>5.8.7</spring.security.version>
+ <spring.version>5.3.30</spring.version>
<xmlunit.version>2.9.1</xmlunit.version>
<!-- plugins -->
- <frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
- <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <plugin.frontend-maven-plugin.version>1.12.1</plugin.frontend-maven-plugin.version>
+ <plugin.exec-maven-plugin.version>1.6.0</plugin.exec-maven-plugin.version>
<surefire.jvm.args></surefire.jvm.args>
<failsafe.jvm.args></failsafe.jvm.args>
@@ -108,9 +125,6 @@
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.jacoco.itReportPath>${project.basedir}/../target/jacoco-it.exec</sonar.jacoco.itReportPath>
- <jacoco.maven.plugin.version>0.8.9</jacoco.maven.plugin.version>
- <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
<sonar.exclusions>
**/target/**,
**/smp-angular/node_modules/**,
@@ -127,7 +141,7 @@
**/*Constants.java,
</sonar.coverage.exclusions>
<!-- latest version compatible with SonarQube 5.6 is: 3.3.0.603-->
- <sonar.maven.plugin.version>3.5.0.1254</sonar.maven.plugin.version>
+ <plugin.sonar-maven-plugin.version>3.5.0.1254</plugin.sonar-maven-plugin.version>
<release.arguments>-Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true
</release.arguments>
<project.scm.id>edelivery-scm</project.scm.id>
@@ -673,28 +687,28 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
+ <version>${plugin.maven-surefire-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin.version}</version>
+ <version>${plugin.maven-failsafe-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.maven.plugin.version}</version>
+ <version>${plugin.jacoco-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>${sonar.maven.plugin.version}</version>
+ <version>${plugin.sonar-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build.helper.maven.version}</version>
+ <version>${plugin.build-helper-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.cxf</groupId>
@@ -704,17 +718,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
+ <version>${plugin.maven-war-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${plugin.maven-resources-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>${plugin.maven-antrun-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${plugin.maven-dependency-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${plugin.maven-assembly-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -724,32 +748,32 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${plugin.maven-clean-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>${plugin.maven-compiler-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${plugin.maven-bundle-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.6</version>
+ <version>${plugin.maven-jar-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>${frontend-maven-plugin.version}</version>
+ <version>${plugin.frontend-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
+ <version>${plugin.exec-maven-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -825,7 +849,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.1</version>
+ <version>${plugin.maven-release-plugin.version}</version>
<configuration>
<arguments>-DusePreInstallNpm -Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true
-Dmaven.test.skip=true
@@ -847,7 +871,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>8.3.1</version>
+ <version>${plugin.dependency-check-maven.version}</version>
<inherited>false</inherited>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
@@ -879,7 +903,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>2.0.0</version>
+ <version>${plugin.license-maven-plugin.version}</version>
<executions>
<execution>
<id>download-licenses</id>
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 8b53b2bfb2e9fad2682654570d7fd138dfde13a6..c7ac3ed5772956388591ad6104cdf60d4463a941 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -254,31 +254,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.jks</exclude>
- <exclude>**/*.crt</exclude>
- </excludes>
- </testResource>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- <!-- With filtering=true Maven was introducing changes in keystore binary files [sic!] -->
- <includes>
- <include>**/*.jks</include>
- <include>**/*.crt</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/smp-springboot/pom.xml b/smp-springboot/pom.xml
index d40de2ec6226525b07043660c85cd21040ada191..26ed3fd33cc426083dccc56c1e5babc4a4902e4f 100644
--- a/smp-springboot/pom.xml
+++ b/smp-springboot/pom.xml
@@ -14,7 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
@@ -37,7 +38,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.3.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index 02c12664255d1fe55b53c1ff5a114ed8753d082b..a1cda88d397040a045a492ca89fe360185547cab 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -28,7 +28,7 @@
<artifactId>smp-angular</artifactId>
<version>${project.version}</version>
</dependency>
-<!-- oasis SMP is included by default to smp deployment-->
+ <!-- oasis SMP is included by default to smp deployment-->
<dependency>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>oasis-smp-spi</artifactId>
@@ -81,7 +81,6 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
-
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
@@ -152,7 +151,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<warName>${project.artifactId}</warName>
<archive>
@@ -181,7 +179,9 @@
<goal>single</goal>
</goals>
<configuration>
- <descriptor>src/main/smp-setup/smp-setup.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/smp-setup/smp-setup.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>