Merge pull request #2807 from jlawyerorg/fixes/3.1

issue #2789
jlawyerorg · Jan 23, 2025 · 23243fa · 23243fa
2 parents 4aa4457 + bafe030
commit 23243fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/j-lawyer-client/lib/flatlaf-3.5.jar → ...r-client/lib/flatlaf-3.5.4-no-natives.jar b/j-lawyer-client/lib/flatlaf-3.5.jar → ...r-client/lib/flatlaf-3.5.4-no-natives.jar
diff --git a/j-lawyer-client/lib/flatlaf-extras-3.5.2.jar → j-lawyer-client/lib/flatlaf-extras-3.5.4.jar b/j-lawyer-client/lib/flatlaf-extras-3.5.2.jar → j-lawyer-client/lib/flatlaf-extras-3.5.4.jar
diff --git a/j-lawyer-client/nbproject/project.properties b/j-lawyer-client/nbproject/project.properties
@@ -40,8 +40,8 @@ file.reference.ecdsa-v0.2-1.0.6-Streaming.jar=lib/bea/ecdsa-v0.2-1.0.6-Streaming
 file.reference.ehcache-3.10.8.jar=lib/ehcache-3.10.8.jar
 file.reference.error_prone_annotations-2.18.0.jar=lib/bea/error_prone_annotations-2.18.0.jar
 file.reference.failureaccess-1.0.1.jar=lib/bea/failureaccess-1.0.1.jar
-file.reference.flatlaf-3.5.jar=lib/flatlaf-3.5.jar
-file.reference.flatlaf-extras-3.5.2.jar=lib/flatlaf-extras-3.5.2.jar
+file.reference.flatlaf-3.5.4-no-natives.jar=lib/flatlaf-3.5.4-no-natives.jar
+file.reference.flatlaf-extras-3.5.4.jar=lib/flatlaf-extras-3.5.4.jar
 file.reference.flatlaf-fonts-inter-3.19.jar=lib/flatlaf-fonts-inter-3.19.jar
 file.reference.flatlaf-fonts-roboto-2.137.jar=lib/flatlaf-fonts-roboto-2.137.jar
 file.reference.font-asian-9.0.0.jar=lib/itext/font-asian-9.0.0.jar
@@ -359,7 +359,6 @@ javac.classpath=\
     ${file.reference.poi-scratchpad-5.2.3.jar}:\
     ${file.reference.ehcache-3.10.8.jar}:\
     ${file.reference.jakarta.persistence-api-2.2.3.jar}:\
-    ${file.reference.flatlaf-3.5.jar}:\
     ${file.reference.ASN1_signature-3.26.0.1.jar}:\
     ${file.reference.BeaPayload-3.26.0.1.jar}:\
     ${file.reference.BeaToolkit-3.26.0.1.jar}:\
@@ -477,7 +476,6 @@ javac.classpath=\
     ${file.reference.j-lawyer-invoicing.jar}:\
     ${file.reference.commonmark-0.23.0.jar}:\
     ${file.reference.commonmark-ext-gfm-tables-0.23.0.jar}:\
-    ${file.reference.flatlaf-extras-3.5.2.jar}:\
     ${file.reference.cleanup-5.0.0.jar}:\
     ${file.reference.commons-imaging-1.0-alpha2.jar}:\
     ${file.reference.kernel-9.0.0.jar}:\
@@ -496,7 +494,9 @@ javac.classpath=\
     ${file.reference.pdfua-9.0.0.jar}:\
     ${file.reference.sign-9.0.0.jar}:\
     ${file.reference.styled-xml-parser-9.0.0.jar}:\
-    ${file.reference.svg-9.0.0.jar}
+    ${file.reference.svg-9.0.0.jar}:\
+    ${file.reference.flatlaf-3.5.4-no-natives.jar}:\
+    ${file.reference.flatlaf-extras-3.5.4.jar}
 file.reference.j-lawyer-server-entities.jar=../j-lawyer-server-entities/dist/j-lawyer-server-entities.jar
 file.reference.novaworx-syntax-0.0.7.jar=lib/novaworx-syntax-0.0.7.jar
 file.reference.ical4j-0.9.18.jar=lib/bizcal/ical4j-0.9.18.jar

diff --git a/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar b/j-lawyer-proprietary/libs/j-lawyer-bea-wrapper.jar