Merge pull request #65 from premium-minds/64-upgrade-wicket-9

Upgrade to Wicket 9, Java 11 and Junit 5
premium-minds · Jun 7, 2023 · e263a68 · e263a68
2 parents e5d382b + d68ce7b
commit e263a68
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 14 deletions.
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
@@ -14,9 +14,9 @@
 	<url>http://www.premium-minds.com</url>
 
 	<properties>
-		<wicket.version>8.13.0</wicket.version>
+		<wicket.version>9.14.0</wicket.version>
 		<guice.version>5.1.0</guice.version>
-		<hibernate.version>5.6.5.Final</hibernate.version>
+		<hibernate.version>5.6.15.Final</hibernate.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -36,12 +36,12 @@
 		<dependency>
 			<groupId>com.premiumminds</groupId>
 			<artifactId>pm-wicket-utils</artifactId>
-			<version>4.4</version>
+			<version>5.0</version>
 		</dependency>
 		<dependency>
 		   <groupId>com.premiumminds</groupId>
 		   <artifactId>wicket-crudifier</artifactId>
-		   <version>4.2</version>
+		   <version>5.0</version>
 		</dependency>
 
 		<!-- WICKET DEPENDENCIES -->
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.10</version>
+			<version>1.3.7</version>
 		</dependency>
 		<dependency>
 			<groupId>me.moocar</groupId>
@@ -85,7 +85,7 @@
 		<dependency>
 		    <groupId>org.slf4j</groupId>
 		    <artifactId>jul-to-slf4j</artifactId>
-		    <version>1.7.35</version>
+		    <version>2.0.7</version>
 		</dependency>
 
 		<!-- PERSISTENCE -->
@@ -140,16 +140,21 @@
 
 		<!-- TESTS -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.9.3</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>5.9.3</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
-			<version>4.2</version>
+			<version>5.1.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -160,6 +165,29 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>2.0.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>6.2.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>jakarta.el</artifactId>
+			<version>3.0.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.4</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>
@@ -169,10 +197,11 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.11.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>11</source>
+					<target>11</target>
+					<release>11</release>
 				</configuration>
 			</plugin>
 

diff --git a/src/main/resources/archetype-resources/src/main/java/configuration/Application.java b/src/main/resources/archetype-resources/src/main/java/configuration/Application.java
@@ -8,6 +8,7 @@
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 
+import org.apache.wicket.resource.JQueryResourceReference;
 import org.flywaydb.core.Flyway;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +45,9 @@ protected void init() {
 
 			getRequestCycleListeners().add(new TransactionalRequestCycleListener(persistenceTransaction));
 
+			getCspSettings().blocking().disabled();
+			getJavaScriptLibrarySettings().setJQueryReference(JQueryResourceReference.getV2());
+
 			super.init();
 		} catch(Throwable t){
 			log.error("error starting application", t);