This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit e20580b5859525c9e0a0a563704d68e77b4890b7 Author: CHRE <CHATELLIER@codelutin.com> Date: Tue Aug 9 10:31:57 2016 +0200 Update parent pom --- README.txt => README.md | 0 nuiton-tapestry/README.txt => nuiton-gwt/README.md | 0 nuiton-gwt/changelog.txt | 2 -- nuiton-web/README.txt => nuiton-rss/README.md | 0 nuiton-rss/README.txt | 0 nuiton-rss/changelog.txt | 2 -- nuiton-security/{changelog.txt => README.md} | 0 nuiton-struts2/{README.txt => README.md} | 0 nuiton-struts2/changelog.txt | 2 -- .../nuiton/web/struts2/converters/JsonConverter.java | 2 +- nuiton-gwt/README.txt => nuiton-tapestry/README.md | 0 nuiton-tapestry/changelog.txt | 2 -- nuiton-security/README.txt => nuiton-web/README.md | 0 nuiton-web/changelog.txt | 2 -- pom.xml | 19 ++++++++----------- 15 files changed, 9 insertions(+), 22 deletions(-) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md diff --git a/nuiton-tapestry/README.txt b/nuiton-gwt/README.md similarity index 100% rename from nuiton-tapestry/README.txt rename to nuiton-gwt/README.md diff --git a/nuiton-gwt/changelog.txt b/nuiton-gwt/changelog.txt deleted file mode 100644 index 38516f4..0000000 --- a/nuiton-gwt/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-gwt/changes-report.html \ No newline at end of file diff --git a/nuiton-web/README.txt b/nuiton-rss/README.md similarity index 100% rename from nuiton-web/README.txt rename to nuiton-rss/README.md diff --git a/nuiton-rss/README.txt b/nuiton-rss/README.txt deleted file mode 100644 index e69de29..0000000 diff --git a/nuiton-rss/changelog.txt b/nuiton-rss/changelog.txt deleted file mode 100644 index f170b1a..0000000 --- a/nuiton-rss/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-rss/changes-report.html \ No newline at end of file diff --git a/nuiton-security/changelog.txt b/nuiton-security/README.md similarity index 100% rename from nuiton-security/changelog.txt rename to nuiton-security/README.md diff --git a/nuiton-struts2/README.txt b/nuiton-struts2/README.md similarity index 100% rename from nuiton-struts2/README.txt rename to nuiton-struts2/README.md diff --git a/nuiton-struts2/changelog.txt b/nuiton-struts2/changelog.txt deleted file mode 100644 index 236c429..0000000 --- a/nuiton-struts2/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-tapestry/changes-report.html \ No newline at end of file diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java index 746f9b8..c02c35e 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java @@ -97,7 +97,7 @@ public class JsonConverter extends StrutsTypeConverter { json = "null"; } else { try { - json = JSONUtil.serialize(object); + json = JSONUtil.serialize(object, false); } catch (JSONException e) { if (log.isErrorEnabled()) { log.error("unable to serialize object " + object, e); diff --git a/nuiton-gwt/README.txt b/nuiton-tapestry/README.md similarity index 100% rename from nuiton-gwt/README.txt rename to nuiton-tapestry/README.md diff --git a/nuiton-tapestry/changelog.txt b/nuiton-tapestry/changelog.txt deleted file mode 100644 index 236c429..0000000 --- a/nuiton-tapestry/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-tapestry/changes-report.html \ No newline at end of file diff --git a/nuiton-security/README.txt b/nuiton-web/README.md similarity index 100% rename from nuiton-security/README.txt rename to nuiton-web/README.md diff --git a/nuiton-web/changelog.txt b/nuiton-web/changelog.txt deleted file mode 100644 index f170b1a..0000000 --- a/nuiton-web/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -Please refer to the release note : - http://maven-site.nuiton.org/nuiton-rss/changes-report.html \ No newline at end of file diff --git a/pom.xml b/pom.xml index 216790b..2d41b13 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ License along with this program. If not, see <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.5</version> + <version>10.2</version> </parent> <groupId>org.nuiton.web</groupId> @@ -104,22 +104,19 @@ License along with this program. If not, see </modules> <scm> - <connection>scm:git:http://git.nuiton.org/nuiton-web.git</connection> - <developerConnection>scm:git:https://git.nuiton.org/nuiton-web.git</developerConnection> - <url>https://gitweb.nuiton.org/nuiton-web.git</url> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-web.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-web.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/nuiton-web.git</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <!-- redmine project Id --> <projectId>nuiton-web</projectId> + <ciViewId>nuiton-web</ciViewId> + <javaVersion>1.6</javaVersion> + <signatureArtifactId>java16</signatureArtifactId> + <signatureVersion>1.1</signatureVersion> <eugeneVersion>3.0-alpha-5</eugeneVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.