From 76a8bbe98d489319fcbeed39e7a6a8791ccf38f1 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 7 Oct 2013 08:12:35 -0500 Subject: [PATCH] SEC-2354: Add failOnMissingWebXml=false to sample pom.xml --- gradle/maven-deployment.gradle | 10 ++++++++++ samples/cas/sample-xml/pom.xml | 7 +++++++ samples/cas/server/pom.xml | 7 +++++++ samples/concurrency-jc/pom.xml | 7 +++++++ samples/contacts-xml/pom.xml | 7 +++++++ samples/form-jc/pom.xml | 7 +++++++ samples/gae-xml/pom.xml | 7 +++++++ samples/hellomvc-jc/pom.xml | 7 +++++++ samples/helloworld-jc/pom.xml | 7 +++++++ samples/inmemory-jc/pom.xml | 7 +++++++ samples/insecure/pom.xml | 7 +++++++ samples/insecuremvc/pom.xml | 7 +++++++ samples/jaas-xml/pom.xml | 7 +++++++ samples/jdbc-jc/pom.xml | 7 +++++++ samples/ldap-jc/pom.xml | 7 +++++++ samples/ldap-xml/pom.xml | 7 +++++++ samples/messages-jc/pom.xml | 12 ++++++------ samples/openid-jc/pom.xml | 7 +++++++ samples/openid-xml/pom.xml | 7 +++++++ samples/preauth-jc/pom.xml | 7 +++++++ samples/preauth-xml/pom.xml | 7 +++++++ samples/rememberme-jc/pom.xml | 7 +++++++ samples/servletapi-xml/pom.xml | 7 +++++++ samples/tutorial-xml/pom.xml | 7 +++++++ samples/x509-jc/pom.xml | 7 +++++++ 25 files changed, 177 insertions(+), 6 deletions(-) diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index 94371fb032..830275f418 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -89,6 +89,16 @@ def customizePom(pom, gradleProject) { target = '1.7' } } + if(isWar) { + plugin { + groupId = 'org.apache.maven.plugins' + artifactId = 'maven-war-plugin' + version = '2.3' + configuration { + failOnMissingWebXml = 'false' + } + } + } } } } diff --git a/samples/cas/sample-xml/pom.xml b/samples/cas/sample-xml/pom.xml index 17420d6501..e747b425a0 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/cas/sample-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml index 7cbbb6da6b..8405c5296c 100644 --- a/samples/cas/server/pom.xml +++ b/samples/cas/server/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/concurrency-jc/pom.xml b/samples/concurrency-jc/pom.xml index 659bd645bd..325fd325ea 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/concurrency-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/contacts-xml/pom.xml b/samples/contacts-xml/pom.xml index 1ba6a27fee..e565071e46 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/contacts-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/form-jc/pom.xml b/samples/form-jc/pom.xml index aef058f2bb..48654f53e7 100644 --- a/samples/form-jc/pom.xml +++ b/samples/form-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/gae-xml/pom.xml b/samples/gae-xml/pom.xml index caf913ac9d..d402abe6e0 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/gae-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/hellomvc-jc/pom.xml b/samples/hellomvc-jc/pom.xml index d1272de4db..adb122e1be 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/hellomvc-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/helloworld-jc/pom.xml b/samples/helloworld-jc/pom.xml index 837dfdc657..5baab30e8c 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/helloworld-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/inmemory-jc/pom.xml b/samples/inmemory-jc/pom.xml index 16442531dd..4832b136cf 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/inmemory-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/insecure/pom.xml b/samples/insecure/pom.xml index 872480633a..d471ee1ee7 100644 --- a/samples/insecure/pom.xml +++ b/samples/insecure/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/insecuremvc/pom.xml b/samples/insecuremvc/pom.xml index 05dc27fdab..9b6ba79321 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/insecuremvc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/jaas-xml/pom.xml b/samples/jaas-xml/pom.xml index 85d9742ec0..0d1ed0ece5 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/jaas-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/jdbc-jc/pom.xml b/samples/jdbc-jc/pom.xml index d181af1cb3..2be717f4d9 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/jdbc-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/ldap-jc/pom.xml b/samples/ldap-jc/pom.xml index a44c3358b3..327c1300d9 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/ldap-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/ldap-xml/pom.xml b/samples/ldap-xml/pom.xml index c16dd9a9cd..7c0a5ac3ed 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/ldap-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/messages-jc/pom.xml b/samples/messages-jc/pom.xml index 368c232525..d2b5b59001 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/messages-jc/pom.xml @@ -127,12 +127,6 @@ 3.2.4.RELEASE compile - - org.springframework - spring-core - 3.2.4.RELEASE - compile - org.springframework spring-core @@ -145,6 +139,12 @@ + + org.springframework + spring-core + 3.2.4.RELEASE + compile + org.springframework spring-instrument diff --git a/samples/openid-jc/pom.xml b/samples/openid-jc/pom.xml index 74de143840..0e22ef0484 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/openid-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/openid-xml/pom.xml b/samples/openid-xml/pom.xml index 537c5676e9..8c21c752cc 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/openid-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/preauth-jc/pom.xml b/samples/preauth-jc/pom.xml index 7df1bfdeb7..7564639667 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/preauth-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/preauth-xml/pom.xml b/samples/preauth-xml/pom.xml index 1e6a210430..b313e7feff 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/preauth-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/rememberme-jc/pom.xml b/samples/rememberme-jc/pom.xml index 36f17b2e2f..9039770c4f 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/rememberme-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/servletapi-xml/pom.xml b/samples/servletapi-xml/pom.xml index 0e2d65fac7..fac6640bc2 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/servletapi-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/tutorial-xml/pom.xml b/samples/tutorial-xml/pom.xml index ded08d5364..1e818caca1 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/tutorial-xml/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + + diff --git a/samples/x509-jc/pom.xml b/samples/x509-jc/pom.xml index b499ad3272..b9227f0090 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/x509-jc/pom.xml @@ -41,6 +41,13 @@ 1.7 + + maven-war-plugin + 2.3 + + false + +