upgrade spring, remove pretix extend

This commit is contained in:
_Bastler 2024-11-27 21:16:51 +01:00
parent 77270cf917
commit 88ebefb283
4 changed files with 23 additions and 15 deletions

View File

@ -109,6 +109,9 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile> </profile>
<profile> <profile>
<id>db-mysql</id> <id>db-mysql</id>
@ -164,4 +167,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -56,13 +56,13 @@
<dependency> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>1.7</version> <version>1.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>31.1-jre</version> <version>33.3.1-jre</version>
</dependency> </dependency>
<dependency> <dependency>
@ -73,7 +73,7 @@
<dependency> <dependency>
<groupId>org.passay</groupId> <groupId>org.passay</groupId>
<artifactId>passay</artifactId> <artifactId>passay</artifactId>
<version>1.6.4</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
@ -84,8 +84,8 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk18on</artifactId>
<version>1.70</version> <version>1.78.1</version>
</dependency> </dependency>
<dependency> <dependency>
@ -96,13 +96,13 @@
<dependency> <dependency>
<groupId>javax.measure</groupId> <groupId>javax.measure</groupId>
<artifactId>unit-api</artifactId> <artifactId>unit-api</artifactId>
<version>2.1.3</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId> <artifactId>commons-csv</artifactId>
<version>1.9.0</version> <version>1.12.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -460,12 +460,17 @@ public class MembershipManager {
logger.debug("Create membership fee order: " + membershipFeeOrder.toString()); logger.debug("Create membership fee order: " + membershipFeeOrder.toString());
JsonObject expire = new JsonObject(); /*
expire.addProperty("expires", pretixDateFormat.format(Date.from(expires))); * JsonObject expire = new JsonObject();
membershipFeeOrder = pretixManager.extendOrder(membershipFeeOrder.get("code").getAsString(), expire); * expire.addProperty("expires", pretixDateFormat.format(Date.from(expires)));
* membershipFeeOrder =
logger.debug("Extend membership fee order: " + membershipFeeOrder.get("code").getAsString() + " to " * pretixManager.extendOrder(membershipFeeOrder.get("code").getAsString(),
+ pretixDateFormat.format(Date.from(expires))); * expire);
*
* logger.debug("Extend membership fee order: " +
* membershipFeeOrder.get("code").getAsString() + " to "
* + pretixDateFormat.format(Date.from(expires)));
*/
/* /*
* if (orderSendmail) { * if (orderSendmail) {

View File

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.4</version> <version>3.4.0</version>
<relativePath /> <relativePath />
</parent> </parent>