March 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-5.x] update link
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 44a7ffb1 by Tony CHEMIT at 2017-03-20T09:43:06+01:00 update link - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.5) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-3) # Community View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/44a7ffb1f22a5ee048041f07320…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: continue site review
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 87804f3e by Tony CHEMIT at 2017-03-20T09:30:54+01:00 continue site review - - - - - 88ed9fae by Tony CHEMIT at 2017-03-20T09:42:27+01:00 continue site review - - - - - 3 changed files: - README.md - pom.xml - + src/site/resources/.gitlab-ci.yml Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # Resources * [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop-5.x/CHANGE… -* [Documentation](http://ultreiaio.gitlab.io/observe) +* [Documentation](http://ultreiaio.gitlab.io/ird-observe) # Demo ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://ultreiaio.gitlab.io/observe</url> + <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -154,6 +154,13 @@ <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> + <distributionManagement> + <site> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> + </site> + + </distributionManagement> <properties> <organizationId>ultreiaio</organizationId> ===================================== src/site/resources/.gitlab-ci.yml ===================================== --- /dev/null +++ b/src/site/resources/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c4cd675030f082a1c86b3ab00c…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 71ba2d5b by Tony CHEMIT at 2017-03-20T09:36:33+01:00 Site checkin for project ObServe - - - - - 12 changed files: - − .gitignore - + administration-web.html - + architecture-logicielle.html - + changelog.html - + changes-report.html - + config-report.html - + css/apache-maven-fluido-1.6.min.css - + css/print.css - + css/site.css - + dependency-convergence.html - + dependency-info.html - + dependency-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71ba2d5b6b0cc6e10f49f471cdd…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch pages
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed new branch pages at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: update pom to 7
by Tony CHEMIT 20 Mar '17

20 Mar '17

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 1dd2dde0 by Tony CHEMIT at 2017-03-20T08:21:23+01:00 update pom to 7 - - - - - c4cd6750 by Tony CHEMIT at 2017-03-20T09:24:37+01:00 review site (deploy it now under gitlab.io) - - - - - 14 changed files: - .gitlab-ci.yml - README.md - pom.xml - src/site/markdown/architecture-logicielle.md - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png - src/site/resources/images/logo.png → src/site/resources/img/logo.png - src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - src/site/site_fr.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,8 +51,8 @@ stages: .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn verify site site:stage -DperformRelease + - mvn scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # ObServe [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… -![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop-5.x/build.… +![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop-5.x/build.s… # Resources -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop-5.x/CHANG… -* [Documentation](http://observe.ultreia.io) +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop-5.x/CHANGE… +* [Documentation](http://ultreiaio.gitlab.io/observe) # Demo ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>4</version> + <version>9</version> </parent> <groupId>fr.ird.observe</groupId> @@ -37,7 +37,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.ultreia.io</url> + <url>http://ultreiaio.gitlab.io/observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -154,20 +154,28 @@ <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> - <distributionManagement> - <site> - <id>doc.ultreia.io</id> - </site> - </distributionManagement> - <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> +  + <devMode>true</devMode> + +  + <observe.model.version>5.0</observe.model.version> + +  + <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> + <buildDate>${maven.build.timestamp}</buildDate> + + <mavenVersion>3.3.9</mavenVersion> + <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> + <licensePluginVersion>1.9</licensePluginVersion> + <jaxxVersion>2.42</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> @@ -181,14 +189,9 @@ <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <webmotionVersion>2.5.1</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> - <licensePluginVersion>1.9</licensePluginVersion> - - <mavenVersion>3.3.9</mavenVersion> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -207,7 +210,6 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>  <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> @@ -215,38 +217,12 @@ <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> - <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> - <buildDate>${maven.build.timestamp}</buildDate> - <devMode>true</devMode> - -  - <observe.model.version>5.0</observe.model.version> - +  <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName> </properties> - <repositories> - <repository> - <id>before-central</id> - <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>before-central</id> - <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> <dependencyManagement> <dependencies> @@ -792,7 +768,6 @@ <pluginManagement> <plugins> -  <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -815,6 +790,24 @@ </plugin> <plugin> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.reporting.outputDirectory}</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <dependencies> @@ -871,7 +864,7 @@ <releaseArtifact> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <name>Application</name> + <name>Client</name> <type>zip</type> </releaseArtifact> <releaseArtifact> @@ -886,14 +879,6 @@ </plugins> </pluginManagement> - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> </build> <reporting> @@ -947,6 +932,7 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -971,29 +957,40 @@ <plugin> <artifactId>maven-changes-plugin</artifactId> <version>${changesPluginVersion}</version> + <inherited>false</inherited> <configuration> <issueLinkTemplatePerSystem> - <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab> </issueLinkTemplatePerSystem> <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> </configuration> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> <artifactId>maven-changelog-plugin</artifactId> <version>${changelogPluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>${licensePluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -1053,20 +1050,6 @@ </executions> </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - </plugins> </build> ===================================== src/site/markdown/architecture-logicielle.md ===================================== --- a/src/site/markdown/architecture-logicielle.md +++ b/src/site/markdown/architecture-logicielle.md @@ -15,9 +15,7 @@ Il est basé sur une architecture n-tiers en couches, à savoir : - une couche de Services - une couche de Persistance -.. image:: images/architecture.png - :scale: 50 - :align: center +[Architecture](!./img/architecture.png) # La couche de Présentation ===================================== src/site/resources/images/architecture.png → src/site/resources/img/architecture.png ===================================== Binary files a/src/site/resources/images/architecture.png and b/src/site/resources/img/architecture.png differ ===================================== src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg ===================================== --- a/src/site/resources/images/architecture.svg +++ b/src/site/resources/img/architecture.svg ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png ===================================== Binary files a/src/site/resources/images/logos/jaxx-logo.png and b/src/site/resources/img/jaxx-logo.png differ ===================================== src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png ===================================== Binary files a/src/site/resources/images/logo-small.png and b/src/site/resources/img/logo-small.png differ ===================================== src/site/resources/images/logo.png → src/site/resources/img/logo.png ===================================== Binary files a/src/site/resources/images/logo.png and b/src/site/resources/img/logo.png differ ===================================== src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files a/src/site/resources/images/logos/logo_IntelliJIDEA.png and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -22,14 +22,14 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.6</version> </skin> <custom> @@ -48,38 +48,26 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src> + <src>./img/logo-small.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - - <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> - <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/> - + <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/> + <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" src="site.js"> </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> - <links> - <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> + <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/> <item name="Ultreia.io" href="http://ultreia.io"/> </links> <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -87,8 +75,7 @@ <item name="Installation" href="install.html"/> <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> - <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/observe/blob/e7881100e542f7fa62209d49edf84501…"/> + <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -101,14 +88,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='md' - scmwebeditor_skipFiles=',config-report,' - scmwebeditor_vmFiles=",index,"/> - </footer> - </body> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/53ab9cd143cf817335468f724a…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT 15 Mar '17

15 Mar '17

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: ca63154c by Tony CHEMIT at 2017-03-15T15:14:33+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ **Closed at *In progress*.** ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ca63154c93efd1e4e134d7bd90…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT 15 Mar '17

15 Mar '17

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT 15 Mar '17

15 Mar '17

Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreia.io / ird-observe Commits: 4362e374 by Tony CHEMIT at 2017-03-15T15:07:46+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4362e3749f0e4b87f6db1bb8a7…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v6.0-RC-1
by Tony CHEMIT 15 Mar '17

15 Mar '17

Tony CHEMIT pushed new tag v6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master] 13 commits: [jgitflow-maven-plugin]Updating develop poms back to pre merge state
by Tony CHEMIT 15 Mar '17

15 Mar '17

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: ebf49628 by Tony CHEMIT at 2017-03-11T12:56:06+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9eb36475 by Tony CHEMIT at 2017-03-11T12:59:33+01:00 Update changelog for staging version 6.0-RC-1 - - - - - 2f75e9a1 by Tony CHEMIT at 2017-03-11T13:02:24+01:00 update changelog - - - - - 06ff52a8 by Tony CHEMIT at 2017-03-12T12:08:23+01:00 update changelog - - - - - 3d110ad4 by Tony CHEMIT at 2017-03-12T13:17:44+01:00 remove release scripts, use pom ones - - - - - bfdcbff8 by Tony CHEMIT at 2017-03-12T13:48:49+01:00 use pom 5 - - - - - 82f0c7f5 by Tony CHEMIT at 2017-03-15T14:28:40+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 742331a6 by Tony CHEMIT at 2017-03-15T14:35:26+01:00 fix changelog - - - - - 8445cb2e by Tony CHEMIT at 2017-03-15T15:01:46+01:00 report from version 5.x (See #745 and #742) - - - - - fb325b37 by Tony CHEMIT at 2017-03-15T15:05:26+01:00 update changelog before release - - - - - db5e4a1d by Tony CHEMIT at 2017-03-15T15:06:19+01:00 prepare release 6.0-RC-1 - - - - - 4362e374 by Tony CHEMIT at 2017-03-15T15:07:46+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 4a108146 by Tony CHEMIT at 2017-03-15T15:13:40+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 24 changed files: - .gitlab-ci.yml - CHANGELOG.md - − bin/stage_create.sh - − bin/stage_drop.sh - − bin/stage_release.sh - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - . bin/create_stage.sh + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-chang… | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -142,7 +146,13 @@ release: <<: *staging when: manual script: - - . bin/stage_release.sh + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + +drop: + <<: *staging + when: manual + script: + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== bin/stage_create.sh deleted ===================================== --- a/bin/stage_create.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -PROJECT=ird-observe -MASTER=master -DEVELOP=develop -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "version to release: $VERSION" -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -git checkout -B ${MASTER} -git checkout -B ${DEVELOP} - -echo "Start release: $VERSION ($LOG_DIR/release-start.log)" -mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" -mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') - -echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi - -echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" -rm -rf target/gitlab_cache - -mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi - -git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== bin/stage_drop.sh deleted ===================================== --- a/bin/stage_drop.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -PROJECT=ird-observe -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) - -echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" -mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log ===================================== bin/stage_release.sh deleted ===================================== --- a/bin/stage_release.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -PROJECT=ird-observe -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -echo "Get staging id..." -STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) - -echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java @@ -69,7 +69,6 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM addScript("07", "drop_not_null_constraint_gearUseFeatures", queries); addScript("08", "drop_not_null_constraint_hauling_identifier", queries); - addScript("09", "add_non_target_length_sex_fk", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { @@ -86,7 +85,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); if (!collect.contains("fk_nontargetlength_sex")) { - addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } } @@ -106,7 +105,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); if (!collect.contains("fk_nontargetlength_sex")) { - addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -98,6 +98,11 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat super(callBack, PGDataSourceMigration.TYPE); } + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + addScript("02", "add-foreign-key-indexes", queries); + } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -71,10 +71,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse addMissingForeignKeys(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/6983 - addScript("02", "update-senne-gear-usedInTrip", queries); + addScript("01", "update-senne-gear-usedInTrip", queries); // See https://forge.codelutin.com/issues/6991 - addScript("03", "rename-unknown-longliner", queries); + addScript("02", "rename-unknown-longliner", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>4</version> + <version>5</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/76b52572c97d33a6e0c2f254e…

1 0