branch develop updated (8ddbe13 -> c293d07)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git from 8ddbe13 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c293d07 fixes #153: Update to struts2-core 2.5.13 The 1 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 c293d070fcd52541dc16ec3a3f297fd0c97247be Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Oct 11 10:28:34 2017 +0200 fixes #153: Update to struts2-core 2.5.13 Summary of changes: i18n-maven-plugin/pom.xml | 6 +++--- nuiton-i18n-editor/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 11 ++++++----- 4 files changed, 11 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 c293d070fcd52541dc16ec3a3f297fd0c97247be Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Oct 11 10:28:34 2017 +0200 fixes #153: Update to struts2-core 2.5.13 --- i18n-maven-plugin/pom.xml | 6 +++--- nuiton-i18n-editor/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 11 ++++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index d66f9d9..b5dcb00 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.6.4-SNAPSHOT</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -135,8 +135,8 @@ <!-- pour parser les fichiers de validation --> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> <exclusions> <exclusion> <groupId>asm</groupId> diff --git a/nuiton-i18n-editor/pom.xml b/nuiton-i18n-editor/pom.xml index a204af8..2207f4e 100644 --- a/nuiton-i18n-editor/pom.xml +++ b/nuiton-i18n-editor/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index fee1dab..b1559aa 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.6.4-SNAPSHOT</version> + <version>3.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index 65bd9b7..40a2248 100644 --- a/pom.xml +++ b/pom.xml @@ -29,11 +29,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.4</version> + <version>10.5</version> </parent> <artifactId>i18n</artifactId> - <version>3.6.4-SNAPSHOT</version> + <version>3.7-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> @@ -215,9 +215,10 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>2.3.31</version> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>2.5.13</version> + <scope>compile</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm