This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 458b7c1afa6c31179b723ab9eb4de0bc68512057 Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 13 17:05:28 2019 +0100 Remove parent pom --- pom.xml | 59 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index c4fe866f..e140c4ea 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,6 @@ <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>org.nuiton</groupId> - <artifactId>codelutinpom</artifactId> - <version>10.5</version> - </parent> - <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> <version>2.5.1-SNAPSHOT</version> @@ -94,7 +88,7 @@ <projectId>faxtomail</projectId> <ciViewId>FaxToMail</ciViewId> - <jgitflow.developBranchName>develop</jgitflow.developBranchName> + <jgitflowPluginVersion>1.0-m5.1</jgitflowPluginVersion> <!-- libraries version --> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> @@ -143,8 +137,12 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <!-- issues status to include in changelog --> - <!--<redmine.statusIds>18,19,3,10,11</redmine.statusIds>--> + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <maven.compiler.target>${javaVersion}</maven.compiler.target> </properties> @@ -826,23 +824,6 @@ <pluginManagement> <plugins> - <!-- plugin site --> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -871,6 +852,32 @@ <version>${jaxxVersion}</version> </plugin> + <plugin> + <groupId>external.atlassian.jgitflow</groupId> + <artifactId>jgitflow-maven-plugin</artifactId> + <version>${jgitflowPluginVersion}</version> + <configuration> + <flowInitContext> + <versionTagPrefix>${projectId}-</versionTagPrefix> + <masterBranchName>master</masterBranchName> + <developBranchName>develop</developBranchName> + </flowInitContext> + <scmCommentPrefix>[jgitflow-maven-plugin]</scmCommentPrefix> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + <executions> + <execution> + <id>default-cli</id> + <goals> + <goal>release-finish</goal> + </goals> + <configuration> + <pushReleases>true</pushReleases> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.