Author: tchemit Date: 2008-07-29 09:20:56 +0000 (Tue, 29 Jul 2008) New Revision: 1525 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-web/pom.xml Log: try another maven-war-plugin to fix hudson bug on war assembly... Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-07-28 18:01:17 UTC (rev 1524) +++ trunk/simexplorer-is/pom.xml 2008-07-29 09:20:56 UTC (rev 1525) @@ -588,7 +588,8 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0.1</version> + <version>2.1-alpha-1</version> + <!--version>2.0.1</version--> <!-- force version because maven seem to can't find automaticaly --> </dependency> Modified: trunk/simexplorer-is/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-07-28 18:01:17 UTC (rev 1524) +++ trunk/simexplorer-is/simexplorer-is-web/pom.xml 2008-07-29 09:20:56 UTC (rev 1525) @@ -1,107 +1,107 @@ <?xml version="1.0" encoding="UTF-8"?> <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> + 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> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-web</artifactId> - <name>Web</name> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-web</artifactId> + <name>Web</name> - <packaging>war</packaging> - <version>${current.version}</version> - <description>simexplorer-is web module</description> + <packaging>war</packaging> + <version>${current.version}</version> + <description>simexplorer-is web module</description> - <parent> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is</artifactId> - <version>${current.version}</version> - </parent> - <build> - <plugins> - <!--WebApp in JAR --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <warSourceDirectory> - ${basedir}/src/main/webapp - </warSourceDirectory> - <warSourceExcludes> - WEB-INF/lib/*.jar - </warSourceExcludes> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> + <parent> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is</artifactId> + <version>${current.version}</version> + </parent> + <build> + <plugins> + <!--WebApp in JAR --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <!--version>2.0.2</version--> + <configuration> + <warSourceDirectory> + ${basedir}/src/main/webapp + </warSourceDirectory> + <warSourceExcludes> + WEB-INF/lib/*.jar + </warSourceExcludes> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> - <!-- Run the application using "mvn jetty:run" --> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <configuration> - <!-- Log to the console. --> - <requestLog - implementation="org.mortbay.jetty.NCSARequestLog"> - <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug - that prevents the requestLog from being set. --> - <append>true</append> - </requestLog> - <connectors> - <connector - implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>9090</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> + <!-- Run the application using "mvn jetty:run" --> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <configuration> + <!-- Log to the console. --> + <requestLog + implementation="org.mortbay.jetty.NCSARequestLog"> + <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug + that prevents the requestLog from being set. --> + <append>true</append> + </requestLog> + <connectors> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>9090</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-service</artifactId> - </dependency> - <dependency> - <groupId>tapestry5-treegrid</groupId> - <artifactId>tapestry5-treegrid</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-ioc</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>t5c-commons</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossall-client</artifactId> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-service</artifactId> + </dependency> + <dependency> + <groupId>tapestry5-treegrid</groupId> + <artifactId>tapestry5-treegrid</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>t5c-commons</artifactId> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossall-client</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + </dependencies> </project> \ No newline at end of file