branch develop updated (1b49a13 -> 1b97f2a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 1b49a13 Deal with null blobs new 160656a Fix test isolation new 1b97f2a update xsd 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 1b97f2ab3e326cc0a108d822480f2ba0ed1c11af Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 13:33:39 2016 +0200 update xsd commit 160656a3fa2ef6f5b457b90406b12609e57ee9ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:14:48 2016 +0200 Fix test isolation Summary of changes: application-swing/src/main/assembly/bin.xml | 4 ++-- application-swing/src/main/assembly/map.xml | 4 ++-- .../web/configuration/db/ObserveWebDatabasesHelperTest.java | 1 + .../application/web/configuration/user/ObserveWebUsersHelperTest.java | 1 + 4 files changed, 6 insertions(+), 4 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 160656a3fa2ef6f5b457b90406b12609e57ee9ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:14:48 2016 +0200 Fix test isolation --- .../application/web/configuration/db/ObserveWebDatabasesHelperTest.java | 1 + .../application/web/configuration/user/ObserveWebUsersHelperTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java index e30a7f8..da9608e 100644 --- a/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java +++ b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java @@ -90,6 +90,7 @@ public class ObserveWebDatabasesHelperTest { @Before public void setUp() { configuration = new ObserveWebApplicationConfig("observeweb-test.conf"); + configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); observeWebDatabasesHelper = new ObserveWebDatabasesHelper(); databasesConfigurationFile = configuration.getDatabasesConfigurationFile(); diff --git a/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java index f9476e8..c6cc285 100644 --- a/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java +++ b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java @@ -75,6 +75,7 @@ public class ObserveWebUsersHelperTest { @Before public void setUp() throws Exception { configuration = new ObserveWebApplicationConfig("observeweb-test.conf"); + configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); observeWebUsersHelper = new ObserveWebUsersHelper(); usersConfigurationFile = configuration.getUsersConfigurationFile(); -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1b97f2ab3e326cc0a108d822480f2ba0ed1c11af Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 13:33:39 2016 +0200 update xsd --- application-swing/src/main/assembly/bin.xml | 4 ++-- application-swing/src/main/assembly/map.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/assembly/bin.xml b/application-swing/src/main/assembly/bin.xml index 8d41f04..dacbf5d 100644 --- a/application-swing/src/main/assembly/bin.xml +++ b/application-swing/src/main/assembly/bin.xml @@ -19,8 +19,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" 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"> +<assembly 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.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>bin</id> <formats> <format>zip</format> diff --git a/application-swing/src/main/assembly/map.xml b/application-swing/src/main/assembly/map.xml index 0461861..1c707d1 100644 --- a/application-swing/src/main/assembly/map.xml +++ b/application-swing/src/main/assembly/map.xml @@ -19,8 +19,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" 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"> +<assembly 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.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>maps</id> <formats> <format>zip</format> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm