This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit f24c0dbc authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Merge pull request #120 in EDELIVERY/smp from master to development 

* commit '0f1f6d7a6862c5cdd77b3007b306b4d7305741ae':
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 4.1.0-RC1
  [maven-release-plugin] rollback the release of 4.1.0-RC1
  add maven release plugin configuration
  [maven-release-plugin] prepare release 4.1.0-RC1
  add maven release plugin configuration
parents f80ec266 68882e7a
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ f24c0dbc
...@@ -28,3 +28,4 @@ addons/cipa-sml-migration/target/test-classes/global-truststore.jks ...@@ -28,3 +28,4 @@ addons/cipa-sml-migration/target/test-classes/global-truststore.jks
addons/cipa-sml-migration/target/classes/ addons/cipa-sml-migration/target/classes/
addons/cipa-sml-migration/target/ addons/cipa-sml-migration/target/
addons/cipa-sml-migration/.idea/ addons/cipa-sml-migration/.idea/
.idea/
\ No newline at end of file
pom.xml
+ 228
− 217
View file @ f24c0dbc
...@@ -12,14 +12,13 @@ ...@@ -12,14 +12,13 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence. ~ 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" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>eu.europa.ec</groupId> <groupId>eu.europa.ec</groupId>
<artifactId>smp-modules</artifactId> <artifactId>smp-modules</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>SMP</name> <name>SMP</name>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-RC2-SNAPSHOT</version>
<modules> <modules>
<module>smp-parent-pom</module> <module>smp-parent-pom</module>
...@@ -31,7 +30,7 @@ ...@@ -31,7 +30,7 @@
<properties> <properties>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
<project.scm.id>edelivery-scm</project.scm.id>
<sonar.host.url>http://edelquality.westeurope.cloudapp.azure.com:9000/sonar/</sonar.host.url> <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.exclusions>**/smp/data/model/*,**/smp/data/ui/*, **/smp/exceptions/*, **/to_be_removed/*</sonar.exclusions>
<sonar.language>java</sonar.language> <sonar.language>java</sonar.language>
...@@ -51,6 +50,11 @@ ...@@ -51,6 +50,11 @@
<deployWarFolder>/home/edelivery/oracle/middleware/domains/bdmsl/autodeploy/</deployWarFolder> <deployWarFolder>/home/edelivery/oracle/middleware/domains/bdmsl/autodeploy/</deployWarFolder>
</properties> </properties>
<scm>
<developerConnection>scm:git:https://ec.europa.eu/cefdigital/code/scm/edelivery/smp.git</developerConnection>
<tag>HEAD</tag>
</scm>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
...@@ -211,6 +215,13 @@ ...@@ -211,6 +215,13 @@
<!-- latest version compatible with SonarQube 5.6 --> <!-- latest version compatible with SonarQube 5.6 -->
<version>3.3.0.603</version> <version>3.3.0.603</version>
</plugin> </plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
smp-angular/pom.xml
+ 3
− 4
View file @ f24c0dbc
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.europa.ec.edelivery</groupId> <groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId> <artifactId>smp-parent-pom</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-RC2-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath> <relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent> </parent>
<artifactId>smp-angular</artifactId> <artifactId>smp-angular</artifactId>
...@@ -62,6 +60,7 @@ ...@@ -62,6 +60,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<configuration> <configuration>
<filesets> <filesets>
<fileset> <fileset>
......
smp-api/pom.xml
+ 2
− 3
View file @ f24c0dbc
...@@ -12,13 +12,12 @@ ...@@ -12,13 +12,12 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence. ~ 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" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.europa.ec.edelivery</groupId> <groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId> <artifactId>smp-parent-pom</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-RC2-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath> <relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent> </parent>
......
smp-parent-pom/pom.xml
+ 2
− 18
View file @ f24c0dbc
...@@ -12,21 +12,15 @@ ...@@ -12,21 +12,15 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence. ~ 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" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>eu.europa.ec.edelivery</groupId> <groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId> <artifactId>smp-parent-pom</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-RC2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>smp-parent-pom</name> <name>smp-parent-pom</name>
<description>SMP - CEF eDelivery</description> <description>SMP - CEF eDelivery</description>
<!-- Minimum Maven version -->
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<!-- Used licenses --> <!-- Used licenses -->
<licenses> <licenses>
<license> <license>
...@@ -356,11 +350,6 @@ ...@@ -356,11 +350,6 @@
</dependency> </dependency>
<!-- Support for Ehcache and others --> <!-- Support for Ehcache and others -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.security.version}</version>
</dependency>
<!-- dependency> <!-- dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
...@@ -571,11 +560,6 @@ ...@@ -571,11 +560,6 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
smp-server-library/pom.xml
+ 3
− 10
View file @ f24c0dbc
...@@ -11,13 +11,12 @@ ...@@ -11,13 +11,12 @@
~ See the Licence for the specific language governing permissions and limitations under the Licence. ~ 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" <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">
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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>eu.europa.ec.edelivery</groupId> <groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId> <artifactId>smp-parent-pom</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-RC2-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath> <relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent> </parent>
<artifactId>smp-server-library</artifactId> <artifactId>smp-server-library</artifactId>
...@@ -204,11 +203,6 @@ ...@@ -204,11 +203,6 @@
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -252,8 +246,7 @@ ...@@ -252,8 +246,7 @@
1. Parameter: comma separated hibernate database dialects 1. Parameter: comma separated hibernate database dialects
2. script version 2. script version
3. export scripts.--> 3. export scripts.-->
<java classname="eu.europa.ec.edelivery.smp.data.dao.utils.SMPSchemaGenerator" <java classname="eu.europa.ec.edelivery.smp.data.dao.utils.SMPSchemaGenerator" fork="true" failonerror="true">
fork="true" failonerror="true">
<arg value="org.hibernate.dialect.Oracle10gDialect,org.hibernate.dialect.MySQL5InnoDBDialect" /> <arg value="org.hibernate.dialect.Oracle10gDialect,org.hibernate.dialect.MySQL5InnoDBDialect" />
<arg value="${project.version}" /> <arg value="${project.version}" />
<arg value="${project.basedir}/../smp-webapp/src/main/smp-setup/database-scripts" /> <arg value="${project.basedir}/../smp-webapp/src/main/smp-setup/database-scripts" />
......
smp-webapp/pom.xml
+ 3
− 8
View file @ f24c0dbc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>eu.europa.ec.edelivery</groupId> <groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId> <artifactId>smp-parent-pom</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0-RC2-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath> <relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent> </parent>
<artifactId>smp</artifactId> <artifactId>smp</artifactId>
...@@ -185,12 +185,7 @@ ...@@ -185,12 +185,7 @@
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<configuration> <configuration>
<target> <target>
<ftp server="${ftp.host}" <ftp server="${ftp.host}" port="${ftp.port}" passive="yes" remotedir="${ftp.remotedir}" userid="${ftp.user}" password="${ftp.password}">
port="${ftp.port}"
passive="yes"
remotedir="${ftp.remotedir}"
userid="${ftp.user}"
password="${ftp.password}">
<fileset dir="${project.build.directory}"> <fileset dir="${project.build.directory}">
<include name="${project.artifactId}.${project.packaging}" /> <include name="${project.artifactId}.${project.packaging}" />
</fileset> </fileset>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about