diff --git a/pom.xml b/pom.xml index 65ad9c61eaf0715454ba800beb085236af0fef13..d827a44ae050ec8edeff5c797c11cc01470c34e9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ ink.rayin rayin-parent pom - 1.1.2 + 1.1.2-B3 rayin-parent pdf template generate tools http://rayin.ink @@ -174,29 +174,29 @@ ink.rayin rayin-tools - 1.1.2 + 1.1.2-B3 ink.rayin rayin-htmladapter-openhtmltopdf - 1.1.2 + 1.1.2-B3 ink.rayin rayin-htmladapter-spring-boot-starter - 1.1.2 + 1.1.2-B3 ink.rayin rayin-htmladapter-base - 1.1.2 + 1.1.2-B3 ink.rayin rayin-datarule - 1.1.2 + 1.1.2-B3 org.apache.commons @@ -352,4 +352,4 @@ - \ No newline at end of file + diff --git a/rayin-datarule/pom.xml b/rayin-datarule/pom.xml index 83e33a21074f532a82157ac9fee64b10aed87f39..c1ad5ac581e00ccb6d607523d0400b1a8969b190 100644 --- a/rayin-datarule/pom.xml +++ b/rayin-datarule/pom.xml @@ -5,12 +5,12 @@ rayin-parent ink.rayin - 1.1.2 + 1.1.2-B3 4.0.0 rayin-datarule - 1.1.2 + 1.1.2-B3 8 8 @@ -108,4 +108,4 @@ - \ No newline at end of file + diff --git a/rayin-htmladapter-base/pom.xml b/rayin-htmladapter-base/pom.xml index 4fa9a3d5a313d9b9f68b5462b5cb03672028024a..e6930e4f87464a818e20239720b7c5998c3e6836 100644 --- a/rayin-htmladapter-base/pom.xml +++ b/rayin-htmladapter-base/pom.xml @@ -5,12 +5,12 @@ rayin-parent ink.rayin - 1.1.2 + 1.1.2-B3 4.0.0 rayin-htmladapter-base - 1.1.2 + 1.1.2-B3 ink.rayin @@ -217,4 +217,4 @@ - \ No newline at end of file + diff --git a/rayin-htmladapter-openhtmltopdf/pom.xml b/rayin-htmladapter-openhtmltopdf/pom.xml index d1e8a9c207acc8176e5ac7075127f5d3cffce194..e153607bcc0d9ea1829438dbb64b9348ad808e68 100644 --- a/rayin-htmladapter-openhtmltopdf/pom.xml +++ b/rayin-htmladapter-openhtmltopdf/pom.xml @@ -5,12 +5,12 @@ rayin-parent ink.rayin - 1.1.2 + 1.1.2-B3 4.0.0 rayin-htmladapter-openhtmltopdf - 1.1.2 + 1.1.2-B3 jar @@ -274,4 +274,4 @@ - \ No newline at end of file + diff --git a/rayin-htmladapter-spring-boot-starter/pom.xml b/rayin-htmladapter-spring-boot-starter/pom.xml index 1187f936989a7b79cba16fbd41e6142dbac8c205..ca5e407912ff55bccac2e95f718dab3dd542a3e2 100644 --- a/rayin-htmladapter-spring-boot-starter/pom.xml +++ b/rayin-htmladapter-spring-boot-starter/pom.xml @@ -5,12 +5,12 @@ rayin-parent ink.rayin - 1.1.2 + 1.1.2-B3 4.0.0 rayin-htmladapter-spring-boot-starter - 1.1.2 + 1.1.2-B3 jar @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/rayin-springboot-sample/pom.xml b/rayin-springboot-sample/pom.xml index e3c85ff0ae2edae6e2e02e6a4329ff9054156eaf..71854e27c93e40a1457705905b03e858dfa44b4b 100644 --- a/rayin-springboot-sample/pom.xml +++ b/rayin-springboot-sample/pom.xml @@ -7,17 +7,17 @@ org.springframework.boot spring-boot-starter-parent - 2.7.4 + 3.1.3 ink.rayin - 1.1.0 + 1.1.2-B3 rayin-springboot-sample - 8 - 8 + 17 + 17 @@ -35,7 +35,7 @@ ink.rayin rayin-htmladapter-spring-boot-starter - 1.1.2 + 1.1.2-B3 @@ -106,4 +106,4 @@ - \ No newline at end of file + diff --git a/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java b/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java index f22f4610a78b2abf81e58a9cbd464d49ab27066d..87c72803f25e168ac39dfbd658cc2578f9b101cb 100644 --- a/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java +++ b/rayin-springboot-sample/src/main/java/ink/rayin/springboot/controller/PDFCreatorController.java @@ -6,13 +6,13 @@ import ink.rayin.htmladapter.base.PdfGenerator; import ink.rayin.htmladapter.base.Signature; import ink.rayin.tools.utils.Charsets; import ink.rayin.tools.utils.ResourceUtil; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.OutputStream; @@ -92,4 +92,4 @@ public class PDFCreatorController { } -} \ No newline at end of file +} diff --git a/rayin-test/pom.xml b/rayin-test/pom.xml index fc83249d046c7351f9e80786574b44ad284804bf..0ca4f173f79e20b8576d79d74f8b1f9715f02a0e 100644 --- a/rayin-test/pom.xml +++ b/rayin-test/pom.xml @@ -5,20 +5,20 @@ rayin-parent ink.rayin - 1.1.2 + 1.1.2-B3 4.0.0 ink.rayin - 1.1.2 + 1.1.2-B3 rayin-test 1.0.0 - 1.8 - 1.8 + 17 + 17 UTF-8 UTF-8 - 1.8 + 17 @@ -146,4 +146,4 @@ - \ No newline at end of file + diff --git a/rayin-tools/pom.xml b/rayin-tools/pom.xml index 05c669e6634549efcae5036dfd6ee78da7e8348d..66bc314256da34278c23bdffcc126bfb2827023c 100644 --- a/rayin-tools/pom.xml +++ b/rayin-tools/pom.xml @@ -5,53 +5,40 @@ rayin-parent ink.rayin - 1.1.2 + 1.1.2-B3 4.0.0 ink.rayin rayin-tools - 1.1.2 + 1.1.2-B3 rayin-tools UTF-8 - 1.8 - 1.8 + 17 + 17 1.8.0 - - - - - - - - - - - - - - + com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.14.0-rc2 + 2.15.2 org.springframework spring-context - 5.3.23 + 6.0.11 com.google.guava guava - 31.1-jre + 32.1.2-jre compile @@ -64,7 +51,7 @@ com.squareup.okhttp3 okhttp - 4.10.0 + 5.0.0-alpha.11 compile @@ -85,42 +72,27 @@ org.yaml snakeyaml - 1.33 + 2.2 compile com.alibaba easyexcel - 3.1.1 + 3.3.2 com.google.code.gson gson - 2.9.0 + 2.10.1 - javax.xml.bind - jaxb-api - 2.4.0-b180830.0359 + jakarta.xml.bind + jakarta.xml.bind-api - - - - - - - - - - - - - - - +