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

Commits:

4 changed files:

Changes:

  • client/src/main/ftl/dataSourceInformation_en.ftl
    ... ... @@ -15,7 +15,7 @@
    15 15
         <#else>
    
    16 16
           <li><strong>Web service url: </strong>${configuration.serverUrl}</li>
    
    17 17
           <li><strong>User: </strong>${configuration.login}</li>
    
    18
    -      <#if configuration.optionalDatabaseName.present>
    
    18
    +      <#if configuration.optionalDatabaseName.present??>
    
    19 19
             <li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li>
    
    20 20
           </#if>
    
    21 21
         </#if>
    

  • client/src/main/ftl/dataSourceInformation_es.ftl
    ... ... @@ -15,7 +15,7 @@
    15 15
         <#else>
    
    16 16
           <li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li>
    
    17 17
           <li><strong>Usuario: </strong>${configuration.login}</li>
    
    18
    -      <#if configuration.optionalDatabaseName.present>
    
    18
    +      <#if configuration.optionalDatabaseName.present??>
    
    19 19
             <li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li>
    
    20 20
           </#if>
    
    21 21
         </#if>
    

  • client/src/main/ftl/dataSourceInformation_fr.ftl
    ... ... @@ -15,7 +15,7 @@
    15 15
         <#else>
    
    16 16
           <li><strong>URL du service web : </strong>${configuration.serverUrl}</li>
    
    17 17
           <li><strong>Utilisateur : </strong>${configuration.login}</li>
    
    18
    -      <#if configuration.optionalDatabaseName.present>
    
    18
    +      <#if configuration.optionalDatabaseName.present??>
    
    19 19
             <li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li>
    
    20 20
           </#if>
    
    21 21
         </#if>
    

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>io.ultreia.maven</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>2018.53</version>
    
    29
    +    <version>2018.56</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -153,7 +153,7 @@
    153 153
         <buildDate>${maven.build.timestamp}</buildDate>
    
    154 154
     
    
    155 155
         <observeToolkitVersion>3.7.7</observeToolkitVersion>
    
    156
    -    <lib.version.java4all.http>1.0.13</lib.version.java4all.http>
    
    156
    +    <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
    
    157 157
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    
    158 158
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
    
    159 159
         <xworkVersion>2.3.35</xworkVersion>