Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 29835352 by Tony CHEMIT at 2017-10-29T15:55:46+01:00 use next i18n plugin mojos - - - - - 24 changed files: - client-configuration/pom.xml - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties - dto/pom.xml - dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties - pom.xml - server-configuration/pom.xml - server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties - server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties - server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties - services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties - services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties - services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties - validation/pom.xml - validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -168,8 +168,8 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> ===================================== client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties ===================================== ===================================== client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties ===================================== ===================================== client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties ===================================== ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -756,13 +756,13 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> <entry> - <specificGoal>parserJava</specificGoal> + <specificGoal>parse-java</specificGoal> <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> ===================================== client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties ===================================== ===================================== client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties ===================================== ===================================== client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties ===================================== ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -284,8 +284,8 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> ===================================== dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties ===================================== ===================================== dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties ===================================== ===================================== dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties ===================================== ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -160,8 +160,8 @@ <execution> <id>scan-sources</id> <goals> - <goal>parserJava</goal> - <goal>gen</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <entries> ===================================== server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties ===================================== ===================================== server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties ===================================== ===================================== server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties ===================================== ===================================== services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties ===================================== ===================================== services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties ===================================== ===================================== services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties ===================================== ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -215,58 +215,74 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>parse</id> + <id>parse-java-default</id> <phase>process-classes</phase> <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> + <goal>parse-java</goal> </goals> <configuration> - <treateDefaultEntry>false</treateDefaultEntry> + <treatDefaultEntry>false</treatDefaultEntry> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/</basedir> + </entry> + </entries> + </configuration> + </execution> + <execution> + <id>parse-validation-default</id> + <phase>process-classes</phase> + <goals> + <goal>parse-validation</goal> + </goals> + <configuration> + <treatDefaultEntry>false</treatDefaultEntry> <entries> <entry> - <specificGoal>parserValidation</specificGoal> <basedir>${project.basedir}/src/main/resources/</basedir> <includes> <param>**/**-validation.xml</param> </includes> </entry> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> </entries> </configuration> </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> <execution> - <id>copy i18n files</id> + <id>generate-default</id> <phase>process-classes</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n"> - <filterset> - <filter value="${observe.model.version}" token="observe.model.version" /> - </filterset> - <fileset dir="${project.build.directory}/generated-sources/i18n"> - <include name="*.properties" /> - </fileset> - </copy> - </target> - </configuration> <goals> - <goal>run</goal> + <goal>generate</goal> </goals> </execution> + </executions> </plugin> + <!--<plugin>--> + <!--<artifactId>maven-antrun-plugin</artifactId>--> + <!--<executions>--> + <!--<execution>--> + <!--<id>copy i18n files</id>--> + <!--<phase>process-classes</phase>--> + <!--<configuration>--> + <!--<target>--> + <!--<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">--> + <!--<filterset>--> + <!--<filter value="${observe.model.version}" token="observe.model.version" />--> + <!--</filterset>--> + <!--<fileset dir="${project.build.directory}/generated-sources/i18n">--> + <!--<include name="*.properties" />--> + <!--</fileset>--> + <!--</copy>--> + <!--</target>--> + <!--</configuration>--> + <!--<goals>--> + <!--<goal>run</goal>--> + <!--</goals>--> + <!--</execution>--> + <!--</executions>--> + <!--</plugin>--> + </plugins> </build> </project> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties ===================================== ===================================== validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties ===================================== ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties ===================================== View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/29835352f7cb0d13ba258f0ddec3... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/29835352f7cb0d13ba258f0ddec3... You're receiving this email because of your account on gitlab.com.