10:51 a.m.
Author: pete.muir(a)jboss.org
Date: 2009-10-12 11:51:10 -0400 (Mon, 12 Oct 2009)
New Revision: 3960
Modified:
core/trunk/bom/pom.xml
core/trunk/parent/pom.xml
Log:
move deps to examples and extensions
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2009-10-12 15:51:07 UTC (rev 3959)
+++ core/trunk/bom/pom.xml 2009-10-12 15:51:10 UTC (rev 3960)
@@ -73,15 +73,11 @@
<properties>
<weld.api.version>1.0-SNAPSHOT</weld.api.version>
+ <weld.core.version>1.0.0-SNAPSHOT</weld.core.version>
<google.collections.version>1.0-rc2</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
<cdi.tck.version>1.0.0-SNAPSHOT</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <weld.core.version>1.0.0-SNAPSHOT</weld.core.version>
- <weld.servlet.version>1.0.0-SNAPSHOT</weld.servlet.version>
- <weld.se.version>1.0.0-SNAPSHOT</weld.se.version>
- <jetty.version>6.1.21</jetty.version>
- <tomcat.version>6.0.20</tomcat.version>
<jboss.interceptor.version>1.0.0-SNAPSHOT</jboss.interceptor.version>
</properties>
@@ -127,24 +123,6 @@
</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-int</artifactId>
- <version>${weld.servlet.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <version>${weld.servlet.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-api</artifactId>
<version>${cdi.tck.version}</version>
@@ -167,96 +145,15 @@
<artifactId>jboss-interceptor</artifactId>
<version>${jboss.interceptor.version}</version>
</dependency>
-
- <!-- TODO Move to examples -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
- <version>${jetty.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>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<version>${google.collections.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_13</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.1.2-b04</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>
@@ -265,17 +162,4 @@
<url>http://fisheye.jboss.org/browse/Weld/core</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: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2009-10-12 15:51:07 UTC (rev 3959)
+++ core/trunk/parent/pom.xml 2009-10-12 15:51:10 UTC (rev 3960)
@@ -19,7 +19,7 @@
<url>http://www.seamframework.org/Weld</url>
<description>
- The reference implementation of JSR 299: Weld
+ Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency
Injection for Java EE
</description>
<ciManagement>
@@ -74,11 +74,7 @@
<properties>
<glassfish.el.version>2.1.2-b04</glassfish.el.version>
-
- <!-- Force encoding to UTF-8 (bug on OS X) -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
+ <log4j.version>1.2.14</log4j.version>
<!-- Testing deps -->
<testng.version>5.9</testng.version>
<jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version>
@@ -159,6 +155,12 @@
<artifactId>el-impl</artifactId>
<version>${glassfish.el.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>