Author: pete.muir(a)jboss.org Date: 2009-10-12 12:12:27 -0400 (Mon, 12 Oct 2009) New Revision: 3961 Modified: extensions/trunk/bom/pom.xml extensions/trunk/parent/pom.xml Log: cleanup, move stuff from core Modified: extensions/trunk/bom/pom.xml =================================================================== --- extensions/trunk/bom/pom.xml 2009-10-12 15:51:10 UTC (rev 3960) +++ extensions/trunk/bom/pom.xml 2009-10-12 16:12:27 UTC (rev 3961) @@ -37,9 +37,13 @@ <weld.core.version>1.0.0-SNAPSHOT</weld.core.version> <!-- Use JSF 2 for all extensions support, despite core using JSF 1.2 --> <jsf.version>2.0.0-RC</jsf.version> - <weld.wicket.version>1.0.0-SNAPSHOT</weld.wicket.version> - <wicket.version>[1.4.1, 1.5)</wicket.version> + <weld.wicket.version>${project.version}</weld.wicket.version> + <weld.se.version>${project.version}</weld.se.version> + <weld.servlet.version>${project.version}</weld.servlet.version> + <wicket.version>1.4.1</wicket.version> <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <tomcat.version>6.0.20</tomcat.version> + <uel.glassfish.version>2.1.2-b04</uel.glassfish.version> </properties> <!-- Dependency management, including extra repositories if needed --> @@ -124,34 +128,35 @@ <artifactId>weld-wicket</artifactId> <version>${weld.wicket.version}</version> </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-se</artifactId> + <version>${weld.se.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> + <version>${weld.servlet.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>jasper</artifactId> + <version>${tomcat.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <version>${uel.glassfish.version}</version> + </dependency> </dependencies> </dependencyManagement> - - <!-- The release profile --> - <profiles> - <profile> - <id>release</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> <!-- SCM and distribution management --> <scm> @@ -160,17 +165,4 @@ <url>http://fisheye.jboss.org/browse/Weld/extensions</url> </scm> - <distributionManagement> - <repository> - <id>oss.sonatype.org/jboss-staging</id> - <name>JBoss (Nexus) Release Staging Repository</name> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... - </repository> - <snapshotRepository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... - </snapshotRepository> - </distributionManagement> - </project> Modified: extensions/trunk/parent/pom.xml =================================================================== --- extensions/trunk/parent/pom.xml 2009-10-12 15:51:10 UTC (rev 3960) +++ extensions/trunk/parent/pom.xml 2009-10-12 16:12:27 UTC (rev 3961) @@ -28,6 +28,11 @@ </developers> + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + <ciManagement> <system>Hudson</system> <url />