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

Commits:

4 changed files:

Changes:

  • application-swing/pom.xml
    ... ... @@ -35,7 +35,6 @@
    35 35
       <description>ObServe Application Swing</description>
    
    36 36
     
    
    37 37
       <properties>
    
    38
    -    <maven.deploy.skip>true</maven.deploy.skip>
    
    39 38
     
    
    40 39
         <!-- jaxx configuration -->
    
    41 40
         <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
    
    ... ... @@ -955,7 +954,9 @@
    955 954
                         <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
    
    956 955
                           <resource>xwork.xml</resource>
    
    957 956
                         </transformer>
    
    958
    -
    
    957
    +                    <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
    
    958
    +                      <resource>CHANGELOG.txt</resource>
    
    959
    +                    </transformer>
    
    959 960
                         <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
    
    960 961
                           <resource>LICENSE.txt</resource>
    
    961 962
                         </transformer>
    
    ... ... @@ -1001,12 +1002,7 @@
    1001 1002
                         <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
    
    1002 1003
                           <resource>NOTICE.txt</resource>
    
    1003 1004
                         </transformer>
    
    1004
    -                    <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
    
    1005
    -                      <resource>META-INF/CHANGELOG.txt</resource>
    
    1006
    -                    </transformer>
    
    1007 1005
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
    
    1008
    -                    <!--<templates implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />-->
    
    1009
    -                    <!--<templates implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />-->
    
    1010 1006
     
    
    1011 1007
                         <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
    
    1012 1008
                           <file>README.md</file>
    
    ... ... @@ -1024,9 +1020,12 @@
    1024 1020
                           <file>${project.build.outputDirectory}/META-INF/${applicationName}-LICENSE.txt</file>
    
    1025 1021
                           <resource>META-INF/${applicationName}-LICENSE.txt</resource>
    
    1026 1022
                         </transformer>
    
    1027
    -
    
    1028 1023
                         <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
    
    1029
    -                      <file>${project.build.directory}/generated-sources/licenses/META-INF/${applicationName}-CHANGELOG.txt</file>
    
    1024
    +                      <file>${project.build.directory}/generated-sources/license/CHANGELOG.txt</file>
    
    1025
    +                      <resource>CHANGELOG.txt</resource>
    
    1026
    +                    </transformer>
    
    1027
    +                    <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
    
    1028
    +                      <file>${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt</file>
    
    1030 1029
                           <resource>META-INF/${applicationName}-CHANGELOG.txt</resource>
    
    1031 1030
                         </transformer>
    
    1032 1031
     
    

  • pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>io.ultreia.maven</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>9</version>
    
    30
    +    <version>10</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -35,7 +35,7 @@
    35 35
       <version>5.3.8-SNAPSHOT</version>
    
    36 36
       <packaging>pom</packaging>
    
    37 37
     
    
    38
    -  <name>ObServe</name>
    
    38
    +  <name>ObServe :: Pom</name>
    
    39 39
       <description>Projet ObServe</description>
    
    40 40
       <url>https://ultreiaio.gitlab.io/ird-observe</url>
    
    41 41
       <inceptionYear>2008</inceptionYear>
    
    ... ... @@ -228,6 +228,8 @@
    228 228
         <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName>
    
    229 229
         <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName>
    
    230 230
     
    
    231
    +    <!-- deploy nothing -->
    
    232
    +    <maven.deploy.skip>true</maven.deploy.skip>
    
    231 233
       </properties>
    
    232 234
     
    
    233 235
       <dependencyManagement>
    
    ... ... @@ -793,6 +795,11 @@
    793 795
                   <artifactId>nuiton-version</artifactId>
    
    794 796
                   <version>${nuitonVersionVersion}</version>
    
    795 797
                 </dependency>
    
    798
    +            <dependency>
    
    799
    +              <groupId>org.apache.velocity</groupId>
    
    800
    +              <artifactId>velocity</artifactId>
    
    801
    +              <version>1.7</version>
    
    802
    +            </dependency>
    
    796 803
               </dependencies>
    
    797 804
             </plugin>
    
    798 805
     
    
    ... ... @@ -871,7 +878,7 @@
    871 878
                   <releaseArtifact>
    
    872 879
                     <groupId>fr.ird.observe</groupId>
    
    873 880
                     <artifactId>observe</artifactId>
    
    874
    -                <name>Client</name>
    
    881
    +                <name>Application</name>
    
    875 882
                     <type>zip</type>
    
    876 883
                   </releaseArtifact>
    
    877 884
                   <releaseArtifact>
    
    ... ... @@ -905,6 +912,9 @@
    905 912
           <modules>
    
    906 913
             <module>observe</module>
    
    907 914
           </modules>
    
    915
    +      <properties>
    
    916
    +        <devMode>false</devMode>
    
    917
    +      </properties>
    
    908 918
         </profile>
    
    909 919
     
    
    910 920
         <profile>
    

  • services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java
    ... ... @@ -25,12 +25,11 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql;
    25 25
     import com.google.common.collect.Multimap;
    
    26 26
     import fr.ird.observe.services.dto.referential.ReferentialDto;
    
    27 27
     import fr.ird.observe.services.dto.referential.ReferentialReference;
    
    28
    +import java.util.List;
    
    28 29
     import org.apache.commons.logging.Log;
    
    29 30
     import org.apache.commons.logging.LogFactory;
    
    30 31
     import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity;
    
    31 32
     
    
    32
    -import java.util.List;
    
    33
    -
    
    34 33
     /**
    
    35 34
      * Pour générer une requète sql d'ajout à partir d'un référentiel donné et aussi tous les inserts manquants
    
    36 35
      *
    
    ... ... @@ -79,6 +78,9 @@ public abstract class InsertSqlWithCascadeStatementGenerator<R extends Referenti
    79 78
     
    
    80 79
         public String generateSql(R referentialDto) {
    
    81 80
     
    
    81
    +        if (sqlBuilder.length() > 0) {
    
    82
    +            sqlBuilder.delete(0, sqlBuilder.length());
    
    83
    +        }
    
    82 84
             String sql = delegateGenerator.generateSql(referentialDto);
    
    83 85
             sqlBuilder.append(sql);
    
    84 86
             return sqlBuilder.toString();
    

  • services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java
    ... ... @@ -76,7 +76,9 @@ public abstract class UpdateSqlWithCascadeStatementGenerator<R extends Referenti
    76 76
         protected abstract <D extends ReferentialDto> String insertMissingReferential(Class<D> referentialType, String id);
    
    77 77
     
    
    78 78
         public String generateSql(R referentialDto) {
    
    79
    -
    
    79
    +        if (sqlBuilder.length() > 0) {
    
    80
    +            sqlBuilder.delete(0, sqlBuilder.length());
    
    81
    +        }
    
    80 82
             String sql = delegateGenerator.generateSql(referentialDto);
    
    81 83
             sqlBuilder.append(sql);
    
    82 84
             return sqlBuilder.toString();