Squash merge 5.5.0-development into main

This commit is contained in:
2026-06-15 16:48:30 +01:00
parent aa6c87ab90
commit d095908e42
9 changed files with 405 additions and 303 deletions
+6 -11
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.unicenta</groupId>
<artifactId>unicentaopos</artifactId>
<version>5.4.0</version>
@@ -116,7 +115,6 @@
<artifactId>poi</artifactId>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
@@ -181,7 +179,6 @@
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.swinglabs.swingx</groupId>
@@ -255,11 +252,11 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.derby</groupId>-->
<!-- <artifactId>derbyshared</artifactId>-->
<!-- <version>${derby.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.derby</groupId>-->
<!-- <artifactId>derbyshared</artifactId>-->
<!-- <version>${derby.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -293,7 +290,6 @@
<artifactId>DynamicJasper-core-fonts</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
@@ -361,7 +357,7 @@
<dependency>
<groupId>com.unicenta</groupId>
<artifactId>unicenta-plugins</artifactId>
<version>1.3.1</version>
<version>1.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gluonhq</groupId>
@@ -450,7 +446,6 @@
<version>4.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>