[seam-commits] Seam SVN: r14321 - in branches/community/Seam_2_3: examples/booking/booking-tests and 1 other directories.

Author: manaRH Date: 2012-02-17 14:51:00 -0500 (Fri, 17 Feb 2012) New Revision: 14321 Modified: branches/community/Seam_2_3/examples-ee6/pom.xml branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples/pom.xml Log: JBSEAM-4896 booking cleaned maven project settings to comply with M2e plugin Modified: branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml 2012-02-17 18:58:59 UTC (rev 14320) +++ branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml 2012-02-17 19:51:00 UTC (rev 14321) @@ -109,6 +109,7 @@ <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/../booking-web/src/main/webapp</additionalClasspathElement> + <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement> </additionalClasspathElements> <suiteXmlFiles> <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile> @@ -126,33 +127,20 @@ <goal>unpack</goal> </goals> <configuration> + <includes>bootstrap/**</includes> <artifactItems> <artifactItem> <groupId>org.jboss.seam</groupId> <artifactId>jboss-embedded-bootstrap</artifactId> <version>${project.version}</version> <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${basedir}/src/test</outputDirectory> + <overWrite>false</overWrite> </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/src/test/META-INF/</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/bootstrap</directory> - </fileset> - </filesets> - </configuration> - </plugin> </plugins> </build> Modified: branches/community/Seam_2_3/examples/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/pom.xml 2012-02-17 18:58:59 UTC (rev 14320) +++ branches/community/Seam_2_3/examples/pom.xml 2012-02-17 19:51:00 UTC (rev 14321) @@ -1,6 +1,5 @@ <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> - <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> @@ -8,10 +7,8 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> <packaging>pom</packaging> - <name>Seam 2 examples</name> <description>Examples for Seam 2 Framework</description> @@ -64,7 +61,6 @@ <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> <configuration> <excludedGroups>${tests.excludedGroups}</excludedGroups> </configuration> @@ -74,6 +70,31 @@ <artifactId>jboss-maven-plugin</artifactId> <version>1.4.1</version> </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>unpack</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute><runOnIncremental>false</runOnIncremental></execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -340,7 +361,7 @@ <plugins> <!-- skip unit tests when running functional tests --> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> @@ -470,7 +491,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -546,7 +566,7 @@ <plugins> <!-- skip unit tests when running functional tests --> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> @@ -670,7 +690,7 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -757,7 +777,6 @@ <plugins> <!-- skip unit tests when running functional tests --> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> @@ -887,7 +906,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-02-17 18:58:59 UTC (rev 14320) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-02-17 19:51:00 UTC (rev 14321) @@ -31,6 +31,31 @@ <excludedGroups>${tests.excludedGroups}</excludedGroups> </configuration> </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals> + <goal>unpack</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute><runOnIncremental>false</runOnIncremental></execute> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> </plugins> </pluginManagement> </build>