new version 1.0.5

prrvchr · prrvchr · commit 3900f616f807 · 2024-10-28T00:07:20.000+01:00
diff --git a/.github/workflows/fascan.yml b/.github/workflows/fascan.yml
@@ -1,30 +1,31 @@
 # .github/workflows/fascan.yml
 name: Fluid Attacks Scan
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 jobs:
   machineStandalone:
     name: machineStandalone job
     runs-on: ubuntu-latest
 
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the
-      # added or changed files to the repository.
-      contents: write
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
 
       - name: Fluid-Attacks scan
-        uses: docker://ghcr.io/fluidattacks/makes/amd64
+        id: scan
+        continue-on-error: true
+        uses: docker://docker.io/fluidattacks/cli:latest
         with:
-          args: m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml
+          args: skims scan ./_fascan.yml
 
       - name: Commit and push changes
         run: |
           git config user.name github-actions
           git config user.email github-actions@github.com
-          git commit -am "Fluid-Attacks Results.csv commit" || exit 0
-          git push
+          git commit -am "Fluid-Attacks-Results.csv commit" || exit 0
+          git push origin HEAD:main
+
+      - name: Check for failures
+        if: steps.scan.outcome != 'success'
+        run: exit 1
diff --git a/Fluid-Attacks-Results.csv b/Fluid-Attacks-Results.csv
@@ -1,2 +1,2 @@
-title,cwe,description,cvss,cvss_v4,finding,stream,kind,where,snippet,method
+title,cwe,description,cvss,finding,stream,kind,where,snippet,method
 Summary: No vulnerabilities were found in your targets.
diff --git a/Fluid-Attacks-Scan.sh b/Fluid-Attacks-Scan.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-docker run -v ~/github/JaybirdOOo:/working-dir ghcr.io/fluidattacks/makes/amd64 m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml
-docker system prune -f
+docker run -v ~/github/JaybirdOOo:/src -v ./_fascan.yml:/fascan.yml fluidattacks/cli:latest skims scan /fascan.yml
+#docker system prune -f
diff --git a/JaybirdOOo.update.xml b/JaybirdOOo.update.xml
@@ -28,7 +28,7 @@
   xmlns="http://openoffice.org/extensions/update/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="io.github.prrvchr.JaybirdOOo"/>
-    <version value="1.0.4"/>
+    <version value="1.0.5"/>
     <update-download>
         <src xlink:href="https://github.com/prrvchr/JaybirdOOo/releases/latest/download/JaybirdOOo.oxt"/>
     </update-download>
@@ -40,7 +40,7 @@
         <name xlink:href="https://prrvchr.github.io/JaybirdOOo/README_fr" lang="fr">JaybirdOOo</name>
     </publisher>
     <release-notes>
-        <src xlink:href="https://prrvchr.github.io/JaybirdOOo/#what-has-been-done-for-version-104" lang="en"/>
-        <src xlink:href="https://prrvchr.github.io/JaybirdOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-104" lang="fr"/>
+        <src xlink:href="https://prrvchr.github.io/JaybirdOOo/#what-has-been-done-for-version-105" lang="en"/>
+        <src xlink:href="https://prrvchr.github.io/JaybirdOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-105" lang="fr"/>
     </release-notes>
 </description>
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@
 
 **The use of this software subjects you to our [Terms Of Use][4].**
 
-# version [1.0.4][5]
+# version [1.0.5][5]
 
 ## Introduction:
 
@@ -170,7 +170,12 @@ ___
 - In the extension options it is possible to define the options: **View system tables**, **Use bookmarks** and **Force SQL mode** which will be specific to this driver.
 - In order not to conflict with LibreOffice's embedded Firebird driver, the driver has been renamed to **Embedded Jaybird Driver**.
 
-### What remains to be done for version 1.0.4:
+### What has been done for version 1.0.5:
+
+- The extension will ask you to install jdbcDriverOOo extension in versions 1.4.6 minimum.
+- Modification of the extension options accessible via: **Tools -> Options... -> LibreOffice Base -> Embedded Jaybird Driver** in order to comply with the new graphic charter.
+
+### What remains to be done for version 1.0.5:
 
 - Add new language for internationalization...
 
@@ -180,7 +185,7 @@ ___
 [2]: <https://prrvchr.github.io/JaybirdOOo/>
 [3]: <https://prrvchr.github.io/JaybirdOOo/README_fr>
 [4]: <https://prrvchr.github.io/JaybirdOOo/source/JaybirdOOo/registration/TermsOfUse_en>
-[5]: <https://prrvchr.github.io/JaybirdOOo#historical>
+[5]: <https://prrvchr.github.io/JaybirdOOo#what-has-been-done-for-version-105>
 [6]: <https://prrvchr.github.io/>
 [7]: <https://www.libreoffice.org/download/download/>
 [8]: <https://www.openoffice.org/download/index.html>
@@ -197,7 +202,7 @@ ___
 [20]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [21]: <img/JaybirdOOo.svg#middle>
 [22]: <https://github.com/prrvchr/JaybirdOOo/releases/latest/download/JaybirdOOo.oxt>
-[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.4#right>
+[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.5#right>
 [24]: <img/JaybirdOOo-1.png>
 [25]: <img/JaybirdOOo-2.png>
 [26]: <img/JaybirdOOo-3.png>
diff --git a/README_fr.md b/README_fr.md
@@ -29,7 +29,7 @@
 
 **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4].**
 
-# version [1.0.4][5]
+# version [1.0.5][5]
 
 ## Introduction:
 
@@ -170,7 +170,12 @@ ___
 - Dans les options de l'extension il est possible de définir les options: **Afficher les tables système**, **Utiliser les signets** et **Forcer le mode SQL** qui seront spécifiques à ce pilote.
 - Afin de ne pas entrer en conflit avec le pilote Firebird intégré à LibreOffice, le pilote a été renommé en **Pilote Jaybird intégré**.
 
-### Que reste-t-il à faire pour la version 1.0.4:
+### Ce qui a été fait pour la version 1.0.5:
+
+- L'extension vous demandera d'installer l'extensions jdbcDriverOOo en version 1.4.6 minimum.
+- Modification des options de l'extension accessibles via : **Outils -> Options... -> LibreOffice Base -> Pilote Jaybird intégré** afin de respecter la nouvelle charte graphique.
+
+### Que reste-t-il à faire pour la version 1.0.5:
 
 - Ajouter de nouvelles langue pour l'internationalisation...
 
@@ -180,7 +185,7 @@ ___
 [2]: <https://prrvchr.github.io/JaybirdOOo/>
 [3]: <https://prrvchr.github.io/JaybirdOOo/>
 [4]: <https://prrvchr.github.io/JaybirdOOo/source/JaybirdOOo/registration/TermsOfUse_fr>
-[5]: <https://prrvchr.github.io/JaybirdOOo/README_fr#historique>
+[5]: <https://prrvchr.github.io/JaybirdOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-105>
 [6]: <https://prrvchr.github.io/README_fr>
 [7]: <https://fr.libreoffice.org/download/telecharger-libreoffice/>
 [8]: <https://www.openoffice.org/fr/Telecharger/>
@@ -197,7 +202,7 @@ ___
 [20]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
 [21]: <img/JaybirdOOo.svg#middle>
 [22]: <https://github.com/prrvchr/JaybirdOOo/releases/latest/download/JaybirdOOo.oxt>
-[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.4#right>
+[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.5#right>
 [24]: <img/JaybirdOOo-1_fr.png>
 [25]: <img/JaybirdOOo-2_fr.png>
 [26]: <img/JaybirdOOo-3_fr.png>
diff --git a/source/JaybirdOOo/Options.xcs b/source/JaybirdOOo/Options.xcs
@@ -33,7 +33,7 @@
   oor:name="JaybirdOOo">
     <component>
         <prop oor:name="DriverService" oor:type="xs:string"/>
-        <prop oor:name="ConnectionService" oor:type="xs:string"/>
+        <prop oor:name="ApiLevel" oor:type="xs:string"/>
         <prop oor:name="ShowSystemTable" oor:type="xs:boolean"/>
         <prop oor:name="UseBookmark" oor:type="xs:boolean"/>
         <prop oor:name="SQLMode" oor:type="xs:boolean"/>
diff --git a/source/JaybirdOOo/Options.xcu b/source/JaybirdOOo/Options.xcu
@@ -34,8 +34,8 @@
     <prop oor:name="DriverService" oor:op="fuse">
         <value>io.github.prrvchr.jdbcdriver.sdbcx.Driver</value>
     </prop>
-    <prop oor:name="ConnectionService" oor:op="fuse">
-        <value>com.sun.star.sdb.Connection</value>
+    <prop oor:name="ApiLevel" oor:op="fuse">
+        <value>com.sun.star.sdb</value>
     </prop>
     <prop oor:name="ShowSystemTable" oor:op="fuse">
         <value>false</value>
diff --git a/source/JaybirdOOo/description.xml b/source/JaybirdOOo/description.xml
@@ -25,7 +25,7 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 -->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.0.4"/>
+    <version value="1.0.5"/>
     <identifier value="io.github.prrvchr.JaybirdOOo"/>
     <platform value="all"/>
     <dependencies>
diff --git a/source/JaybirdOOo/dialogs b/source/JaybirdOOo/dialogs
diff --git a/source/JaybirdOOo/dialogs/LogDialog.xdl b/source/JaybirdOOo/dialogs/LogDialog.xdl
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogDialog.xdl
diff --git a/source/JaybirdOOo/dialogs/LogDialog_en_US.default b/source/JaybirdOOo/dialogs/LogDialog_en_US.default
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogDialog_en_US.default
diff --git a/source/JaybirdOOo/dialogs/LogDialog_en_US.properties b/source/JaybirdOOo/dialogs/LogDialog_en_US.properties
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogDialog_en_US.properties
diff --git a/source/JaybirdOOo/dialogs/LogDialog_fr_FR.properties b/source/JaybirdOOo/dialogs/LogDialog_fr_FR.properties
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogDialog_fr_FR.properties
diff --git a/source/JaybirdOOo/dialogs/LogWindow.xdl b/source/JaybirdOOo/dialogs/LogWindow.xdl
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogWindow.xdl
diff --git a/source/JaybirdOOo/dialogs/LogWindow_en_US.default b/source/JaybirdOOo/dialogs/LogWindow_en_US.default
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogWindow_en_US.default
diff --git a/source/JaybirdOOo/dialogs/LogWindow_en_US.properties b/source/JaybirdOOo/dialogs/LogWindow_en_US.properties
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogWindow_en_US.properties
diff --git a/source/JaybirdOOo/dialogs/LogWindow_fr_FR.properties b/source/JaybirdOOo/dialogs/LogWindow_fr_FR.properties
@@ -0,0 +1 @@
+../../../uno/dialog/logger/LogWindow_fr_FR.properties
diff --git a/source/JaybirdOOo/dialogs/OptionDialog.xdl b/source/JaybirdOOo/dialogs/OptionDialog.xdl
@@ -0,0 +1 @@
+../../../uno/dialog/jdbc/OptionDialog.xdl
diff --git a/source/JaybirdOOo/dialogs/OptionDialog_en_US.default b/source/JaybirdOOo/dialogs/OptionDialog_en_US.default
@@ -0,0 +1 @@
+../../../uno/dialog/jdbc/OptionDialog_en_US.default
diff --git a/source/JaybirdOOo/dialogs/OptionDialog_en_US.properties b/source/JaybirdOOo/dialogs/OptionDialog_en_US.properties
@@ -0,0 +1 @@
+../../../uno/dialog/jdbc/OptionDialog_en_US.properties
diff --git a/source/JaybirdOOo/dialogs/OptionDialog_fr_FR.properties b/source/JaybirdOOo/dialogs/OptionDialog_fr_FR.properties
@@ -0,0 +1 @@
+../../../uno/dialog/jdbc/OptionDialog_fr_FR.properties
diff --git a/source/JaybirdOOo/dialogs/OptionsDialog.xdl b/source/JaybirdOOo/dialogs/OptionsDialog.xdl
@@ -0,0 +1 @@
+../../../uno/dialog/embedded/OptionsDialog.xdl
diff --git a/source/JaybirdOOo/dialogs/OptionsDialog_en_US.default b/source/JaybirdOOo/dialogs/OptionsDialog_en_US.default
@@ -0,0 +1 @@
+../../../uno/dialog/embedded/OptionsDialog_en_US.default
diff --git a/source/JaybirdOOo/dialogs/OptionsDialog_en_US.properties b/source/JaybirdOOo/dialogs/OptionsDialog_en_US.properties
@@ -0,0 +1 @@
+../../../uno/dialog/embedded/OptionsDialog_en_US.properties
diff --git a/source/JaybirdOOo/dialogs/OptionsDialog_fr_FR.properties b/source/JaybirdOOo/dialogs/OptionsDialog_fr_FR.properties
@@ -0,0 +1 @@
+../../../uno/dialog/embedded/OptionsDialog_fr_FR.properties
diff --git a/source/JaybirdOOo/service/pythonpath/jaybird/option b/source/JaybirdOOo/service/pythonpath/jaybird/option
@@ -0,0 +1 @@
+../../../../../uno/lib/uno/options/jdbc
diff --git a/source/JaybirdOOo/service/pythonpath/jaybird/options b/source/JaybirdOOo/service/pythonpath/jaybird/options
@@ -1 +1 @@
-../../../../../uno/lib/uno/embedded/options
+../../../../../uno/lib/uno/options/embedded

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-title,cwe,description,cvss,cvss_v4,finding,stream,kind,where,snippet,method`
	`1`	`+title,cwe,description,cvss,finding,stream,kind,where,snippet,method`
`2`	`2`	`Summary: No vulnerabilities were found in your targets.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/logger/LogDialog.xdl`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/logger/LogDialog_en_US.default`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/logger/LogDialog_fr_FR.properties`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/logger/LogWindow.xdl`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/logger/LogWindow_en_US.default`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/logger/LogWindow_fr_FR.properties`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/jdbc/OptionDialog.xdl`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/jdbc/OptionDialog_en_US.default`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../uno/dialog/embedded/OptionsDialog.xdl`