浏览代码

SEC-2354: Add failOnMissingWebXml=false to sample pom.xml

Rob Winch 12 年之前
父节点
当前提交
76a8bbe98d

+ 10 - 0
gradle/maven-deployment.gradle

@@ -89,6 +89,16 @@ def customizePom(pom, gradleProject) {
                         target = '1.7'
                         target = '1.7'
                     }
                     }
                 }
                 }
+                if(isWar) {
+                    plugin {
+                        groupId = 'org.apache.maven.plugins'
+                        artifactId = 'maven-war-plugin'
+                        version = '2.3'
+                        configuration {
+                            failOnMissingWebXml = 'false'
+                        }
+                    }
+                }
             }
             }
         }
         }
     }
     }

+ 7 - 0
samples/cas/sample-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/cas/server/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/concurrency-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/contacts-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/form-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/gae-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/hellomvc-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/helloworld-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/inmemory-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/insecure/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/insecuremvc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/jaas-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/jdbc-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/ldap-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/ldap-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 6 - 6
samples/messages-jc/pom.xml

@@ -127,12 +127,6 @@
       <version>3.2.4.RELEASE</version>
       <version>3.2.4.RELEASE</version>
       <scope>compile</scope>
       <scope>compile</scope>
     </dependency>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>3.2.4.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <artifactId>spring-core</artifactId>
@@ -145,6 +139,12 @@
         </exclusion>
         </exclusion>
       </exclusions>
       </exclusions>
     </dependency>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <groupId>org.springframework</groupId>
       <artifactId>spring-instrument</artifactId>
       <artifactId>spring-instrument</artifactId>

+ 7 - 0
samples/openid-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/openid-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/preauth-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/preauth-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/rememberme-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/servletapi-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/tutorial-xml/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>

+ 7 - 0
samples/x509-jc/pom.xml

@@ -41,6 +41,13 @@
           <target>1.7</target>
           <target>1.7</target>
         </configuration>
         </configuration>
       </plugin>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
     </plugins>
     </plugins>
   </build>
   </build>
   <repositories>
   <repositories>