Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -19,7 +19,7 @@
    19 19 
         - develop
    20 20 
     .only_tag: &only_tag
    21 21 
       only:
    22 
    -    - tag
    22 
    +    - tags
    23 23 
     .only_triggers: &only_triggers
    24 24 
       only:
    25 25 
         - triggers
    ... ... @@ -36,7 +36,7 @@
    36 36
    37 37 
     .publish-site: &publish_site
    38 38 
       script:
    39 
    -    - ultreiaio-site-mono-module-publish
    39 
    +    - ultreiaio-site-publish
    40 40
    41 41 
     image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:latest
    42 42 
     stages:
    ... ... @@ -96,18 +96,18 @@ release:
    96 96 
         - ultreiaio-milestone-create
    97 97
    98 98 
     staging-demo:
    99 
    -  <<: *stage_staging
    99 
    +  <<: *stage_build
    100 100 
       <<: *env_staging
    101 101 
       <<: *only_tag
    102 102 
       script:
    103 103 
         - ultreiaio-war-deploy-to-demo 'server'
    104 104
    105 105 
     staging-site:
    106 
    -  <<: *stage_staging
    106 
    +  <<: *stage_build
    107 107 
       <<: *env_staging
    108 108 
       <<: *only_tag
    109 109 
       script:
    110 
    -    - ultreiaio-site-mono-module-publish
    110 
    +    - ultreiaio-site-publish
    111 111
    112 112 
     stage-release:
    113 113 
       <<: *stage_staging
    ... ... @@ -132,7 +132,7 @@ latest-site:
    132 132 
       <<: *only_develop
    133 133 
       when: manual
    134 134 
       script:
    135 
    -    - ultreiaio-site-mono-module-publish
    135 
    +    - ultreiaio-site-publish
    136 136
    137 137 
     latest-demo:
    138 138 
       <<: *stage_test

  • client/pom.xml
    ... ... @@ -565,12 +565,6 @@
    565 565 
           <artifactId>h2</artifactId>
    566 566 
         </dependency>
    567 567
    568 
    -    <!-- FreeMarker -->
    569 
    -    <dependency>
    570 
    -      <groupId>org.freemarker</groupId>
    571 
    -      <artifactId>freemarker</artifactId>
    572 
    -    </dependency>
    573 
    -
    574 568 
         <!-- Map -->
    575 569 
         <dependency>
    576 570 
           <groupId>org.geotools</groupId>

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2017.36</version>
    29 
    +    <version>2017.38</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -153,8 +153,8 @@
    153 153 
         <buildDate>${maven.build.timestamp}</buildDate>
    154 154
    155 155 
         <observeToolkitVersion>1.7-SNAPSHOT</observeToolkitVersion>
    156 
    -    <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
    157 
    -    <processorPluginVersion>1.3</processorPluginVersion>
    156 
    +    <plugin.version.eugene>3.0-alpha-16</plugin.version.eugene>
    157 
    +    <plugin.version.processor>1.3</plugin.version.processor>
    158 158
    159 159 
         <jaxx.version>3.0-alpha-17</jaxx.version>
    160 160 
         <i18n.version>4.0-alpha-7-SNAPSHOT</i18n.version>
    ... ... @@ -174,12 +174,11 @@
    174 174 
         <webmotionVersion>2.5.3</webmotionVersion>
    175 175 
         <httpComponentsVersion>4.5.3</httpComponentsVersion>
    176 176 
         <geoToolsVersion>17.2</geoToolsVersion>
    177 
    -    <guavaVersion>23.2-jre</guavaVersion>
    177 
    +    <guavaVersion>23.3-jre</guavaVersion>
    178 178
    179 179 
         <!-- license header configuration -->
    180 180 
         <license.licenseName>gpl_v3</license.licenseName>
    181 181 
         <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>
    182 
    -    <license.excludes>**/ftl/*.ftl,**/i18n/*.properties,**/THIRD-PARTY.properties,**/*.sh,**/*.json</license.excludes>
    183 182
    184 183 
         <!-- i18n configuration -->
    185 184 
         <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>
    ... ... @@ -598,13 +597,6 @@
    598 597 
             </exclusions>
    599 598 
           </dependency>
    600 599
    601 
    -      <!-- FreeMarker -->
    602 
    -      <dependency>
    603 
    -        <groupId>org.freemarker</groupId>
    604 
    -        <artifactId>freemarker</artifactId>
    605 
    -        <version>2.3.23</version>
    606 
    -      </dependency>
    607 
    -
    608 600 
           <!-- db -->
    609 601 
           <dependency>
    610 602 
             <groupId>com.h2database</groupId>
    ... ... @@ -867,7 +859,7 @@
    867 859 
             <plugin>
    868 860 
               <groupId>io.ultreia.java4all.eugene</groupId>
    869 861 
               <artifactId>eugene-maven-plugin</artifactId>
    870 
    -          <version>${eugenePluginVersion}</version>
    862 
    +          <version>${plugin.version.eugene}</version>
    871 863 
             </plugin>
    872 864
    873 865 
             <plugin>
    ... ... @@ -951,7 +943,7 @@
    951 943
    952 944 
               <plugin>
    953 945 
                 <artifactId>maven-project-info-reports-plugin</artifactId>
    954 
    -            <version>${projectInfoReportsPluginVersion}</version>
    946 
    +            <version>${plugin.version.projectInfoReports}</version>
    955 947 
                 <inherited>false</inherited>
    956 948 
                 <reportSets>
    957 949 
                   <reportSet>
    ... ... @@ -976,7 +968,7 @@
    976 968
    977 969 
               <plugin>
    978 970 
                 <artifactId>maven-changes-plugin</artifactId>
    979 
    -            <version>${changesPluginVersion}</version>
    971 
    +            <version>${plugin.version.changes}</version>
    980 972 
                 <inherited>false</inherited>
    981 973 
                 <configuration>
    982 974 
                   <issueLinkTemplatePerSystem>
    ... ... @@ -995,21 +987,21 @@
    995 987
    996 988 
               <plugin>
    997 989 
                 <artifactId>maven-changelog-plugin</artifactId>
    998 
    -            <version>${changelogPluginVersion}</version>
    990 
    +            <version>${plugin.version.changelog}</version>
    999 991 
                 <inherited>false</inherited>
    1000 992 
               </plugin>
    1001 993
    1002 994 
               <plugin>
    1003 995 
                 <groupId>org.codehaus.mojo</groupId>
    1004 996 
                 <artifactId>license-maven-plugin</artifactId>
    1005 
    -            <version>${licensePluginVersion}</version>
    997 
    +            <version>${plugin.version.license}</version>
    1006 998 
                 <inherited>false</inherited>
    1007 999 
               </plugin>
    1008 1000
    1009 1001 
               <plugin>
    1010 1002 
                 <groupId>org.codehaus.mojo</groupId>
    1011 1003 
                 <artifactId>versions-maven-plugin</artifactId>
    1012 
    -            <version>${versionsPluginVersion}</version>
    1004 
    +            <version>${plugin.version.versions}</version>
    1013 1005 
                 <inherited>false</inherited>
    1014 1006 
                 <reportSets>
    1015 1007 
                   <reportSet>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.