This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit c8e2330680b2e150a4b4dfcb2831ef330a0669e4 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:18:22 2020 +0200 Fix releasable build [skip ci] --- i18n-maven-plugin/pom.xml | 16 ++++++--------- .../StringFormatToMessageFormatConverter.java | 3 ++- nuiton-i18n/pom.xml | 7 ------- pom.xml | 23 ++++++++-------------- src/site/site_en.xml | 11 +++++------ src/site/site_fr.xml | 12 +++++------ 6 files changed, 26 insertions(+), 46 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index 4286dd8..7e086c0 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -38,15 +38,6 @@ </description> <inceptionYear>2007</inceptionYear> - <properties> - - <javaVersion>1.7</javaVersion> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> - - <!-- Post Release configuration --> - <skipPostRelease>true</skipPostRelease> - </properties> <dependencies> <dependency> @@ -158,6 +149,11 @@ <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -246,7 +242,7 @@ <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>${pluginPluginVersion}</version> + <version>3.5.2</version> </tagletArtifact> <tagletArtifact> <groupId>org.codehaus.plexus</groupId> diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java index 478001b..c85e346 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java @@ -27,6 +27,7 @@ package org.nuiton.i18n.plugin.bundle; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import java.text.MessageFormat; import java.util.Formatter; @@ -41,9 +42,9 @@ import java.util.regex.Pattern; * * @author Florian Desbois * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" role-hint="toMessageFormat" * @since 2.4 */ +@Component(role = BundleFormatConverter.class, hint = "toMessageFormat") public class StringFormatToMessageFormatConverter implements BundleFormatConverter { /** Logger. */ diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 71258cf..a3be9ca 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -35,13 +35,6 @@ <description>Api of i18n system</description> <inceptionYear>2004</inceptionYear> - <properties> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <dependencies> <dependency> diff --git a/pom.xml b/pom.xml index 75950c3..a0a3336 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.5</version> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId> @@ -53,17 +53,7 @@ <properties> - <projectId>i18n</projectId> - <ciViewId>I18n</ciViewId> - - <!-- FIXME issues are no longer on redmine since migration to gitlab --> - <redmine.skipPublishAttachments>true</redmine.skipPublishAttachments> - <redmine.skipPublishNews>true</redmine.skipPublishNews> - <redmine.skipGenerateEmailAnnouncement>true</redmine.skipGenerateEmailAnnouncement> - <redmine.skipGenerateNewsAnnouncement>true</redmine.skipGenerateNewsAnnouncement> - <redmine.skipUpdateVersion>true</redmine.skipUpdateVersion> - <redmine.skipNextVersion>true</redmine.skipNextVersion> - <redmine.skipGenerateChanges>true</redmine.skipGenerateChanges> + <gitlabProjectName>i18n</gitlabProjectName> <!--Multilanguage maven-site --> <locales>fr,en</locales> @@ -76,9 +66,6 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <!-- FIXME issues: Found Banned Dependency: org.apache.logging.log4j:log4j-api:jar:2.10.0 --> - <enforcer.skip>true</enforcer.skip> - </properties> <dependencyManagement> @@ -241,6 +228,12 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + <version>2.0.0</version> + </dependency> + </dependencies> </dependencyManagement> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 3d69e73..46ceefa 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -24,9 +24,9 @@ #L% --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.6.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -47,8 +47,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/en/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> <menu name="Language"> @@ -80,12 +79,12 @@ <menu ref="reports"/> - <footer> + <footer><![CDATA[ <div id='mavenProjectProperties' locale='en' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='${project.siteSourcesType}' scmwebeditor_vmFiles=',library,'/> - </footer> + ]]></footer> </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 8a558f3..339f622 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -24,9 +24,9 @@ #L% --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.6.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -47,9 +47,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" - href="${project.url}/${siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> <menu name="Langue"> @@ -81,13 +79,13 @@ <menu ref="reports"/> - <footer> + <footer><![CDATA[ <div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='${project.siteSourcesType}' scmwebeditor_vmFiles=',library,'/> - </footer> + ]]></footer> </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.