Skip to content

Commit 5ceea88

Browse files
committed
Upgrade Spring Framework, Spring Security
1 parent cc7b508 commit 5ceea88

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

booking-faces/pom.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
<scope>provided</scope>
7878
<version>${cdi-api}</version>
7979
</dependency>
80+
<dependency>
81+
<groupId>jakarta.enterprise</groupId>
82+
<artifactId>jakarta.enterprise.cdi-el-api</artifactId>
83+
<version>${cdi-api}</version>
84+
</dependency>
8085
<dependency>
8186
<groupId>org.jboss.weld.servlet</groupId>
8287
<artifactId>weld-servlet-shaded</artifactId>
@@ -114,10 +119,15 @@
114119
</dependency>
115120
<!-- JAXB2 -->
116121
<dependency>
117-
<groupId>javax.xml.bind</groupId>
118-
<artifactId>jaxb-api</artifactId>
122+
<groupId>com.sun.xml.bind</groupId>
123+
<artifactId>jaxb-core</artifactId>
119124
<version>${jaxb.version}</version>
120125
</dependency>
126+
<dependency>
127+
<groupId>com.sun.xml.bind</groupId>
128+
<artifactId>jaxb-impl</artifactId>
129+
<version>${jaxb.version}</version>
130+
</dependency>
121131
<!-- Logging -->
122132
<dependency>
123133
<groupId>org.apache.logging.log4j</groupId>
@@ -177,6 +187,7 @@
177187
<configuration>
178188
<source>17</source>
179189
<target>17</target>
190+
<parameters>true</parameters>
180191
</configuration>
181192
</plugin>
182193
<plugin>

booking-mvc/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
</dependency>
116116
<!-- JAXB -->
117117
<dependency>
118-
<groupId>javax.xml.bind</groupId>
119-
<artifactId>jaxb-api</artifactId>
118+
<groupId>com.sun.xml.bind</groupId>
119+
<artifactId>jaxb-core</artifactId>
120120
<version>${jaxb.version}</version>
121121
</dependency>
122122
<!-- Joda Time -->
@@ -191,6 +191,7 @@
191191
<configuration>
192192
<source>17</source>
193193
<target>17</target>
194+
<parameters>true</parameters>
194195
</configuration>
195196
</plugin>
196197
<plugin>

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
<properties>
2121
<easymock.version>3.4</easymock.version>
22-
<cdi-api>4.0.1</cdi-api>
23-
<hsqldb.version>2.5.1</hsqldb.version>
22+
<cdi-api>4.1.0</cdi-api>
23+
<hsqldb.version>2.7.4</hsqldb.version>
2424
<hibernate.version>5.6.15.Final</hibernate.version>
2525
<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
26-
<jaxb.version>2.2.3</jaxb.version>
27-
<jetty-maven-plugin.version>11.0.11</jetty-maven-plugin.version>
26+
<jaxb.version>3.0.2</jaxb.version>
27+
<jetty-maven-plugin.version>11.0.24</jetty-maven-plugin.version>
2828
<jsp-api.version>3.1.0</jsp-api.version>
2929
<jstl-api>3.0.0</jstl-api>
3030
<junit.version>4.13.2</junit.version>
@@ -33,7 +33,7 @@
3333
<myfaces.version>4.0.0</myfaces.version>
3434
<primefaces.version>11.0.0</primefaces.version>
3535
<servlet.version>6.0.0</servlet.version>
36-
<webflow.version>3.0.0</webflow.version>
36+
<webflow.version>3.0.1-SNAPSHOT</webflow.version>
3737
<weld.version>5.0.0.Final</weld.version>
3838
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
3939
</properties>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>org.springframework</groupId>
4545
<artifactId>spring-framework-bom</artifactId>
46-
<version>6.0.10</version>
46+
<version>6.2.0</version>
4747
<type>pom</type>
4848
<scope>import</scope>
4949
</dependency>
@@ -52,7 +52,7 @@
5252
<artifactId>spring-security-bom</artifactId>
5353
<type>pom</type>
5454
<scope>import</scope>
55-
<version>6.0.2</version>
55+
<version>6.4.0</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)