Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 02e8490a by Tony CHEMIT at 2018-05-22T21:28:51Z use topia extension - - - - - 10 changed files: - − .mvn/jvm.config - − .mvn/maven.config - client/pom.xml - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java - persistence/pom.xml - pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml Changes: ===================================== .mvn/jvm.config deleted ===================================== --- a/.mvn/jvm.config +++ /dev/null @@ -1 +0,0 @@ --Xmx4096m \ No newline at end of file ===================================== .mvn/maven.config deleted ===================================== --- a/.mvn/maven.config +++ /dev/null @@ -1 +0,0 @@ --Dmaven.artifact.threads=10 -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ No newline at end of file ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -376,12 +376,12 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> </dependency> <dependency> ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java +++ b/dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java @@ -1,5 +1,27 @@ package fr.ird.observe.dto.data.longline; +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import io.ultreia.java4all.bean.JavaBean; import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore; import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -50,16 +50,16 @@ </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-script</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-script</artifactId> </dependency> <dependency> @@ -202,9 +202,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-templates-extension</artifactId> - <version>${observeToolkitVersion}</version> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>templates</artifactId> + <version>${lib.version.java4all.topia}</version> <scope>compile</scope> </dependency> <dependency> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.36</version> + <version>2018.37</version> </parent> <groupId>fr.ird.observe</groupId> @@ -199,30 +199,6 @@ <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-script</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-templates-extension</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-dto</artifactId> <version>${observeToolkitVersion}</version> </dependency> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -76,8 +76,8 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -65,8 +65,8 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> <groupId>io.ultreia.java4all</groupId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -79,12 +79,12 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-script</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-script</artifactId> </dependency> <dependency> @@ -151,9 +151,8 @@ <artifactId>topia-service-migration</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> - <version>${observeToolkitVersion}</version> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -59,8 +59,8 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <!-- nuiton dependencies --> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/02e8490a2cf7637a6838e30b77d6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/02e8490a2cf7637a6838e30b77d6... You're receiving this email because of your account on gitlab.com.