From 459596fe664796ded08e742b1d96cb3a7b029850 Mon Sep 17 00:00:00 2001 From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu> Date: Tue, 30 Oct 2018 14:04:13 +0100 Subject: [PATCH] [maven-release-plugin] prepare release 4.1.0-RC1 --- pom.xml | 8 ++++---- smp-angular/pom.xml | 6 ++---- smp-api/pom.xml | 5 ++--- smp-parent-pom/pom.xml | 5 ++--- smp-server-library/pom.xml | 8 +++----- smp-webapp/pom.xml | 11 +++-------- 6 files changed, 16 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 51eeb3224..cac9e8713 100644 --- a/pom.xml +++ b/pom.xml @@ -12,14 +12,13 @@ ~ 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</groupId> <artifactId>smp-modules</artifactId> <packaging>pom</packaging> <name>SMP</name> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0-RC1</version> <modules> <module>smp-parent-pom</module> @@ -53,7 +52,8 @@ <scm> <developerConnection>scm:git:https://ec.europa.eu/cefdigital/code/scm/edelivery/smp.git</developerConnection> - </scm> + <tag>4.1.0-RC1</tag> + </scm> <pluginRepositories> diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml index f830db92e..b9e62adf4 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 045b8e885..1e1d5e435 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 dadb6caa3..02769fac0 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 7cfd9c45a..c6afb76b6 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 2de4193ef..b8d6b8240 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> -- GitLab