branch develop updated (1e6036c -> 55d33ad)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 1e6036c Retour sur develop (pour tester le deployement sur demo) Merge branch 'feature/7463' into develop new 55d33ad Optimisation des dépendances + on repasse certains test en ignore 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 55d33ad8570969c657232114eecbeba04270dd69 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 00:08:25 2015 +0200 Optimisation des dépendances + on repasse certains test en ignore Summary of changes: observe-application-web/pom.xml | 42 +++++++++++++++++----- .../db/impl/ObserveWebDatabaseImmutable.java | 2 -- .../db/impl/ObserveWebDatabasesImmutable.java | 2 -- .../user/impl/ObserveWebUsersImmutable.java | 3 -- observe-entities/pom.xml | 4 --- observe-services-api/pom.xml | 24 +++++++++---- observe-services-configuration-api/pom.xml | 4 +-- observe-services-configuration-rest/pom.xml | 27 -------------- observe-services-configuration-topia/pom.xml | 12 +++---- observe-services-model/pom.xml | 9 +++++ observe-services-rest/pom.xml | 8 ++--- .../service/DataSourceServiceRestTest.java | 3 ++ .../service/seine/TripSeineServiceTest.java | 2 ++ observe-services-runner/pom.xml | 5 --- observe-services-topia/pom.xml | 14 ++++++-- observe-test-data/pom.xml | 26 ++------------ observe-validation/pom.xml | 4 +-- 17 files changed, 92 insertions(+), 99 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 55d33ad8570969c657232114eecbeba04270dd69 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 00:08:25 2015 +0200 Optimisation des dépendances + on repasse certains test en ignore --- observe-application-web/pom.xml | 42 +++++++++++++++++----- .../db/impl/ObserveWebDatabaseImmutable.java | 2 -- .../db/impl/ObserveWebDatabasesImmutable.java | 2 -- .../user/impl/ObserveWebUsersImmutable.java | 3 -- observe-entities/pom.xml | 4 --- observe-services-api/pom.xml | 24 +++++++++---- observe-services-configuration-api/pom.xml | 4 +-- observe-services-configuration-rest/pom.xml | 27 -------------- observe-services-configuration-topia/pom.xml | 12 +++---- observe-services-model/pom.xml | 9 +++++ observe-services-rest/pom.xml | 8 ++--- .../service/DataSourceServiceRestTest.java | 3 ++ .../service/seine/TripSeineServiceTest.java | 2 ++ observe-services-runner/pom.xml | 5 --- observe-services-topia/pom.xml | 14 ++++++-- observe-test-data/pom.xml | 26 ++------------ observe-validation/pom.xml | 4 +-- 17 files changed, 92 insertions(+), 99 deletions(-) diff --git a/observe-application-web/pom.xml b/observe-application-web/pom.xml index 5786564..c678672 100644 --- a/observe-application-web/pom.xml +++ b/observe-application-web/pom.xml @@ -40,6 +40,16 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-topia</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-rest</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> @@ -56,8 +66,12 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -71,12 +85,28 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> <!-- WebMotion --> <dependency> @@ -107,12 +137,6 @@ <artifactId>javax.servlet-api</artifactId> </dependency> - <!-- Paranamer --> - <dependency> - <groupId>com.thoughtworks.paranamer</groupId> - <artifactId>paranamer</artifactId> - </dependency> - <!-- Yaml --> <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> @@ -123,11 +147,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> </dependency> <dependency> diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java index eba202a..20cf5c4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java @@ -8,7 +8,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ird.observe.application.web.configuration.db.ObserveWebDatabase; -import javax.annotation.Nullable; import java.util.Collection; /** @@ -75,7 +74,6 @@ public class ObserveWebDatabaseImmutable implements ObserveWebDatabase<ObserveWe observeWebDatabaseBean.setUrl(url); observeWebDatabaseBean.setRoles(Sets.newLinkedHashSet(Iterables.transform(getRoles(), new Function<ObserveWebDatabaseRoleImmutable, ObserveWebDatabaseRoleBean>() { - @Nullable @Override public ObserveWebDatabaseRoleBean apply(ObserveWebDatabaseRoleImmutable input) { return input.toBean(); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java index 216a930..1618c21 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java @@ -8,7 +8,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ird.observe.application.web.configuration.db.ObserveWebDatabases; -import javax.annotation.Nullable; import java.util.Collection; /** @@ -67,7 +66,6 @@ public class ObserveWebDatabasesImmutable implements ObserveWebDatabases<Observe ObserveWebDatabasesBean observeWebDatabasesBean = new ObserveWebDatabasesBean(); observeWebDatabasesBean.setDatabases(Sets.newLinkedHashSet(Iterables.transform(getDatabases(), new Function<ObserveWebDatabaseImmutable, ObserveWebDatabaseBean>() { - @Nullable @Override public ObserveWebDatabaseBean apply(ObserveWebDatabaseImmutable input) { return input.toBean(); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java index cf18fe7..9e0e297 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java @@ -8,7 +8,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ird.observe.application.web.configuration.user.ObserveWebUsers; -import javax.annotation.Nullable; import java.util.Collection; /** @@ -23,7 +22,6 @@ public class ObserveWebUsersImmutable implements ObserveWebUsers<ObserveWebUserI public ObserveWebUsersImmutable(Iterable<ObserveWebUserImmutable> users) { this.users = Maps.uniqueIndex(users, new Function<ObserveWebUserImmutable, String>() { - @Nullable @Override public String apply(ObserveWebUserImmutable input) { return input.getLogin(); @@ -45,7 +43,6 @@ public class ObserveWebUsersImmutable implements ObserveWebUsers<ObserveWebUserI ObserveWebUsersBean observeWebUsersBean = new ObserveWebUsersBean(); observeWebUsersBean.setUsers(Sets.newLinkedHashSet(Iterables.transform(getUsers(), new Function<ObserveWebUserImmutable, ObserveWebUserBean>() { - @Nullable @Override public ObserveWebUserBean apply(ObserveWebUserImmutable input) { return input.toBean(); diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index fa721f8..ff8aebf 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -54,10 +54,6 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> <!-- commons --> <dependency> diff --git a/observe-services-api/pom.xml b/observe-services-api/pom.xml index d46fc6e..72b9306 100644 --- a/observe-services-api/pom.xml +++ b/observe-services-api/pom.xml @@ -29,21 +29,33 @@ <version>${project.version}</version> </dependency> - <!-- commons dependencies --> + <!-- nuiton dependencies --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + <!-- commons dependencies --> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <!-- Logging --> diff --git a/observe-services-configuration-api/pom.xml b/observe-services-configuration-api/pom.xml index ebce096..83a1b1c 100644 --- a/observe-services-configuration-api/pom.xml +++ b/observe-services-configuration-api/pom.xml @@ -19,10 +19,10 @@ <!-- commons dependencies --> - <dependency> + <!--dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </dependency> + </dependency--> <dependency> <groupId>com.google.guava</groupId> diff --git a/observe-services-configuration-rest/pom.xml b/observe-services-configuration-rest/pom.xml index b810ff3..4bbbb64 100644 --- a/observe-services-configuration-rest/pom.xml +++ b/observe-services-configuration-rest/pom.xml @@ -20,11 +20,6 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>observe-services-configuration-api</artifactId> <version>${project.version}</version> </dependency> @@ -37,32 +32,10 @@ <!-- commons dependencies --> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <!-- Nuiton --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> diff --git a/observe-services-configuration-topia/pom.xml b/observe-services-configuration-topia/pom.xml index db80d13..cac2c0e 100644 --- a/observe-services-configuration-topia/pom.xml +++ b/observe-services-configuration-topia/pom.xml @@ -26,10 +26,10 @@ <!-- commons dependencies --> - <dependency> + <!--dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </dependency> + </dependency--> <!--dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> @@ -44,20 +44,20 @@ </dependency> <!-- Nuiton --> - <dependency> + <!--dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - </dependency> + </dependency--> <!-- persistence --> <!--dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency--> - <dependency> + <!--dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - </dependency> + </dependency--> <!--dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-replication</artifactId> diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index a0486c1..68dbf42 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -66,6 +66,15 @@ <!-- comons --> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/observe-services-rest/pom.xml b/observe-services-rest/pom.xml index 20ea2ab..c85b3ca 100644 --- a/observe-services-rest/pom.xml +++ b/observe-services-rest/pom.xml @@ -52,12 +52,8 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java index 68a89c7..269edb0 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/DataSourceServiceRestTest.java @@ -9,6 +9,7 @@ import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportExcept import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import org.junit.Assert; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -56,9 +57,11 @@ public class DataSourceServiceRestTest { } + @Ignore @Test public void testCreateEmptyDataSource() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + //FIXME Should get an not implemented exception for this service ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); DataSourceCreateConfigurationDto dataSourceCreateConfiguration = new DataSourceCreateConfigurationDto(); dataSourceCreateConfiguration.setCanCreateEmptyDatabase(true); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java index ba44b1a..88c0ccd 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java @@ -18,6 +18,7 @@ import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -28,6 +29,7 @@ import java.util.List; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ +@Ignore public class TripSeineServiceTest { public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; diff --git a/observe-services-runner/pom.xml b/observe-services-runner/pom.xml index a110705..2f456d2 100644 --- a/observe-services-runner/pom.xml +++ b/observe-services-runner/pom.xml @@ -20,11 +20,6 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>observe-services-configuration-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index bd6aed4..67c7b91 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -47,6 +47,7 @@ <groupId>${project.groupId}</groupId> <artifactId>observe-validation</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -61,14 +62,14 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <!--dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - </dependency--> + </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -100,6 +101,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> @@ -107,12 +109,20 @@ </dependency> <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${xworkVersion}</version> + </dependency> + + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> + <scope>runtime</scope> </dependency> <!-- Logging --> diff --git a/observe-test-data/pom.xml b/observe-test-data/pom.xml index 3d78039..5aec7cf 100644 --- a/observe-test-data/pom.xml +++ b/observe-test-data/pom.xml @@ -38,11 +38,11 @@ <dependencies> <!-- Sibling dependencies --> - <dependency> + <!--dependency> <groupId>${project.groupId}</groupId> <artifactId>observe-services-configuration-api</artifactId> <version>${project.version}</version> - </dependency> + </dependency--> <!-- Nuiton --> <dependency> @@ -51,31 +51,9 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - - <!-- commons --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> <dependency> <groupId>org.nuiton.topia</groupId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 4a5b290..1b99717 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -60,10 +60,10 @@ <artifactId>nuiton-validator</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm