Skip to content

Commit 9d27aa2

Browse files
rstoyanchevrstoyanchev
committed
Upgrade to SWF 2.5 snapshots
booking-mvc does not work yet due to the lack of Spring Framework 5 based Thymeleaf deps. Issue: SWF-1717
1 parent a1889ad commit 9d27aa2

File tree

23 files changed

+164
-322
lines changed

23 files changed

+164
-322
lines changed

‎booking-faces/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,24 +104,24 @@
104104
</dependency>
105105
<!-- Logging -->
106106
<dependency>
107-
<groupId>org.slf4j</groupId>
108-
<artifactId>slf4j-api</artifactId>
109-
<version>${slf4j.version}</version>
107+
<groupId>org.apache.logging.log4j</groupId>
108+
<artifactId>log4j-api</artifactId>
109+
<version>${log4j.version}</version>
110110
</dependency>
111111
<dependency>
112-
<groupId>org.slf4j</groupId>
113-
<artifactId>jcl-over-slf4j</artifactId>
114-
<version>${slf4j.version}</version>
112+
<groupId>org.apache.logging.log4j</groupId>
113+
<artifactId>log4j-core</artifactId>
114+
<version>${log4j.version}</version>
115115
</dependency>
116116
<dependency>
117-
<groupId>org.slf4j</groupId>
118-
<artifactId>jul-to-slf4j</artifactId>
119-
<version>${slf4j.version}</version>
117+
<groupId>org.apache.logging.log4j</groupId>
118+
<artifactId>log4j-slf4j-impl</artifactId>
119+
<version>${log4j.version}</version>
120120
</dependency>
121121
<dependency>
122-
<groupId>ch.qos.logback</groupId>
123-
<artifactId>logback-classic</artifactId>
124-
<version>1.2.3</version>
122+
<groupId>org.apache.logging.log4j</groupId>
123+
<artifactId>log4j-jul</artifactId>
124+
<version>${log4j.version}</version>
125125
</dependency>
126126
<!-- Test -->
127127
<dependency>

‎booking-faces/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.springframework.webflow.samples.booking.config;
22

33
import org.springframework.context.annotation.Configuration;
4-
import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
54
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
65
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
76
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
87
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
8+
import org.springframework.security.crypto.password.MessageDigestPasswordEncoder;
99
import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
1010

1111
@Configuration
@@ -33,17 +33,16 @@ protected void configure(HttpSecurity http) throws Exception {
3333
.csrf().disable()
3434
.requestCache()
3535
.requestCache(new HttpSessionRequestCache());
36-
3736
}
3837

3938
@Override
39+
@SuppressWarnings("deprecation")
4040
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
4141
auth.inMemoryAuthentication()
42-
.passwordEncoder(new Md5PasswordEncoder())
43-
.withUser("keith").password("417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
44-
.withUser("erwin").password("12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
45-
.withUser("jeremy").password("57c6cbff0d421449be820763f03139eb").roles("USER").and()
46-
.withUser("scott").password("942f2339bf50796de535a384f0d1af3e").roles("USER");
42+
.withUser("keith").password("{MD5}417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
43+
.withUser("erwin").password("{MD5}12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
44+
.withUser("jeremy").password("{MD5}57c6cbff0d421449be820763f03139eb").roles("USER").and()
45+
.withUser("scott").password("{MD5}942f2339bf50796de535a384f0d1af3e").roles("USER");
4746
}
4847

4948
}

‎booking-faces/src/main/resources/log4j2.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
6+
</Console>
7+
</Appenders>
8+
<Loggers>
9+
<Logger name="org.springframework.samples" level="debug" />
10+
<Root level="info">
11+
<AppenderRef ref="Console" />
12+
</Root>
13+
</Loggers>
14+
</Configuration>

‎booking-faces/src/main/resources/logback.xml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎booking-mvc/pom.xml‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>org.springframework.webflow</groupId>
38-
<artifactId>spring-js</artifactId>
38+
<artifactId>spring-js-resources</artifactId>
3939
<version>${webflow.version}</version>
4040
</dependency>
4141
<dependency>
@@ -101,27 +101,27 @@
101101
<dependency>
102102
<groupId>org.apache.tiles</groupId>
103103
<artifactId>tiles-core</artifactId>
104-
<version>2.2.2</version>
104+
<version>${tiles.version}</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>org.apache.tiles</groupId>
108108
<artifactId>tiles-api</artifactId>
109-
<version>2.2.2</version>
109+
<version>${tiles.version}</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>org.apache.tiles</groupId>
113113
<artifactId>tiles-template</artifactId>
114-
<version>2.2.2</version>
114+
<version>${tiles.version}</version>
115115
</dependency>
116116
<dependency>
117117
<groupId>org.apache.tiles</groupId>
118118
<artifactId>tiles-servlet</artifactId>
119-
<version>2.2.2</version>
119+
<version>${tiles.version}</version>
120120
</dependency>
121121
<dependency>
122122
<groupId>org.apache.tiles</groupId>
123123
<artifactId>tiles-jsp</artifactId>
124-
<version>2.2.2</version>
124+
<version>${tiles.version}</version>
125125
</dependency>
126126
<!-- Database, JPA -->
127127
<dependency>
@@ -161,19 +161,24 @@
161161
</dependency>
162162
<!-- Logging -->
163163
<dependency>
164-
<groupId>org.slf4j</groupId>
165-
<artifactId>slf4j-api</artifactId>
166-
<version>${slf4j.version}</version>
164+
<groupId>org.apache.logging.log4j</groupId>
165+
<artifactId>log4j-api</artifactId>
166+
<version>${log4j.version}</version>
167167
</dependency>
168168
<dependency>
169-
<groupId>org.slf4j</groupId>
170-
<artifactId>jcl-over-slf4j</artifactId>
171-
<version>${slf4j.version}</version>
169+
<groupId>org.apache.logging.log4j</groupId>
170+
<artifactId>log4j-core</artifactId>
171+
<version>${log4j.version}</version>
172172
</dependency>
173173
<dependency>
174-
<groupId>ch.qos.logback</groupId>
175-
<artifactId>logback-classic</artifactId>
176-
<version>${logback.version}</version>
174+
<groupId>org.apache.logging.log4j</groupId>
175+
<artifactId>log4j-slf4j-impl</artifactId>
176+
<version>${log4j.version}</version>
177+
</dependency>
178+
<dependency>
179+
<groupId>org.apache.logging.log4j</groupId>
180+
<artifactId>log4j-jul</artifactId>
181+
<version>${log4j.version}</version>
177182
</dependency>
178183

179184
<!-- Test -->

‎booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/SecurityConfig.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.springframework.webflow.samples.booking.config;
22

33
import org.springframework.context.annotation.Configuration;
4-
import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
54
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
65
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
76
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -28,11 +27,10 @@ protected void configure(HttpSecurity http) throws Exception {
2827
@Override
2928
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
3029
auth.inMemoryAuthentication()
31-
.passwordEncoder(new Md5PasswordEncoder())
32-
.withUser("keith").password("417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
33-
.withUser("erwin").password("12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
34-
.withUser("jeremy").password("57c6cbff0d421449be820763f03139eb").roles("USER").and()
35-
.withUser("scott").password("942f2339bf50796de535a384f0d1af3e").roles("USER");
30+
.withUser("keith").password("{MD5}417c7382b16c395bc25b5da1398cf076").roles("USER", "SUPERVISOR").and()
31+
.withUser("erwin").password("{MD5}12430911a8af075c6f41c6976af22b09").roles("USER", "SUPERVISOR").and()
32+
.withUser("jeremy").password("{MD5}57c6cbff0d421449be820763f03139eb").roles("USER").and()
33+
.withUser("scott").password("{MD5}942f2339bf50796de535a384f0d1af3e").roles("USER");
3634
}
3735

3836
}

‎booking-mvc/src/main/resources/log4j2.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration status="WARN">
3+
<Appenders>
4+
<Console name="Console" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
6+
</Console>
7+
</Appenders>
8+
<Loggers>
9+
<Logger name="org.springframework.samples" level="debug" />
10+
<Root level="info">
11+
<AppenderRef ref="Console" />
12+
</Root>
13+
</Loggers>
14+
</Configuration>

‎booking-mvc/src/main/resources/logback.xml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,35 @@
1818
<properties>
1919
<easymock.version>3.4</easymock.version>
2020
<hsqldb.version>2.4.0</hsqldb.version>
21-
<hibernate.version>3.6.9.Final</hibernate.version>
22-
<hibernate-validator.version>4.3.2.Final</hibernate-validator.version>
21+
<hibernate.version>5.2.12.Final</hibernate.version>
22+
<hibernate-validator.version>6.0.7.Final</hibernate-validator.version>
2323
<jaxb.version>2.2.3</jaxb.version>
2424
<jetty-maven-plugin.version>9.4.8.v20171121</jetty-maven-plugin.version>
2525
<junit.version>4.12</junit.version>
26-
<logback.version>1.2.3</logback.version>
26+
<log4j.version>2.10.0</log4j.version>
2727
<mojarra.version>2.2.16</mojarra.version>
2828
<myfaces.version>2.2.12</myfaces.version>
2929
<primefaces.version>6.1</primefaces.version>
30-
<servlet.version>3.0.1</servlet.version>
31-
<slf4j.version>1.7.25</slf4j.version>
32-
<spring-security.version>4.2.4.RELEASE</spring-security.version>
33-
<webflow.version>2.4.7.RELEASE</webflow.version>
30+
<servlet.version>3.1.0</servlet.version>
31+
<spring-security.version>5.0.1.RELEASE</spring-security.version>
32+
<tiles.version>3.0.8</tiles.version>
33+
<webflow.version>2.5.0.BUILD-SNAPSHOT</webflow.version>
3434
</properties>
3535

3636
<dependencyManagement>
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.springframework</groupId>
4040
<artifactId>spring-framework-bom</artifactId>
41-
<version>4.3.13.RELEASE</version>
41+
<version>5.0.3.RELEASE</version>
4242
<type>pom</type>
4343
<scope>import</scope>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.slf4j</groupId>
47+
<artifactId>slf4j-api</artifactId>
48+
<version>1.7.25</version>
49+
</dependency>
4550
</dependencies>
4651
</dependencyManagement>
4752

‎primefaces-showcase/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,24 @@
101101
</dependency>
102102
<!-- Logging -->
103103
<dependency>
104-
<groupId>org.slf4j</groupId>
105-
<artifactId>slf4j-api</artifactId>
106-
<version>${slf4j.version}</version>
104+
<groupId>org.apache.logging.log4j</groupId>
105+
<artifactId>log4j-api</artifactId>
106+
<version>${log4j.version}</version>
107107
</dependency>
108108
<dependency>
109-
<groupId>org.slf4j</groupId>
110-
<artifactId>jcl-over-slf4j</artifactId>
111-
<version>${slf4j.version}</version>
109+
<groupId>org.apache.logging.log4j</groupId>
110+
<artifactId>log4j-core</artifactId>
111+
<version>${log4j.version}</version>
112112
</dependency>
113113
<dependency>
114-
<groupId>org.slf4j</groupId>
115-
<artifactId>jul-to-slf4j</artifactId>
116-
<version>${slf4j.version}</version>
114+
<groupId>org.apache.logging.log4j</groupId>
115+
<artifactId>log4j-slf4j-impl</artifactId>
116+
<version>${log4j.version}</version>
117117
</dependency>
118118
<dependency>
119-
<groupId>ch.qos.logback</groupId>
120-
<artifactId>logback-classic</artifactId>
121-
<version>${logback.version}</version>
119+
<groupId>org.apache.logging.log4j</groupId>
120+
<artifactId>log4j-jul</artifactId>
121+
<version>${log4j.version}</version>
122122
</dependency>
123123
</dependencies>
124124

0 commit comments

Comments
 (0)