branch develop updated (aff2453 -> 09b7f7b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from aff2453 Fix javadoc author annotation new 589f20d Fix assembly descriptors new 09b7f7b Revert "Refs #8168 nuiton-web 1.17" 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 09b7f7b73b30361084d658ec59a290fded68f280 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:55:52 2016 +0100 Revert "Refs #8168 nuiton-web 1.17" This reverts commit 9177faf3cf772e84df6129b6565e28819410df7c. commit 589f20d5b1d6515d420c1d562af9678d585952fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:51:45 2016 +0100 Fix assembly descriptors Summary of changes: echobase-ui/src/main/assembly/embedded-zip.xml | 8 ++++---- echobase-ui/src/main/assembly/full-war.xml | 4 ++-- echobase-ui/src/main/assembly/lizmap-zip.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 9 insertions(+), 9 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 589f20d5b1d6515d420c1d562af9678d585952fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:51:45 2016 +0100 Fix assembly descriptors --- echobase-ui/src/main/assembly/embedded-zip.xml | 8 ++++---- echobase-ui/src/main/assembly/full-war.xml | 4 ++-- echobase-ui/src/main/assembly/lizmap-zip.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/echobase-ui/src/main/assembly/embedded-zip.xml b/echobase-ui/src/main/assembly/embedded-zip.xml index deb096a..7e1d0f4 100644 --- a/echobase-ui/src/main/assembly/embedded-zip.xml +++ b/echobase-ui/src/main/assembly/embedded-zip.xml @@ -19,9 +19,9 @@ #L% --> <assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>embedded-zip</id> <formats> <format>zip</format> @@ -31,7 +31,7 @@ <fileSet> <directory>target</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory/> <fileMode>0755</fileMode> <includes> <include>${embeddedWarName}.war</include> @@ -40,7 +40,7 @@ <fileSet> <directory>target/classes</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory/> <includes> <include>THIRD-PARTY.txt</include> <include>LICENSE.txt</include> diff --git a/echobase-ui/src/main/assembly/full-war.xml b/echobase-ui/src/main/assembly/full-war.xml index 14db0c9..7e22ef6 100644 --- a/echobase-ui/src/main/assembly/full-war.xml +++ b/echobase-ui/src/main/assembly/full-war.xml @@ -17,9 +17,9 @@ #L% --> <assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>full-war</id> <formats> <format>war</format> diff --git a/echobase-ui/src/main/assembly/lizmap-zip.xml b/echobase-ui/src/main/assembly/lizmap-zip.xml index f51ff07..5f9ee0b 100644 --- a/echobase-ui/src/main/assembly/lizmap-zip.xml +++ b/echobase-ui/src/main/assembly/lizmap-zip.xml @@ -19,9 +19,9 @@ #L% --> <assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>lizmap-zip</id> <formats> <format>zip</format> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 09b7f7b73b30361084d658ec59a290fded68f280 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:55:52 2016 +0100 Revert "Refs #8168 nuiton-web 1.17" This reverts commit 9177faf3cf772e84df6129b6565e28819410df7c. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f68730a..bce842b 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ <topiaVersion>3.0-beta-3</topiaVersion> <nuitonUtilsVersion>3.0-rc-11</nuitonUtilsVersion> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.17</nuitonWebVersion> + <nuitonWebVersion>1.16</nuitonWebVersion> <!--<struts2Version>2.3.20</struts2Version>--> <struts2Version>2.3.15.3</struts2Version> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm