Author: pete.muir(a)jboss.org Date: 2009-09-23 11:10:33 -0400 (Wed, 23 Sep 2009) New Revision: 3764 Modified: examples/trunk/wicket/numberguess/pom.xml Log: move versions to version matrix Modified: examples/trunk/wicket/numberguess/pom.xml =================================================================== --- examples/trunk/wicket/numberguess/pom.xml 2009-09-23 15:10:17 UTC (rev 3763) +++ examples/trunk/wicket/numberguess/pom.xml 2009-09-23 15:10:33 UTC (rev 3764) @@ -25,51 +25,45 @@ <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>webbeans-wicket</artifactId> - <!-- TODO Move to version matrix --> - <version>1.0.0.BETA1</version> </dependency> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket</artifactId> - <!-- TODO Move to version matrix --> - <version>${wicket.version}</version> </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <!-- TODO Move to version matrix --> - <version>1.4.2</version> - </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <!-- TODO Move to version matrix --> - <version>1.2.14</version> - </dependency> - - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> - </dependency> + </dependency> + <!-- JETTY DEPENDENCIES FOR IN IDE TESTING --> - <!-- JETTY DEPENDENCIES FOR TESTING --> - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <!-- TODO Move to version matrix --> - <version>${jetty.version}</version> - <scope>provided</scope> + <scope>test</scope> </dependency> + + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <finalName>webbeans-numberguess-wicket</finalName> + + <!-- Override the resource filtering to support storing html alongside classes --> <resources> <resource> <filtering>false</filtering> @@ -98,37 +92,31 @@ </excludes> </testResource> </testResources> + <plugins> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> - <!-- TODO Move to version matrix --> - <version>${jetty.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp/WEB-INF</directory> - <targetPath>WEB-INF</targetPath> - <includes> - <include>**/beans.xml</include> - <include>**/web.xml</include> - </includes> - </resource> - </webResources> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp/WEB-INF</directory> + <targetPath>WEB-INF</targetPath> + <includes> + <include>**/beans.xml</include> + <include>**/web.xml</include> + </includes> + </resource> + </webResources> + </configuration> + </plugin> </plugins> </build> - <properties> - <wicket.version>1.3.5.jboss1</wicket.version> - <jetty.version>6.1.16</jetty.version> - </properties> - <profiles> <profile> <id>jetty</id>