Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0af25629 by Tony CHEMIT at 2018-05-04T08:15:42Z update pom + fix a plugin version - - - - - 8 changed files: - + dto/.mvn/compiler-add-parameters - dto/pom.xml - pom.xml - + server/.mvn/compiler-add-parameters - server/pom.xml - + services/.mvn/compiler-add-parameters - services/pom.xml - services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java Changes: ===================================== dto/.mvn/compiler-add-parameters ===================================== --- /dev/null +++ b/dto/.mvn/compiler-add-parameters ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -226,16 +226,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - - <plugin> <groupId>io.ultreia.java4all.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <executions> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.31</version> + <version>2018.33</version> </parent> <groupId>fr.ird.observe</groupId> @@ -154,16 +154,15 @@ <observeToolkitVersion>3.1</observeToolkitVersion> - <lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx> + <!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>--> <lib.version.nuiton.topia>3.3.1</lib.version.nuiton.topia> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> - <lib.version.java4all.config>1.0.3</lib.version.java4all.config> + <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> <xworkVersion>2.3.34</xworkVersion> <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>--> <!--can't use 1.4.197 (date has changed + blob also--> <lib.version.h2>1.4.196</lib.version.h2> - <!--can't use 3.0.0 (hibernate we are using is not compatible (missing shutdown method)--> - <!--<lib.version.hikariCP>2.7.9</lib.version.hikariCP>--> + <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> ===================================== server/.mvn/compiler-add-parameters ===================================== --- /dev/null +++ b/server/.mvn/compiler-add-parameters ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -233,7 +233,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${lib.version.guava}</version> + <version>${lib.version.google.guava}</version> </dependency> </dependencies> </plugin> @@ -243,29 +243,6 @@ <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - - <plugin> - <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <dependencies> - <!--FIXME Si on ne rajoute pas ça, alors une vieille version de nuiton-utils est prise où il manque des dépendances--> - <!--<dependency>--> - <!--<groupId>org.nuiton</groupId>--> - <!--<artifactId>nuiton-utils</artifactId>--> - <!--<version>${lib.version.nuiton.utils}</version>--> - <!--</dependency>--> - </dependencies> - </plugin> - - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> ===================================== services/.mvn/compiler-add-parameters ===================================== --- /dev/null +++ b/services/.mvn/compiler-add-parameters ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -149,20 +149,4 @@ </dependencies> - <build> - - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - - </plugins> - </build> </project> ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java +++ b/services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java @@ -55,7 +55,7 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystemConfig.getRequiredObservedSystemBySpeciesId(speciesReference.getTopiaId()); if (!requiredObservedSystemBySpeciesId.isEmpty()) { - log.info("Required observed system: "+requiredObservedSystemBySpeciesId); + log.debug("Required observed system: " + requiredObservedSystemBySpeciesId); // must check that at least one of those observed system are in boolean found = false; for (ObservedSystemReference observedSystemReference : activitySeineDto.getObservedSystem()) { @@ -68,15 +68,15 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport if (!found) { List<ObservedSystemReference> observedSystems = (List<ObservedSystemReference>) getFieldValue("observedSystems", object); - log.info("references: " + observedSystems); + log.debug("references: " + observedSystems); DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); ImmutableMap<String, ObservedSystemReference> map = Maps.uniqueIndex(observedSystems, ObservedSystemReference::getId); ReferentialReferenceDecorator<ObservedSystemReference> decorator = decoratorService.getReferentialReferenceDecorator(ObservedSystemReference.class); List<String> labels = new LinkedList<>(); for (String observedSystemId : requiredObservedSystemBySpeciesId) { ObservedSystemReference ref = map.get(observedSystemId); - log.info("Required observed system id: "+observedSystemId); - log.info("Required observed system: "+ref); + log.debug("Required observed system id: " + observedSystemId); + log.debug("Required observed system: " + ref); labels.add(decorator.toString(ref)); } stack.set("observedSystemLabels", labels); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0af25629266723ec0b02a74f2e62... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0af25629266723ec0b02a74f2e62... You're receiving this email because of your account on gitlab.com.