Skip to content

Commit 2e9b7b4

Browse files
committed
Restore xmlns references + upgrades
1 parent 5985366 commit 2e9b7b4

File tree

26 files changed

+48
-48
lines changed

26 files changed

+48
-48
lines changed

booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
6-
xmlns:p="https://primefaces.org/ui"
5+
xmlns:f="http://java.sun.com/jsf/core"
6+
xmlns:p="http://primefaces.org/ui"
77
template="/WEB-INF/layouts/standard.xhtml">
88
<ui:define name="notes">
99
<p>

booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
6-
xmlns:p="https://primefaces.org/ui"
5+
xmlns:f="http://java.sun.com/jsf/core"
6+
xmlns:p="http://primefaces.org/ui"
77
template="/WEB-INF/layouts/standard.xhtml">
88
<ui:define name="notes">
99
<p>

booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
6-
xmlns:p="https://primefaces.org/ui"
5+
xmlns:f="http://java.sun.com/jsf/core"
6+
xmlns:p="http://primefaces.org/ui"
77
template="/WEB-INF/layouts/standard.xhtml">
88

99
<ui:define name="notes">

booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
6-
xmlns:p="https://primefaces.org/ui"
5+
xmlns:f="http://java.sun.com/jsf/core"
6+
xmlns:p="http://primefaces.org/ui"
77
template="/WEB-INF/layouts/standard.xhtml">
88
<ui:define name="notes">
99
<p>

booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
6-
xmlns:p="https://primefaces.org/ui"
5+
xmlns:f="http://java.sun.com/jsf/core"
6+
xmlns:p="http://primefaces.org/ui"
77
template="/WEB-INF/layouts/standard.xhtml">
88
<ui:define name="notes">
99
<p>

booking-faces/src/main/webapp/WEB-INF/intro.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
5+
xmlns:f="http://java.sun.com/jsf/core"
66
xmlns:sf="http://www.springframework.org/tags/faces"
77
template="layouts/standard.xhtml">
88

booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "https://www.w3.org/TR/html4/loose.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:h="http://java.sun.com/jsf/html"
4-
xmlns:f="https://java.sun.com/jsf/core"
4+
xmlns:f="http://java.sun.com/jsf/core"
55
xmlns:c="http://java.sun.com/jsp/jstl/core"
66
xmlns:ui="http://java.sun.com/jsf/facelets"
7-
xmlns:p="https://primefaces.org/ui">
7+
xmlns:p="http://primefaces.org/ui">
88

99
<f:view contentType="text/html">
1010

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
<myfaces.version>2.2.12</myfaces.version>
2929
<primefaces.version>6.1</primefaces.version>
3030
<servlet.version>3.1.0</servlet.version>
31-
<spring-security.version>5.0.1.RELEASE</spring-security.version>
31+
<spring-security.version>5.1.5.RELEASE</spring-security.version>
3232
<tiles.version>3.0.8</tiles.version>
33-
<webflow.version>2.5.0.RELEASE</webflow.version>
33+
<webflow.version>2.5.1.RELEASE</webflow.version>
3434
</properties>
3535

3636
<dependencyManagement>
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.springframework</groupId>
4040
<artifactId>spring-framework-bom</artifactId>
41-
<version>5.0.3.RELEASE</version>
41+
<version>5.1.7.RELEASE</version>
4242
<type>pom</type>
4343
<scope>import</scope>
4444
</dependency>

primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-jsf/view.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
5+
xmlns:f="http://java.sun.com/jsf/core"
66
template="/WEB-INF/layouts/standard.xhtml">
77

88
<ui:define name="title">JSF 2 ajax with commandButton and f:ajax</ui:define>

primefaces-showcase/src/main/webapp/WEB-INF/flows/ajax-primefaces/view.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
33
xmlns:ui="http://java.sun.com/jsf/facelets"
44
xmlns:h="http://java.sun.com/jsf/html"
5-
xmlns:f="https://java.sun.com/jsf/core"
6-
xmlns:p="https://primefaces.org/ui"
5+
xmlns:f="http://java.sun.com/jsf/core"
6+
xmlns:p="http://primefaces.org/ui"
77
template="/WEB-INF/layouts/standard.xhtml">
88

99
<ui:define name="title">Ajax With PrimeFaces CommandButton</ui:define>

0 commit comments

Comments
 (0)