diff --git a/pom.xml b/pom.xml
index ac9533890b4e1ed89de8c3eedfcb87639aa44931..4ca48df05f4771c1ccd916538080688ad84b9e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,228 +1,228 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright 2017 European Commission | CEF eDelivery
- ~
- ~ Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
- ~ You may not use this work except in compliance with the Licence.
- ~
- ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
- ~
- ~ Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the Licence for the specific language governing permissions and limitations under the Licence.
- -->
-
-<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>
- <groupId>eu.europa.ec</groupId>
- <artifactId>smp-modules</artifactId>
- <packaging>pom</packaging>
- <name>SMP</name>
- <version>4.1.0-SNAPSHOT</version>
-
- <modules>
- <module>smp-parent-pom</module>
- <module>smp-api</module>
- <module>smp-angular</module>
- <module>smp-server-library</module>
- <module>smp-webapp</module>
- </modules>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
-
- <sonar.host.url>http://edelquality.westeurope.cloudapp.azure.com:9000/sonar/</sonar.host.url>
- <sonar.exclusions>**/smp/data/model/*,**/smp/data/ui/*, **/smp/exceptions/*, **/to_be_removed/*</sonar.exclusions>
- <sonar.language>java</sonar.language>
- <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
-
- <!-- jacoco remote agent settings start -->
- <sonar.jacoco.remotePort>${jacocoRemotePort}</sonar.jacoco.remotePort>
- <sonar.jacoco.remoteAddress>${jacocoRemoteAddress}</sonar.jacoco.remoteAddress>
- <!-- jacoco remote agent settings end -->
-
- <!-- jacoco, sonar code coverage settings start -->
- <sonar.jacoco.codeCoveragePath>${maven.multiModuleProjectDirectory}/code-coverage</sonar.jacoco.codeCoveragePath>
- <sonar.jacoco.reportPath>${sonar.jacoco.codeCoveragePath}/jacoco-ut.exec</sonar.jacoco.reportPath>
- <!-- jacoco, sonar code coverage settings end -->
-
- <!-- default value for deploy under Weblogic, etc -->
- <deployWarFolder>/home/edelivery/oracle/middleware/domains/bdmsl/autodeploy/</deployWarFolder>
- </properties>
-
- <scm>
- <developerConnection>scm:git:https://ec.europa.eu/cefdigital/code/scm/edelivery/smp.git</developerConnection>
- </scm>
-
-
- <pluginRepositories>
- <pluginRepository>
- <id>SmartBearPluginRepository</id>
- <url>http://www.soapui.org/repository/maven2/</url>
- </pluginRepository>
- <pluginRepository>
- <id>eviwarePluginRepository</id>
- <url>http://www.eviware.com/repository/maven2/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <profiles>
- <!-- soap ui -->
- <profile>
- <id>run-soapui</id>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>com.smartbear.soapui</groupId>
- <artifactId>soapui-pro-maven-plugin</artifactId>
- <version>5.0.0</version>
- <configuration>
- <outputFolder>${sonar.jacoco.codeCoveragePath}/surefire-reports</outputFolder>
- <junitReport>true</junitReport>
- <printReport>true</printReport>
- <settingsFile>${maven.multiModuleProjectDirectory}/smp-soapui-tests/soapui/soapui-settings.xml</settingsFile>
- <soapuiProperties>
- <property>
- <name>soapui.scripting.library</name>
- <value>${maven.multiModuleProjectDirectory}/smp-soapui-tests/groovy</value>
- </property>
- <property>
- <name>soapui.logroot</name>
- <value>${sonar.jacoco.codeCoveragePath}/soapui/logs/</value>
- </property>
- <property>
- <name>http.nonProxyHosts</name>
- <value>localhost|127.*|[::1]</value>
- </property>
- </soapuiProperties>
- <testFailIgnore>true</testFailIgnore>
- <projectFile>${maven.multiModuleProjectDirectory}/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml</projectFile>
- <testSuite>PASSING_AUTO_BAMBOO</testSuite>
- <!--If you want to execute single test case <testCase>SMP001-Create ServiceGroup-Basic Flow-Admin Service Group specified</testCase>-->
- <projectProperties>
- <value>url=${url}</value>
- <value>SMPAdminUser=${SMPAdminUser}</value>
- <value>SMPAdminPassword=${SMPAdminPassword}</value>
- </projectProperties>
- </configuration>
-
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
-
- </plugin>
-
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.maven.plugin.version}</version>
-
- <executions>
- <execution>
- <phase>post-integration-test</phase>
-
- <goals>
- <goal>dump</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- <address>${sonar.jacoco.remoteAddress}</address>
- <port>${sonar.jacoco.remotePort}</port>
- <reset>false</reset>
- <append>true</append>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>deploy-war</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- <groupId>org.codehaus.mojo</groupId>
- <executions>
- <execution><!-- Deploy war under weblogic -->
- <id>Deploy war under weblogic</id>
- <phase>package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <environmentVariables>
- <DEPLOY_FOLDER>
- ${deployWarFolder}
- </DEPLOY_FOLDER>
- </environmentVariables>
- <executable>bash</executable>
- <commandlineArgs>deploy_war.sh</commandlineArgs>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
- </profile>
-
- <profile>
- <id>dependency-check</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>3.2.1</version>
- <inherited>false</inherited>
- <configuration>
- <skipProvidedScope>true</skipProvidedScope>
- <skipRuntimeScope>true</skipRuntimeScope>
- <!-- Disable .Net Assembly Analyzer -->
- <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <!-- latest version compatible with SonarQube 5.6 -->
- <version>3.3.0.603</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ You may not use this work except in compliance with the Licence.
+ ~
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the Licence for the specific language governing permissions and limitations under the Licence.
+ -->
+
+<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>
+ <groupId>eu.europa.ec</groupId>
+ <artifactId>smp-modules</artifactId>
+ <packaging>pom</packaging>
+ <name>SMP</name>
+ <version>4.1.0-RC1</version>
+
+ <modules>
+ <module>smp-parent-pom</module>
+ <module>smp-api</module>
+ <module>smp-angular</module>
+ <module>smp-server-library</module>
+ <module>smp-webapp</module>
+ </modules>
+
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+
+ <sonar.host.url>http://edelquality.westeurope.cloudapp.azure.com:9000/sonar/</sonar.host.url>
+ <sonar.exclusions>**/smp/data/model/*,**/smp/data/ui/*, **/smp/exceptions/*, **/to_be_removed/*</sonar.exclusions>
+ <sonar.language>java</sonar.language>
+ <jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
+
+ <!-- jacoco remote agent settings start -->
+ <sonar.jacoco.remotePort>${jacocoRemotePort}</sonar.jacoco.remotePort>
+ <sonar.jacoco.remoteAddress>${jacocoRemoteAddress}</sonar.jacoco.remoteAddress>
+ <!-- jacoco remote agent settings end -->
+
+ <!-- jacoco, sonar code coverage settings start -->
+ <sonar.jacoco.codeCoveragePath>${maven.multiModuleProjectDirectory}/code-coverage</sonar.jacoco.codeCoveragePath>
+ <sonar.jacoco.reportPath>${sonar.jacoco.codeCoveragePath}/jacoco-ut.exec</sonar.jacoco.reportPath>
+ <!-- jacoco, sonar code coverage settings end -->
+
+ <!-- default value for deploy under Weblogic, etc -->
+ <deployWarFolder>/home/edelivery/oracle/middleware/domains/bdmsl/autodeploy/</deployWarFolder>
+ </properties>
+
+ <scm>
+ <developerConnection>scm:git:https://ec.europa.eu/cefdigital/code/scm/edelivery/smp.git</developerConnection>
+ <tag>4.1.0-RC1</tag>
+ </scm>
+
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>SmartBearPluginRepository</id>
+ <url>http://www.soapui.org/repository/maven2/</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>eviwarePluginRepository</id>
+ <url>http://www.eviware.com/repository/maven2/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <profiles>
+ <!-- soap ui -->
+ <profile>
+ <id>run-soapui</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>com.smartbear.soapui</groupId>
+ <artifactId>soapui-pro-maven-plugin</artifactId>
+ <version>5.0.0</version>
+ <configuration>
+ <outputFolder>${sonar.jacoco.codeCoveragePath}/surefire-reports</outputFolder>
+ <junitReport>true</junitReport>
+ <printReport>true</printReport>
+ <settingsFile>${maven.multiModuleProjectDirectory}/smp-soapui-tests/soapui/soapui-settings.xml</settingsFile>
+ <soapuiProperties>
+ <property>
+ <name>soapui.scripting.library</name>
+ <value>${maven.multiModuleProjectDirectory}/smp-soapui-tests/groovy</value>
+ </property>
+ <property>
+ <name>soapui.logroot</name>
+ <value>${sonar.jacoco.codeCoveragePath}/soapui/logs/</value>
+ </property>
+ <property>
+ <name>http.nonProxyHosts</name>
+ <value>localhost|127.*|[::1]</value>
+ </property>
+ </soapuiProperties>
+ <testFailIgnore>true</testFailIgnore>
+ <projectFile>${maven.multiModuleProjectDirectory}/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml</projectFile>
+ <testSuite>PASSING_AUTO_BAMBOO</testSuite>
+ <!--If you want to execute single test case <testCase>SMP001-Create ServiceGroup-Basic Flow-Admin Service Group specified</testCase>-->
+ <projectProperties>
+ <value>url=${url}</value>
+ <value>SMPAdminUser=${SMPAdminUser}</value>
+ <value>SMPAdminPassword=${SMPAdminPassword}</value>
+ </projectProperties>
+ </configuration>
+
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.maven.plugin.version}</version>
+
+ <executions>
+ <execution>
+ <phase>post-integration-test</phase>
+
+ <goals>
+ <goal>dump</goal>
+ </goals>
+ <configuration>
+ <destFile>${sonar.jacoco.reportPath}</destFile>
+ <address>${sonar.jacoco.remoteAddress}</address>
+ <port>${sonar.jacoco.remotePort}</port>
+ <reset>false</reset>
+ <append>true</append>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>deploy-war</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <executions>
+ <execution><!-- Deploy war under weblogic -->
+ <id>Deploy war under weblogic</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <environmentVariables>
+ <DEPLOY_FOLDER>
+ ${deployWarFolder}
+ </DEPLOY_FOLDER>
+ </environmentVariables>
+ <executable>bash</executable>
+ <commandlineArgs>deploy_war.sh</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+ </profile>
+
+ <profile>
+ <id>dependency-check</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>3.2.1</version>
+ <inherited>false</inherited>
+ <configuration>
+ <skipProvidedScope>true</skipProvidedScope>
+ <skipRuntimeScope>true</skipRuntimeScope>
+ <!-- Disable .Net Assembly Analyzer -->
+ <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <!-- latest version compatible with SonarQube 5.6 -->
+ <version>3.3.0.603</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml
index f830db92e340ecbbce89a8c6a589a1d3d7cd1e77..b9e62adf4ce338113d511d9585bfb19908fb9635 100644
--- a/smp-angular/pom.xml
+++ b/smp-angular/pom.xml
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- 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>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0-RC1</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp-angular</artifactId>
diff --git a/smp-api/pom.xml b/smp-api/pom.xml
index 045b8e885f958a338a71255e02b17ef4c66115d8..1e1d5e4358f3bb65feff48fbae5d9ae22f6ec7b8 100644
--- a/smp-api/pom.xml
+++ b/smp-api/pom.xml
@@ -12,13 +12,12 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence.
-->
-<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>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0-RC1</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
diff --git a/smp-parent-pom/pom.xml b/smp-parent-pom/pom.xml
index dadb6caa3337fa21c0bbd87c4d70b3c81cfd00a8..02769fac050f2460b870a60ffc26f045526eaadb 100644
--- a/smp-parent-pom/pom.xml
+++ b/smp-parent-pom/pom.xml
@@ -12,12 +12,11 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence.
-->
-<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>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0-RC1</version>
<packaging>pom</packaging>
<name>smp-parent-pom</name>
<description>SMP - CEF eDelivery</description>
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 7cfd9c45aed7a9eb06743c2a75a62a3621a63799..c6afb76b6e168dfa30137e7f6a893b5026346f06 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -11,13 +11,12 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence.
-->
-<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>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0-RC1</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp-server-library</artifactId>
@@ -247,8 +246,7 @@
1. Parameter: comma separated hibernate database dialects
2. script version
3. export scripts.-->
- <java classname="eu.europa.ec.edelivery.smp.data.dao.utils.SMPSchemaGenerator"
- fork="true" failonerror="true">
+ <java classname="eu.europa.ec.edelivery.smp.data.dao.utils.SMPSchemaGenerator" fork="true" failonerror="true">
<arg value="org.hibernate.dialect.Oracle10gDialect,org.hibernate.dialect.MySQL5InnoDBDialect" />
<arg value="${project.version}" />
<arg value="${project.basedir}/../smp-webapp/src/main/smp-setup/database-scripts" />
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index 2de4193eff1c91406cd039b4b9d105382ec641d7..b8d6b8240bde5421d8f03bdb48561856d0d36c7c 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0-RC1</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp</artifactId>
@@ -185,14 +185,9 @@
<artifactId>maven-antrun-plugin</artifactId>
<configuration>
<target>
- <ftp server="${ftp.host}"
- port="${ftp.port}"
- passive="yes"
- remotedir="${ftp.remotedir}"
- userid="${ftp.user}"
- password="${ftp.password}">
+ <ftp server="${ftp.host}" port="${ftp.port}" passive="yes" remotedir="${ftp.remotedir}" userid="${ftp.user}" password="${ftp.password}">
<fileset dir="${project.build.directory}">
- <include name="${project.artifactId}.${project.packaging}"/>
+ <include name="${project.artifactId}.${project.packaging}" />
</fileset>
</ftp>
</target>