Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6fc013e0 by Tony Chemit at 2020-05-12T12:00:18+02:00 remove bad unsued imports (breaks java 11 build) - - - - - 4577d39a by Tony Chemit at 2020-05-12T12:00:35+02:00 now build with java 11 image - - - - - c0682285 by Tony Chemit at 2020-05-12T12:20:16+02:00 Use last pom (to use java 11) - - - - - 3 changed files: - .gitlab-ci.yml - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -27,7 +27,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-10 gitlab-ci-token $CI_BUILD_TOKEN; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token $CI_BUILD_TOKEN; fi .build-for-release: &build-for-release environment: ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.client.datasource.actions.longline.pairing.tree.node.Activ import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingResultItem; import io.ultreia.java4all.i18n.I18n; import org.jdesktop.swingx.treetable.DefaultTreeTableModel; -import sun.awt.image.ImageWatched; import java.util.Arrays; import java.util.LinkedList; @@ -41,7 +40,7 @@ import java.util.stream.Collectors; /** * Created by tchemit on 20/11/2018. * - * @author Tony Chemit - dev@tchemit.fr + * @author Tony Chemit - dev@tchemit.fgit stashr */ public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel { ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.23</version> + <version>2020.24</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/34f5d1f4b7799ad6f4eb6f0ae... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/34f5d1f4b7799ad6f4eb6f0ae... You're receiving this email because of your account on gitlab.com.