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

Commits:

16 changed files:

Changes:

  • client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java
    ... ... @@ -507,9 +507,9 @@ public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveS
    507 507 
             log.info(String.format("Do backup of %s into: %s", this, dst));
    508 508 
             try {
    509 509 
                 Files.deleteIfExists(dst);
    510 
    -            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, config.getModelVersion()).addGeneratedSchema().addStandaloneTables().addAllData().build();
    510 
    +            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, config.getModelVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build();
    511 511 
                 SqlScript dataDump = getDataSourceService().produceCreateSqlScript(request);
    512 
    -            dataDump.copy(dst);
    512 
    +            dataDump.copyAndCompress(dst);
    513 513 
             } catch (Exception e) {
    514 514 
                 throw new ObserveSwingTechnicalException(e);
    515 515 
             }

  • client/datasource/actions/pom.xml
    ... ... @@ -160,6 +160,10 @@
    160 160 
           <groupId>org.apache.logging.log4j</groupId>
    161 161 
           <artifactId>log4j-api</artifactId>
    162 162 
         </dependency>
    163 
    +    <dependency>
    164 
    +      <groupId>org.swinglabs</groupId>
    165 
    +      <artifactId>jxlayer</artifactId>
    166 
    +    </dependency>
    163 167 
         <dependency>
    164 168 
           <groupId>org.swinglabs.swingx</groupId>
    165 169 
           <artifactId>swingx-core</artifactId>

  • client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java
    ... ... @@ -88,9 +88,9 @@ public class Start extends SaveLocalUIActionSupport {
    88 88 
                 File backupFile = stepModel.getBackupFile();
    89 89
    90 90 
                 DataSourceService dumpService = source.getDataSourceService();
    91 
    -            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addStandaloneTables().addAllData().build();
    91 
    +            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build();
    92 92 
                 SqlScript dump = dumpService.produceCreateSqlScript(request);
    93 
    -            dump.copy(backupFile.toPath());
    93 
    +            dump.copyAndCompress(backupFile.toPath());
    94 94 
             }
    95 95
    96 96 
             if (stepModel.containsStepForSave(AdminStep.SYNCHRONIZE)) {

  • client/datasource/editor/api/pom.xml
    ... ... @@ -168,6 +168,10 @@
    168 168 
           <groupId>org.geotools</groupId>
    169 169 
           <artifactId>gt-main</artifactId>
    170 170 
         </dependency>
    171 
    +    <dependency>
    172 
    +      <groupId>org.geotools</groupId>
    173 
    +      <artifactId>gt-metadata</artifactId>
    174 
    +    </dependency>
    171 175 
         <dependency>
    172 176 
           <groupId>org.geotools</groupId>
    173 177 
           <artifactId>gt-opengis</artifactId>

  • client/datasource/editor/common/pom.xml
    ... ... @@ -81,6 +81,10 @@
    81 81 
           <groupId>org.apache.logging.log4j</groupId>
    82 82 
           <artifactId>log4j-api</artifactId>
    83 83 
         </dependency>
    84 
    +    <dependency>
    85 
    +      <groupId>org.swinglabs</groupId>
    86 
    +      <artifactId>jxlayer</artifactId>
    87 
    +    </dependency>
    84 88 
         <dependency>
    85 89 
           <groupId>${project.groupId}</groupId>
    86 90 
           <artifactId>client-datasource-editor-api-test</artifactId>

  • client/datasource/editor/ll/pom.xml
    ... ... @@ -147,6 +147,10 @@
    147 147 
           <groupId>org.locationtech.jts</groupId>
    148 148 
           <artifactId>jts-core</artifactId>
    149 149 
         </dependency>
    150 
    +    <dependency>
    151 
    +      <groupId>org.swinglabs</groupId>
    152 
    +      <artifactId>jxlayer</artifactId>
    153 
    +    </dependency>
    150 154 
         <dependency>
    151 155 
           <groupId>org.swinglabs.swingx</groupId>
    152 156 
           <artifactId>swingx-core</artifactId>

  • client/datasource/editor/pom.xml
    ... ... @@ -91,6 +91,11 @@
    91 91 
             <artifactId>gt-main</artifactId>
    92 92 
             <version>${lib.version.geoTools}</version>
    93 93 
           </dependency>
    94 
    +      <dependency>
    95 
    +        <groupId>org.geotools</groupId>
    96 
    +        <artifactId>gt-metadata</artifactId>
    97 
    +        <version>${lib.version.geoTools}</version>
    98 
    +      </dependency>
    94 99 
           <dependency>
    95 100 
             <groupId>org.geotools</groupId>
    96 101 
             <artifactId>gt-opengis</artifactId>

  • client/datasource/editor/ps/pom.xml
    ... ... @@ -155,6 +155,10 @@
    155 155 
           <groupId>org.locationtech.jts</groupId>
    156 156 
           <artifactId>jts-core</artifactId>
    157 157 
         </dependency>
    158 
    +    <dependency>
    159 
    +      <groupId>org.swinglabs</groupId>
    160 
    +      <artifactId>jxlayer</artifactId>
    161 
    +    </dependency>
    158 162 
         <dependency>
    159 163 
           <groupId>org.swinglabs.swingx</groupId>
    160 164 
           <artifactId>swingx-core</artifactId>

  • client/runner/pom.xml
    ... ... @@ -75,6 +75,10 @@
    75 75 
           <groupId>io.ultreia.java4all</groupId>
    76 76 
           <artifactId>application-context</artifactId>
    77 77 
         </dependency>
    78 
    +    <dependency>
    79 
    +      <groupId>io.ultreia.java4all</groupId>
    80 
    +      <artifactId>java-util</artifactId>
    81 
    +    </dependency>
    78 82 
         <dependency>
    79 83 
           <groupId>io.ultreia.java4all.i18n</groupId>
    80 84 
           <artifactId>i18n-runtime</artifactId>
    ... ... @@ -363,7 +367,7 @@
    363 367 
                 <phase>generate-resources</phase>
    364 368 
                 <configuration>
    365 369 
                   <target>
    366 
    -                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
    370 
    +                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
    367 371 
                   </target>
    368 372 
                 </configuration>
    369 373 
               </execution>
    ... ... @@ -377,7 +381,7 @@
    377 381 
                   <target>
    378 382 
                     <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/">
    379 383 
                       <fileset dir="${config.targetDirectory}">
    380 
    -                    <include name="${applicationName}.*" />
    384 
    +                    <include name="${applicationName}.*"/>
    381 385 
                       </fileset>
    382 386 
                     </copy>
    383 387 
                   </target>
    ... ... @@ -391,7 +395,7 @@
    391 395 
                 <phase>integration-test</phase>
    392 396 
                 <configuration>
    393 397 
                   <target>
    394 
    -                <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar" />
    398 
    +                <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar"/>
    395 399 
                   </target>
    396 400 
                 </configuration>
    397 401 
               </execution>
    ... ... @@ -425,7 +429,7 @@
    425 429 
                     <phase>integration-test</phase>
    426 430 
                     <configuration>
    427 431 
                       <target>
    428 
    -                    <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe" />
    432 
    +                    <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe"/>
    429 433 
                       </target>
    430 434 
                     </configuration>
    431 435 
                   </execution>

  • core/api/validation/pom.xml
    ... ... @@ -63,6 +63,11 @@
    63 63 
           <artifactId>toolkit-api-services</artifactId>
    64 64 
           <version>${project.version}</version>
    65 65 
         </dependency>
    66 
    +    <dependency>
    67 
    +      <groupId>${project.groupId}</groupId>
    68 
    +      <artifactId>toolkit-api-validation</artifactId>
    69 
    +      <version>${project.version}</version>
    70 
    +    </dependency>
    66 71 
         <dependency>
    67 72 
           <groupId>${project.groupId}</groupId>
    68 73 
           <artifactId>model</artifactId>

  • core/persistence/avdth/pom.xml
    ... ... @@ -66,6 +66,10 @@
    66 66 
           <groupId>com.google.guava</groupId>
    67 67 
           <artifactId>guava</artifactId>
    68 68 
         </dependency>
    69 
    +    <dependency>
    70 
    +      <groupId>io.ultreia.java4all</groupId>
    71 
    +      <artifactId>java-bean</artifactId>
    72 
    +    </dependency>
    69 73 
         <dependency>
    70 74 
           <groupId>io.ultreia.java4all</groupId>
    71 75 
           <artifactId>java-lang</artifactId>

  • core/services/pom.xml
    ... ... @@ -36,7 +36,7 @@
    36 36 
         <module>client</module>
    37 37 
       </modules>
    38 38 
       <properties>
    39 
    -    <serviceClassifier />
    39 
    +    <serviceClassifier/>
    40 40 
       </properties>
    41 41 
       <profiles>
    42 42 
         <profile>

  • model/pom.xml
    ... ... @@ -91,11 +91,11 @@
    91 91 
                   <target>
    92 92 
                     <copy failonerror="true" filtering="true" overwrite="true" todir="${project.build.outputDirectory}/models">
    93 93 
                       <filterset>
    94 
    -                    <filter token="persistence.model.version" value="${persistence.model.version}" />
    95 
    -                    <filter token="model.name" value="${model.name}" />
    94 
    +                    <filter token="persistence.model.version" value="${persistence.model.version}"/>
    95 
    +                    <filter token="model.name" value="${model.name}"/>
    96 96 
                       </filterset>
    97 97 
                       <fileset dir="${basedir}/src/main/models">
    98 
    -                    <include name="**/*" />
    98 
    +                    <include name="**/*"/>
    99 99 
                       </fileset>
    100 100 
                     </copy>
    101 101 
                   </target>
    ... ... @@ -111,12 +111,12 @@
    111 111 
                   <target>
    112 112 
                     <delete includeEmptyDirs="true">
    113 113 
                       <fileset dir="${project.build.outputDirectory}/models/${model.name}">
    114 
    -                    <include name="${model.dto.classifier}/*/*" />
    115 
    -                    <include name="${model.dto.classifier}/*" />
    116 
    -                    <include name="${model.dto.classifier}" />
    117 
    -                    <include name="${model.persistence.classifier}/*/*" />
    118 
    -                    <include name="${model.persistence.classifier}/*" />
    119 
    -                    <include name="${model.persistence.classifier}" />
    114 
    +                    <include name="${model.dto.classifier}/*/*"/>
    115 
    +                    <include name="${model.dto.classifier}/*"/>
    116 
    +                    <include name="${model.dto.classifier}"/>
    117 
    +                    <include name="${model.persistence.classifier}/*/*"/>
    118 
    +                    <include name="${model.persistence.classifier}/*"/>
    119 
    +                    <include name="${model.persistence.classifier}"/>
    120 120 
                       </fileset>
    121 121 
                     </delete>
    122 122 
                   </target>

  • observe/pom.xml
    ... ... @@ -31,7 +31,7 @@
    31 31 
       <description>ObServe Release</description>
    32 32 
       <properties>
    33 33 
         <deploy>false</deploy>
    34 
    -    <deployFileSuffix />
    34 
    +    <deployFileSuffix/>
    35 35 
       </properties>
    36 36 
       <build>
    37 37 
         <plugins>
    ... ... @@ -183,9 +183,6 @@
    183 183 
             <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
    184 184 
             <!--        <deployFileSuffix />-->
    185 185 
           </properties>
    186 
    -      <build>
    187 
    -        <plugins />
    188 
    -      </build>
    189 186 
         </profile>
    190 187 
       </profiles>
    191 188 
     </project>

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23 
       <parent>
    24 24 
         <groupId>io.ultreia.maven</groupId>
    25 25 
         <artifactId>pom</artifactId>
    26 
    -    <version>2023.15</version>
    26 
    +    <version>2023.26</version>
    27 27 
       </parent>
    28 28 
       <groupId>fr.ird.observe</groupId>
    29 29 
       <artifactId>ird-observe</artifactId>
    ... ... @@ -546,6 +546,11 @@
    546 546 
             <artifactId>commons-lang3</artifactId>
    547 547 
             <version>${lib.version.commons-lang3}</version>
    548 548 
           </dependency>
    549 
    +      <dependency>
    550 
    +        <groupId>org.apache.commons</groupId>
    551 
    +        <artifactId>commons-text</artifactId>
    552 
    +        <version>1.10.0</version>
    553 
    +      </dependency>
    549 554 
           <dependency>
    550 555 
             <groupId>org.apache.httpcomponents</groupId>
    551 556 
             <artifactId>httpclient</artifactId>
    ... ... @@ -738,6 +743,11 @@
    738 743 
             <artifactId>jboss-logging</artifactId>
    739 744 
             <version>${lib.version.jboss-logging}</version>
    740 745 
           </dependency>
    746 
    +      <dependency>
    747 
    +        <groupId>org.jdom</groupId>
    748 
    +        <artifactId>jdom2</artifactId>
    749 
    +        <version>2.0.6.1</version>
    750 
    +      </dependency>
    741 751 
           <dependency>
    742 752 
             <groupId>org.locationtech.jts</groupId>
    743 753 
             <artifactId>jts-core</artifactId>
    ... ... @@ -1206,7 +1216,7 @@
    1206 1216 
                 <groupId>org.apache.maven.plugins</groupId>
    1207 1217 
                 <artifactId>maven-project-info-reports-plugin</artifactId>
    1208 1218 
                 <version>${plugin.version.projectInfoReports}</version>
    1209 
    -<!--            <inherited>false</inherited>-->
    1219 
    +            <!--            <inherited>false</inherited>-->
    1210 1220 
               </plugin>
    1211 1221 
               <plugin>
    1212 1222 
                 <groupId>org.apache.maven.plugins</groupId>
    ... ... @@ -1656,7 +1666,7 @@
    1656 1666 
                     <phase>pre-site</phase>
    1657 1667 
                     <configuration>
    1658 1668 
                       <target>
    1659 
    -                    <copy failonerror="true" file="README.md" overwrite="true" verbose="true" tofile="${project.basedir}/src/site/markdown/index.md" />
    1669 
    +                    <copy failonerror="true" file="README.md" overwrite="true" tofile="${project.basedir}/src/site/markdown/index.md" verbose="true"/>
    1660 1670 
                       </target>
    1661 1671 
                     </configuration>
    1662 1672 
                   </execution>
    ... ... @@ -1686,11 +1696,11 @@
    1686 1696 
                     <phase>pre-site</phase>
    1687 1697 
                     <configuration>
    1688 1698 
                       <target>
    1689 
    -                    <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown" />
    1690 
    -                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
    1691 
    -                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
    1692 
    -                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
    1693 
    -                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
    1699 
    +                    <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown"/>
    1700 
    +                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
    1701 
    +                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
    1702 
    +                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
    1703 
    +                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
    1694 1704 
                       </target>
    1695 1705 
                     </configuration>
    1696 1706 
                   </execution>

  • server/runner/pom.xml
    ... ... @@ -256,7 +256,7 @@
    256 256 
                 <phase>generate-resources</phase>
    257 257 
                 <configuration>
    258 258 
                   <target>
    259 
    -                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
    259 
    +                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
    260 260 
                   </target>
    261 261 
                 </configuration>
    262 262 
               </execution>
    ... ... @@ -270,7 +270,7 @@
    270 270 
                   <target>
    271 271 
                     <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/">
    272 272 
                       <fileset dir="${config.targetDirectory}">
    273 
    -                    <include name="${applicationName}.*" />
    273 
    +                    <include name="${applicationName}.*"/>
    274 274 
                       </fileset>
    275 275 
                     </copy>
    276 276 
                   </target>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help