From 88ebefb283ce4199694cb79c144c5fece754c751 Mon Sep 17 00:00:00 2001 From: _Bastler <git@bstly.de> Date: Wed, 27 Nov 2024 21:16:51 +0100 Subject: [PATCH] upgrade spring, remove pretix extend --- application/pom.xml | 5 ++++- core/pom.xml | 14 +++++++------- .../businesslogic/MembershipManager.java | 17 +++++++++++------ pom.xml | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 93aa76e..e227efa 100755 --- a/application/pom.xml +++ b/application/pom.xml @@ -109,6 +109,9 @@ <scope>runtime</scope> </dependency> </dependencies> + <activation> + <activeByDefault>true</activeByDefault> + </activation> </profile> <profile> <id>db-mysql</id> @@ -164,4 +167,4 @@ </plugin> </plugins> </build> -</project> +</project> \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 84560db..aea09aa 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -56,13 +56,13 @@ <dependency> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> - <version>1.7</version> + <version>1.9.0</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>31.1-jre</version> + <version>33.3.1-jre</version> </dependency> <dependency> @@ -73,7 +73,7 @@ <dependency> <groupId>org.passay</groupId> <artifactId>passay</artifactId> - <version>1.6.4</version> + <version>1.6.5</version> </dependency> <dependency> @@ -84,8 +84,8 @@ <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - <version>1.70</version> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.78.1</version> </dependency> <dependency> @@ -96,13 +96,13 @@ <dependency> <groupId>javax.measure</groupId> <artifactId>unit-api</artifactId> - <version>2.1.3</version> + <version>2.2</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>1.9.0</version> + <version>1.12.0</version> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/membership/src/main/java/de/bstly/we/membership/businesslogic/MembershipManager.java b/membership/src/main/java/de/bstly/we/membership/businesslogic/MembershipManager.java index c31ad60..07a8397 100644 --- a/membership/src/main/java/de/bstly/we/membership/businesslogic/MembershipManager.java +++ b/membership/src/main/java/de/bstly/we/membership/businesslogic/MembershipManager.java @@ -460,12 +460,17 @@ public class MembershipManager { logger.debug("Create membership fee order: " + membershipFeeOrder.toString()); - JsonObject expire = new JsonObject(); - expire.addProperty("expires", pretixDateFormat.format(Date.from(expires))); - membershipFeeOrder = pretixManager.extendOrder(membershipFeeOrder.get("code").getAsString(), expire); - - logger.debug("Extend membership fee order: " + membershipFeeOrder.get("code").getAsString() + " to " - + pretixDateFormat.format(Date.from(expires))); + /* + * JsonObject expire = new JsonObject(); + * expire.addProperty("expires", pretixDateFormat.format(Date.from(expires))); + * membershipFeeOrder = + * pretixManager.extendOrder(membershipFeeOrder.get("code").getAsString(), + * expire); + * + * logger.debug("Extend membership fee order: " + + * membershipFeeOrder.get("code").getAsString() + " to " + * + pretixDateFormat.format(Date.from(expires))); + */ /* * if (orderSendmail) { diff --git a/pom.xml b/pom.xml index cc54b8d..de9bf75 100755 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.2.4</version> + <version>3.4.0</version> <relativePath /> </parent>