maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject svn commit: r1601570 - in /maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306: ./ pom.xml src/ src/main/ src/main/webapp/ src/main/webapp/index.html verify.groovy
Date Tue, 10 Jun 2014 08:29:38 GMT
Author: khmarbaise
Date: Tue Jun 10 08:29:37 2014
New Revision: 1601570

URL: http://svn.apache.org/r1601570
Log:
[MWAR-306]
 - This is related to MWAR-313 upgrade 
   of maven-filtering to 1.2
 - Verifier this regression by example
   given by Fred Bricon.

Added:
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/pom.xml
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/webapp/
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/webapp/index.html
    maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/verify.groovy

Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/pom.xml?rev=1601570&view=auto
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/pom.xml (added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/pom.xml Tue Jun 10 08:29:37 2014
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>foo.bar</groupId>
+  <artifactId>MWAR-306</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<build>
+		<plugins>
+			<plugin>
+  			<groupId>@project.groupId@</groupId>
+  			<artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<webResources>
+						<resource>
+							<directory>src/main/webapp</directory>
+							<filtering>true</filtering>
+						</resource>
+					</webResources>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/webapp/index.html?rev=1601570&view=auto
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/webapp/index.html (added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/src/main/webapp/index.html Tue Jun
10 08:29:37 2014
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta>
+<title>${project.artifactId}</title>
+</head>
+<body>${project.artifactId} @ ${project.version}</body>
+${project.name} 
+</html>
\ No newline at end of file

Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/verify.groovy?rev=1601570&view=auto
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/verify.groovy (added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-306/verify.groovy Tue Jun 10 08:29:37
2014
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def indexHtml = new File(basedir, 'target/MWAR-306-0.0.1-SNAPSHOT/index.html');
+assert indexHtml.exists()
+
+assert indexHtml.text.contains('<body>MWAR-306 @ 0.0.1-SNAPSHOT</body>')



Mime
View raw message