Skip to content

Commit b97dd35

Browse files
committed
new version 1.0.2
1 parent 15fffb3 commit b97dd35

11 files changed

+53
-19
lines changed

.github/workflows/fascan.yml

+21-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,27 @@ on: [push, pull_request]
44
jobs:
55
machineStandalone:
66
name: machineStandalone job
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-latest
8+
9+
permissions:
10+
# Give the default GITHUB_TOKEN write permission to commit and push the
11+
# added or changed files to the repository.
12+
contents: write
13+
814
steps:
9-
- uses: actions/checkout@master
10-
- uses: docker://ghcr.io/fluidattacks/makes/amd64
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
with:
18+
ref: ${{ github.head_ref }}
19+
20+
- name: Fluid-Attacks scan
21+
uses: docker://ghcr.io/fluidattacks/makes/amd64
1122
with:
1223
args: m gitlab:fluidattacks/universe@trunk /skims scan ./_fascan.yml
24+
25+
- name: Commit and push changes
26+
run: |
27+
git config user.name github-actions
28+
git config user.email github-actions@github.com
29+
git commit -am "Fluid-Attacks Results.csv commit" || exit 0
30+
git push

JaybirdOOo.update.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
xmlns="http://openoffice.org/extensions/update/2006"
2929
xmlns:xlink="http://www.w3.org/1999/xlink">
3030
<identifier value="io.github.prrvchr.JaybirdOOo"/>
31-
<version value="1.0.1"/>
31+
<version value="1.0.2"/>
3232
<update-download>
3333
<src xlink:href="https://github.com/prrvchr/JaybirdOOo/releases/latest/download/JaybirdOOo.oxt"/>
3434
</update-download>
@@ -40,7 +40,7 @@
4040
<name xlink:href="https://prrvchr.github.io/JaybirdOOo/README_fr" lang="fr">JaybirdOOo</name>
4141
</publisher>
4242
<release-notes>
43-
<src xlink:href="https://prrvchr.github.io/JaybirdOOo/#what-has-been-done-for-version-101" lang="en"/>
44-
<src xlink:href="https://prrvchr.github.io/JaybirdOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-101" lang="fr"/>
43+
<src xlink:href="https://prrvchr.github.io/JaybirdOOo/#what-has-been-done-for-version-102" lang="en"/>
44+
<src xlink:href="https://prrvchr.github.io/JaybirdOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-102" lang="fr"/>
4545
</release-notes>
4646
</description>

README.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
**The use of this software subjects you to our [Terms Of Use][4].**
3131

32-
# version [1.0.1][5]
32+
# version [1.0.2][5]
3333

3434
## Introduction:
3535

@@ -146,7 +146,13 @@ ___
146146
- Support for the new version 1.4.0 of jdbcDriverOOo.
147147
- The use of odb files created with a previous version of JaybirdOOo requires modifying the parameter: `Query for generated values` accessible through the menu: **Edit -> Database -> Advanced Settings... -> Generated Values** by the value: `SELECT * FROM %s WHERE %s`.
148148

149-
### What remains to be done for version 1.0.1:
149+
### What has been done for version 1.0.2:
150+
151+
- Updated the [Python packaging][35] package to version 24.1.
152+
- Updated the [Python setuptools][36] package to version 72.1.0.
153+
- The extension will ask you to install the jdbcDriverOOo extension in versions 1.4.2 minimum.
154+
155+
### What remains to be done for version 1.0.2:
150156

151157
- Add new language for internationalization...
152158

@@ -173,7 +179,7 @@ ___
173179
[20]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
174180
[21]: <img/JaybirdOOo.svg#middle>
175181
[22]: <https://github.com/prrvchr/JaybirdOOo/releases/latest/download/JaybirdOOo.oxt>
176-
[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.1#right>
182+
[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.2#right>
177183
[24]: <img/JaybirdOOo-1.png>
178184
[25]: <img/JaybirdOOo-2.png>
179185
[26]: <img/JaybirdOOo-3.png>
@@ -185,3 +191,5 @@ ___
185191
[32]: <https://github.com/mrotteveel>
186192
[33]: <https://github.com/FirebirdSQL/jaybird/issues/629>
187193
[34]: <https://gerrit.libreoffice.org/c/core/+/154989>
194+
[35]: <https://pypi.org/project/packaging/>
195+
[36]: <https://pypi.org/project/setuptools/>

README_fr.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
**L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4].**
3131

32-
# version [1.0.1][5]
32+
# version [1.0.2][5]
3333

3434
## Introduction:
3535

@@ -146,7 +146,13 @@ ___
146146
- Support de la nouvelle version 1.4.0 de jdbcDriverOOo.
147147
- L'utilisation de fichiers odb créés avec une version précédente de JaybirdOOo, nécessite de modifier le paramètre : `Requête des valeurs générées` accessible par le menu : **Edition -> Base de données -> Paramètres avancés... -> Valeurs générées** par la valeur : `SELECT * FROM %s WHERE %s`.
148148

149-
### Que reste-t-il à faire pour la version 1.0.1:
149+
### Ce qui a été fait pour la version 1.0.2:
150+
151+
- Mise à jour du paquet [Python packaging][35] vers la version 24.1.
152+
- Mise à jour du paquet [Python setuptools][36] vers la version 72.1.0.
153+
- L'extension vous demandera d'installer l'extensions jdbcDriverOOo en version 1.4.2 minimum.
154+
155+
### Que reste-t-il à faire pour la version 1.0.2:
150156

151157
- Ajouter de nouvelles langue pour l'internationalisation...
152158

@@ -173,7 +179,7 @@ ___
173179
[20]: <https://img.shields.io/github/v/tag/prrvchr/jdbcDriverOOo?label=latest#right>
174180
[21]: <img/JaybirdOOo.svg#middle>
175181
[22]: <https://github.com/prrvchr/JaybirdOOo/releases/latest/download/JaybirdOOo.oxt>
176-
[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.1#right>
182+
[23]: <https://img.shields.io/github/downloads/prrvchr/JaybirdOOo/latest/total?label=v1.0.2#right>
177183
[24]: <img/JaybirdOOo-1_fr.png>
178184
[25]: <img/JaybirdOOo-2_fr.png>
179185
[26]: <img/JaybirdOOo-3_fr.png>
@@ -185,3 +191,5 @@ ___
185191
[32]: <https://github.com/mrotteveel>
186192
[33]: <https://github.com/FirebirdSQL/jaybird/issues/629>
187193
[34]: <https://gerrit.libreoffice.org/c/core/+/154989>
194+
[35]: <https://pypi.org/project/packaging/>
195+
[36]: <https://pypi.org/project/setuptools/>

source/JaybirdOOo/description.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
╚════════════════════════════════════════════════════════════════════════════════════╝
2626
-->
2727
<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
28-
<version value="1.0.1"/>
28+
<version value="1.0.2"/>
2929
<identifier value="io.github.prrvchr.JaybirdOOo"/>
3030
<platform value="all"/>
3131
<dependencies>

source/JaybirdOOo/package.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Written by the OOEclipseIntegration
22
#Tue May 28 03:41:51 CEST 2024
3-
contents=Drivers.xcu, JaybirdOOo, JaybirdOOo/DialogStrings_en_US.default, JaybirdOOo/DialogStrings_en_US.properties, JaybirdOOo/DialogStrings_fr_FR.properties, JaybirdOOo/JaybirdOOo.png, JaybirdOOo/LogDialog.xdl, JaybirdOOo/LogWindow.xdl, JaybirdOOo/OptionsDialog.xdl, JaybirdOOo/OptionsDialog_en_US.default, JaybirdOOo/OptionsDialog_en_US.properties, JaybirdOOo/OptionsDialog_fr_FR.properties, JaybirdOOo/dialog.xlb, META-INF, META-INF/manifest.xml, Options.xcs, Options.xcu, OptionsDialog.xcu, description, description/desc_en.txt, description/desc_fr.txt, description.xml, driver, driver/jaybird-6.0.0-20240512.161600-27.jar, driver/jaybird-native-6.0.0-20240512.161600-21.jar, registration, registration/TermsOfUse_en.md, registration/TermsOfUse_fr.md, requirements.txt, resource, resource/Driver_en_US.default, resource/Driver_en_US.properties, resource/Driver_fr_FR.properties, resource/Logger_en_US.default, resource/Logger_en_US.properties, resource/Logger_fr_FR.properties, resource/OptionsDialog_en_US.default, resource/OptionsDialog_en_US.properties, resource/OptionsDialog_fr_FR.properties, service, service/pythonpath, service/pythonpath/_distutils_hack, service/pythonpath/jaybird, service/pythonpath/jaybird/jdbcdriver, service/pythonpath/jaybird/logger, service/pythonpath/jaybird/logger/dialog, service/pythonpath/jaybird/options, service/pythonpath/jaybird/sdbc, service/pythonpath/jaybird/sdbcx, service/pythonpath/jaybird/unotool, service/pythonpath/packaging, service/pythonpath/packaging-23.2.dist-info, service/pythonpath/pkg_resources, service/pythonpath/pkg_resources/_vendor, service/pythonpath/pkg_resources/_vendor/importlib_resources, service/pythonpath/pkg_resources/_vendor/jaraco, service/pythonpath/pkg_resources/_vendor/jaraco/text, service/pythonpath/pkg_resources/_vendor/more_itertools, service/pythonpath/pkg_resources/_vendor/packaging, service/pythonpath/pkg_resources/_vendor/platformdirs, service/pythonpath/pkg_resources/extern, service/pythonpath/setuptools, service/pythonpath/setuptools/_distutils, service/pythonpath/setuptools/_distutils/command, service/pythonpath/setuptools/_vendor, service/pythonpath/setuptools/_vendor/importlib_metadata, service/pythonpath/setuptools/_vendor/importlib_resources, service/pythonpath/setuptools/_vendor/jaraco, service/pythonpath/setuptools/_vendor/jaraco/text, service/pythonpath/setuptools/_vendor/more_itertools, service/pythonpath/setuptools/_vendor/packaging, service/pythonpath/setuptools/_vendor/tomli, service/pythonpath/setuptools/command, service/pythonpath/setuptools/config, service/pythonpath/setuptools/config/_validate_pyproject, service/pythonpath/setuptools/extern, service/pythonpath/setuptools-69.0.3.dist-info, service/pythonpath/six-1.16.0.dist-info
3+
contents=Drivers.xcu, JaybirdOOo, JaybirdOOo/DialogStrings_en_US.default, JaybirdOOo/DialogStrings_en_US.properties, JaybirdOOo/DialogStrings_fr_FR.properties, JaybirdOOo/JaybirdOOo.png, JaybirdOOo/LogDialog.xdl, JaybirdOOo/LogWindow.xdl, JaybirdOOo/OptionsDialog.xdl, JaybirdOOo/OptionsDialog_en_US.default, JaybirdOOo/OptionsDialog_en_US.properties, JaybirdOOo/OptionsDialog_fr_FR.properties, JaybirdOOo/dialog.xlb, META-INF, META-INF/manifest.xml, Options.xcs, Options.xcu, OptionsDialog.xcu, description, description/desc_en.txt, description/desc_fr.txt, description.xml, driver, driver/jaybird-6.0.0-20240512.161600-27.jar, driver/jaybird-native-6.0.0-20240512.161600-21.jar, registration, registration/TermsOfUse_en.md, registration/TermsOfUse_fr.md, requirements.txt, resource, resource/Driver_en_US.default, resource/Driver_en_US.properties, resource/Driver_fr_FR.properties, resource/Logger_en_US.default, resource/Logger_en_US.properties, resource/Logger_fr_FR.properties, resource/OptionsDialog_en_US.default, resource/OptionsDialog_en_US.properties, resource/OptionsDialog_fr_FR.properties, service, service/*

source/JaybirdOOo/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
packaging==23.2
2-
setuptools==69.0.3
3-
six==1.16.0
1+
packaging>=24.1
2+
setuptools>=72.1.0
3+
six>=1.16.0

source/JaybirdOOo/service/pythonpath/packaging-23.2.dist-info

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../uno/lib/python/packaging-24.1.dist-info

source/JaybirdOOo/service/pythonpath/setuptools-69.0.3.dist-info

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../uno/lib/python/setuptools-72.1.0.dist-info

0 commit comments

Comments
 (0)