[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Assistant sauvegarde qui ne zippe pas les bases - Closes #2709 - Observe-commits

31 May 2023


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


Commits:
40dd6dbb by Tony Chemit at 2023-05-31T18:37:12+02:00
Assistant sauvegarde qui ne zippe pas les bases - Closes #2709

- - - - -
98a6ac36 by Tony Chemit at 2023-05-31T18:42:48+02:00
fix some vulnerabilities in transitive dependencies

tidy pom

update pom

fix some compile dependencies

- - - - -


16 changed files:

- client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java
- client/datasource/actions/pom.xml
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java
- client/datasource/editor/api/pom.xml
- client/datasource/editor/common/pom.xml
- client/datasource/editor/ll/pom.xml
- client/datasource/editor/pom.xml
- client/datasource/editor/ps/pom.xml
- client/runner/pom.xml
- core/api/validation/pom.xml
- core/persistence/avdth/pom.xml
- core/services/pom.xml
- model/pom.xml
- observe/pom.xml
- pom.xml
- server/runner/pom.xml


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
         log.info(String.format("Do backup of %s into: %s", this, dst));
         try {
             Files.deleteIfExists(dst);
-            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, config.getModelVersion()).addGeneratedSchema().addStandaloneTables().addAllData().build();
+            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, config.getModelVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build();
             SqlScript dataDump = getDataSourceService().produceCreateSqlScript(request);
-            dataDump.copy(dst);
+            dataDump.copyAndCompress(dst);
         } catch (Exception e) {
             throw new ObserveSwingTechnicalException(e);
         }


=====================================
client/datasource/actions/pom.xml
=====================================
@@ -160,6 +160,10 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.swinglabs</groupId>
+      <artifactId>jxlayer</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <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 {
             File backupFile = stepModel.getBackupFile();
 
             DataSourceService dumpService = source.getDataSourceService();
-            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addStandaloneTables().addAllData().build();
+            CreateDatabaseRequest request = CreateDatabaseRequest.builder(false, source.getVersion()).addGeneratedSchema().addVersionTable().addStandaloneTables().addAllData().build();
             SqlScript dump = dumpService.produceCreateSqlScript(request);
-            dump.copy(backupFile.toPath());
+            dump.copyAndCompress(backupFile.toPath());
         }
 
         if (stepModel.containsStepForSave(AdminStep.SYNCHRONIZE)) {


=====================================
client/datasource/editor/api/pom.xml
=====================================
@@ -168,6 +168,10 @@
       <groupId>org.geotools</groupId>
       <artifactId>gt-main</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.geotools</groupId>
+      <artifactId>gt-metadata</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
       <artifactId>gt-opengis</artifactId>


=====================================
client/datasource/editor/common/pom.xml
=====================================
@@ -81,6 +81,10 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.swinglabs</groupId>
+      <artifactId>jxlayer</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>client-datasource-editor-api-test</artifactId>


=====================================
client/datasource/editor/ll/pom.xml
=====================================
@@ -147,6 +147,10 @@
       <groupId>org.locationtech.jts</groupId>
       <artifactId>jts-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.swinglabs</groupId>
+      <artifactId>jxlayer</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-core</artifactId>


=====================================
client/datasource/editor/pom.xml
=====================================
@@ -91,6 +91,11 @@
         <artifactId>gt-main</artifactId>
         <version>${lib.version.geoTools}</version>
       </dependency>
+      <dependency>
+        <groupId>org.geotools</groupId>
+        <artifactId>gt-metadata</artifactId>
+        <version>${lib.version.geoTools}</version>
+      </dependency>
       <dependency>
         <groupId>org.geotools</groupId>
         <artifactId>gt-opengis</artifactId>


=====================================
client/datasource/editor/ps/pom.xml
=====================================
@@ -155,6 +155,10 @@
       <groupId>org.locationtech.jts</groupId>
       <artifactId>jts-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.swinglabs</groupId>
+      <artifactId>jxlayer</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
       <artifactId>swingx-core</artifactId>


=====================================
client/runner/pom.xml
=====================================
@@ -75,6 +75,10 @@
       <groupId>io.ultreia.java4all</groupId>
       <artifactId>application-context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.ultreia.java4all</groupId>
+      <artifactId>java-util</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.ultreia.java4all.i18n</groupId>
       <artifactId>i18n-runtime</artifactId>
@@ -363,7 +367,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <target>
-                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
+                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
               </target>
             </configuration>
           </execution>
@@ -377,7 +381,7 @@
               <target>
                 <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/">
                   <fileset dir="${config.targetDirectory}">
-                    <include name="${applicationName}.*" />
+                    <include name="${applicationName}.*"/>
                   </fileset>
                 </copy>
               </target>
@@ -391,7 +395,7 @@
             <phase>integration-test</phase>
             <configuration>
               <target>
-                <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar" />
+                <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar"/>
               </target>
             </configuration>
           </execution>
@@ -425,7 +429,7 @@
                 <phase>integration-test</phase>
                 <configuration>
                   <target>
-                    <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe" />
+                    <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe"/>
                   </target>
                 </configuration>
               </execution>


=====================================
core/api/validation/pom.xml
=====================================
@@ -63,6 +63,11 @@
       <artifactId>toolkit-api-services</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>toolkit-api-validation</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>model</artifactId>


=====================================
core/persistence/avdth/pom.xml
=====================================
@@ -66,6 +66,10 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.ultreia.java4all</groupId>
+      <artifactId>java-bean</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.ultreia.java4all</groupId>
       <artifactId>java-lang</artifactId>


=====================================
core/services/pom.xml
=====================================
@@ -36,7 +36,7 @@
     <module>client</module>
   </modules>
   <properties>
-    <serviceClassifier />
+    <serviceClassifier/>
   </properties>
   <profiles>
     <profile>


=====================================
model/pom.xml
=====================================
@@ -91,11 +91,11 @@
               <target>
                 <copy failonerror="true" filtering="true" overwrite="true" todir="${project.build.outputDirectory}/models">
                   <filterset>
-                    <filter token="persistence.model.version" value="${persistence.model.version}" />
-                    <filter token="model.name" value="${model.name}" />
+                    <filter token="persistence.model.version" value="${persistence.model.version}"/>
+                    <filter token="model.name" value="${model.name}"/>
                   </filterset>
                   <fileset dir="${basedir}/src/main/models">
-                    <include name="**/*" />
+                    <include name="**/*"/>
                   </fileset>
                 </copy>
               </target>
@@ -111,12 +111,12 @@
               <target>
                 <delete includeEmptyDirs="true">
                   <fileset dir="${project.build.outputDirectory}/models/${model.name}">
-                    <include name="${model.dto.classifier}/*/*" />
-                    <include name="${model.dto.classifier}/*" />
-                    <include name="${model.dto.classifier}" />
-                    <include name="${model.persistence.classifier}/*/*" />
-                    <include name="${model.persistence.classifier}/*" />
-                    <include name="${model.persistence.classifier}" />
+                    <include name="${model.dto.classifier}/*/*"/>
+                    <include name="${model.dto.classifier}/*"/>
+                    <include name="${model.dto.classifier}"/>
+                    <include name="${model.persistence.classifier}/*/*"/>
+                    <include name="${model.persistence.classifier}/*"/>
+                    <include name="${model.persistence.classifier}"/>
                   </fileset>
                 </delete>
               </target>


=====================================
observe/pom.xml
=====================================
@@ -31,7 +31,7 @@
   <description>ObServe Release</description>
   <properties>
     <deploy>false</deploy>
-    <deployFileSuffix />
+    <deployFileSuffix/>
   </properties>
   <build>
     <plugins>
@@ -183,9 +183,6 @@
         <skipNexusStagingDeployMojo>false</skipNexusStagingDeployMojo>
         <!--        <deployFileSuffix />-->
       </properties>
-      <build>
-        <plugins />
-      </build>
     </profile>
   </profiles>
 </project>


=====================================
pom.xml
=====================================
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2023.15</version>
+    <version>2023.26</version>
   </parent>
   <groupId>fr.ird.observe</groupId>
   <artifactId>ird-observe</artifactId>
@@ -546,6 +546,11 @@
         <artifactId>commons-lang3</artifactId>
         <version>${lib.version.commons-lang3}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>1.10.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
@@ -738,6 +743,11 @@
         <artifactId>jboss-logging</artifactId>
         <version>${lib.version.jboss-logging}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jdom</groupId>
+        <artifactId>jdom2</artifactId>
+        <version>2.0.6.1</version>
+      </dependency>
       <dependency>
         <groupId>org.locationtech.jts</groupId>
         <artifactId>jts-core</artifactId>
@@ -1206,7 +1216,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-project-info-reports-plugin</artifactId>
             <version>${plugin.version.projectInfoReports}</version>
-<!--            <inherited>false</inherited>-->
+            <!--            <inherited>false</inherited>-->
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -1656,7 +1666,7 @@
                 <phase>pre-site</phase>
                 <configuration>
                   <target>
-                    <copy failonerror="true" file="README.md" overwrite="true" verbose="true" tofile="${project.basedir}/src/site/markdown/index.md" />
+                    <copy failonerror="true" file="README.md" overwrite="true" tofile="${project.basedir}/src/site/markdown/index.md" verbose="true"/>
                   </target>
                 </configuration>
               </execution>
@@ -1686,11 +1696,11 @@
                 <phase>pre-site</phase>
                 <configuration>
                   <target>
-                    <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown" />
-                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
-                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
-                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
-                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
+                    <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown"/>
+                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
+                    <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
+                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
+                    <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
                   </target>
                 </configuration>
               </execution>


=====================================
server/runner/pom.xml
=====================================
@@ -256,7 +256,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <target>
-                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
+                <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
               </target>
             </configuration>
           </execution>
@@ -270,7 +270,7 @@
               <target>
                 <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/">
                   <fileset dir="${config.targetDirectory}">
-                    <include name="${applicationName}.*" />
+                    <include name="${applicationName}.*"/>
                   </fileset>
                 </copy>
               </target>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6540fc10ef7d824ec5fb7c081...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6540fc10ef7d824ec5fb7c081...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Assistant sauvegarde qui ne zippe pas les bases - Closes #2709

Tony CHEMIT (＠tchemit)

tags

participants (1)