You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/08/04 22:35:55 UTC
svn commit: r982395 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test:
fragment1/pom.xml fragment2/pom.xml fragment3/pom.xml
servlet3.0-test-jar/pom.xml servlet3.0-test-war/pom.xml
Author: gawor
Date: Wed Aug 4 20:35:54 2010
New Revision: 982395
URL: http://svn.apache.org/viewvc?rev=982395&view=rev
Log:
fix pom formatting
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml?rev=982395&r1=982394&r2=982395&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment1/pom.xml Wed Aug 4 20:35:54 2010
@@ -17,14 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-
<!-- $Rev$ $Date$ -->
+<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>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
+ <parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>servlet3.0-test</artifactId>
<version>3.0-SNAPSHOT</version>
@@ -33,15 +30,14 @@
<artifactId>fragment1</artifactId>
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: fragment1</name>
<packaging>jar</packaging>
-
<description>Geronimo Testsuite. WEB Fragment Module 1</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </project>
+</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml?rev=982395&r1=982394&r2=982395&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment2/pom.xml Wed Aug 4 20:35:54 2010
@@ -17,14 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-
<!-- $Rev$ $Date$ -->
+<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>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
+ <parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>servlet3.0-test</artifactId>
<version>3.0-SNAPSHOT</version>
@@ -33,15 +30,14 @@
<artifactId>fragment2</artifactId>
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: fragment2</name>
<packaging>jar</packaging>
-
<description>Geronimo Testsuite. WEB Fragment Module 2</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </project>
+</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml?rev=982395&r1=982394&r2=982395&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/fragment3/pom.xml Wed Aug 4 20:35:54 2010
@@ -17,14 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-
<!-- $Rev$ $Date$ -->
+<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>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
+ <parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>servlet3.0-test</artifactId>
<version>3.0-SNAPSHOT</version>
@@ -33,15 +30,14 @@
<artifactId>fragment3</artifactId>
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: fragment3</name>
<packaging>jar</packaging>
-
<description>Geronimo Testsuite. WEB Fragment Module 3</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </project>
+</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml?rev=982395&r1=982394&r2=982395&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-jar/pom.xml Wed Aug 4 20:35:54 2010
@@ -17,11 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-
<!-- $Rev$ $Date$ -->
-
<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/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -33,9 +30,6 @@
<artifactId>servlet3.0-test-jar</artifactId>
<name>Geronimo TestSuite :: Java EE 6 Testsuite :: servlet3.0-test-jar</name>
<packaging>jar</packaging>
-
<description>Geronimo Testsuite. A Module Including META-INF/resources</description>
-
</project>
-
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml?rev=982395&r1=982394&r2=982395&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml Wed Aug 4 20:35:54 2010
@@ -18,121 +18,111 @@
under the License.
-->
<!-- $Rev$ $Date$ -->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>servlet3.0-test</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>servlet3.0-test-war</artifactId>
- <name>Geronimo TestSuite :: Java EE 6 Testsuite :: servlet3.0-test-war</name>
- <packaging>war</packaging>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>servlet3.0-test-jar</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>fragment1</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>fragment2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>fragment3</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>it</id>
- <activation>
- <property>
- <name>it</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>servlet3.0-test</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>servlet3.0-test-war</artifactId>
+ <name>Geronimo TestSuite :: Java EE 6 Testsuite :: servlet3.0-test-war</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>servlet3.0-test-jar</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>fragment1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>fragment2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>fragment3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-wars</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-war-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
<systemPropertyVariables>
<appContext>${project.artifactId}</appContext>
</systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>