branch develop updated (06c55fee -> 312118f4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 06c55fee Remove unused profiles new 9ceaf05a Put back parent pom and check releasable state - Project is releasable using java8-oracle new 312118f4 Fix copyright format The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 312118f472af9b66b60239c847d440c7027dd592 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 25 17:25:19 2019 +0100 Fix copyright format commit 9ceaf05ac1156eda2a9689d933cfa680960acd95 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 25 17:24:10 2019 +0100 Put back parent pom and check releasable state - Project is releasable using java8-oracle Summary of changes: faxtomail-ui-swing/pom.xml | 8 ++-- .../content/demande/takenby/TakenByFormUI.jaxx | 2 +- .../faxtomail/ui/swing/util/HTMLPane.java | 24 ++++++++++ faxtomail-ui-web/pom.xml | 2 - pom.xml | 56 +++++++++------------- 5 files changed, 53 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 9ceaf05ac1156eda2a9689d933cfa680960acd95 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 25 17:24:10 2019 +0100 Put back parent pom and check releasable state - Project is releasable using java8-oracle --- faxtomail-ui-swing/pom.xml | 8 ++-- .../faxtomail/ui/swing/util/HTMLPane.java | 24 ++++++++++ faxtomail-ui-web/pom.xml | 2 - pom.xml | 56 +++++++++------------- 4 files changed, 52 insertions(+), 38 deletions(-) diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 84cb910b..366791f1 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -76,9 +76,6 @@ \$\{java.io.tmpdir\}/faxtomail-${project.version}.log </faxtomail.log.file> - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - </properties> <dependencies> @@ -302,6 +299,11 @@ <artifactId>xercesImpl</artifactId> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + </dependencies> <build> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/HTMLPane.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/HTMLPane.java index 6196917d..74618d2d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/HTMLPane.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/HTMLPane.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.util; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2019 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import javafx.application.Platform; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index e7cfcd55..dce28792 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -53,8 +53,6 @@ <jsPreProcessors>preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender</jsPreProcessors> <jsPostProcessors>postProcessors=cssVariables</jsPostProcessors> - <!--<maven.deploy.skip>false</maven.deploy.skip>--> - </properties> <dependencies> diff --git a/pom.xml b/pom.xml index bd6ebdf1..627f47ef 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,12 @@ <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> @@ -88,7 +94,7 @@ <projectId>faxtomail</projectId> <ciViewId>FaxToMail</ciViewId> - <jgitflowPluginVersion>1.0-m5.1</jgitflowPluginVersion> + <jgitflow.developBranchName>develop</jgitflow.developBranchName> <!-- libraries version --> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> @@ -112,7 +118,7 @@ <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> <slf4jVersion>1.7.25</slf4jVersion> - <log4jVersion>2.11.1</log4jVersion> + <log4jVersion>2.3</log4jVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> <commonsIoVersion>2.6</commonsIoVersion> @@ -136,12 +142,11 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <!--Prevent releases from failing since jredmine removal from forge--> + <redmine.skipGenerateChanges>true</redmine.skipGenerateChanges> + <skipPostRelease>true</skipPostRelease> - <maven.compiler.source>${javaVersion}</maven.compiler.source> - <maven.compiler.target>${javaVersion}</maven.compiler.target> + <animal.sniffer.skip>true</animal.sniffer.skip> </properties> @@ -486,6 +491,11 @@ <groupId>javassist</groupId> <artifactId>javassist</artifactId> </exclusion> + + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -789,6 +799,12 @@ <version>2.9.1</version> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.04</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -833,32 +849,6 @@ <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>.
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 312118f472af9b66b60239c847d440c7027dd592 Author: jcouteau <couteau@codelutin.com> Date: Mon Nov 25 17:25:19 2019 +0100 Fix copyright format --- .../faxtomail/ui/swing/content/demande/takenby/TakenByFormUI.jaxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUI.jaxx index cc6cb1a1..36954ac9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/takenby/TakenByFormUI.jaxx @@ -2,7 +2,7 @@ #%L FaxToMail :: UI %% - Copyright (C) 2014-2017 Mac-Groupe, Code Lutin + Copyright (C) 2014 Mac-Groupe, Code Lutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm