[weld-commits] Weld SVN: r3939 - in core/trunk: bom and 8 other directories.

Author: pete.muir(a)jboss.org Date: 2009-10-11 18:48:31 -0400 (Sun, 11 Oct 2009) New Revision: 3939 Added: core/trunk/bom/ Removed: core/trunk/version-matrix/ Modified: core/trunk/bom/pom.xml core/trunk/impl/pom.xml core/trunk/inject-tck-runner/pom.xml core/trunk/jboss-tck-runner/pom.xml core/trunk/logging/pom.xml core/trunk/osgi-bundle/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml core/trunk/porting-package/pom.xml core/trunk/tests/pom.xml core/trunk/tests/unit-tests.xml Log: fix up POMs Copied: core/trunk/bom (from rev 3936, core/trunk/version-matrix) Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/version-matrix/pom.xml 2009-10-11 19:30:00 UTC (rev 3936) +++ core/trunk/bom/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,15 +1,17 @@ -<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"> +<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> <groupId>org.jboss.weld</groupId> - <artifactId>weld-bom</artifactId> + <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> - <name>Weld BOM</name> + <name>Weld Core BOM</name> <url>http://www.seamframework.org/Weld</url> - <description>Weld "bill of materials" which should be imported by any Weld module or sub project</description> - + <!-- Minimal project metadata, for more see parent/pom.xml --> + <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description> + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -20,16 +22,11 @@ <developers> <developer> - <name>Pete Muir</name> - <id>pmuir</id> - <organization>Red Hat Inc.</organization> - <roles> - <role>Project Lead</role> - </roles> - <email&gt;pmuir(a)redhat.com&lt;/email&gt; + <name>Weld committers</name> </developer> </developers> + <!-- Dependency management, including extra repositories if needed --> <repositories> <repository> <id>repository.jboss.org</id> @@ -43,625 +40,233 @@ </snapshots> </repository> <repository> - <id>oss.sonatype.org</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots/</... - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>repository.jboss.org</id> - <name>JBoss Release Repository</name> - <url>http://repository.jboss.org/maven2</url> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> <releases> - <enabled>true</enabled> + <enabled>false</enabled> </releases> <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots/</... + <releases> <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> </snapshots> </repository> - </pluginRepository> - </pluginRepositories> - + </repositories> + <properties> - <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version> - <weld.version>1.0.0-SNAPSHOT</weld.version> + <weld.api.version>1.0-SNAPSHOT</weld.api.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> - <weld.wicket.version>1.0.0-SNAPSHOT</weld.wicket.version> - <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version> <jetty.version>6.1.21</jetty.version> - <wicket.version>1.4.1</wicket.version> + <tomcat.version>6.0.20</tomcat.version> + <jboss.interceptor.version>1.0.0-SNAPSHOT</jboss.interceptor.version> </properties> - + <dependencyManagement> <dependencies> - - <dependency> - <groupId>org.apache.wicket</groupId> - <artifactId>wicket</artifactId> - <version>${wicket.version}</version> - </dependency> - - <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.atinject</groupId> - <artifactId>inject-tck</artifactId> - <version>1.0.0-PFD-3</version> - </dependency> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - <version>3.0</version> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.scannotation</groupId> - <artifactId>scannotation</artifactId> - <version>1.0.2</version> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.CR3</version> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1.0-PFD-1</version> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> - </dependency> - - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.11.0.GA</version> + <version>${javassist.version}</version> </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> - - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1B</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>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - - <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.1.2-b04</version> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_13</version> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_13</version> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-embedded</artifactId> - <version>1.0.0-Alpha1</version> - <exclusions> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - <exclusion> - <groupId>bsh</groupId> - <artifactId>bsh</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.cluster</groupId> - <artifactId>jboss-ha-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-ejb-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-saaj</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxws</artifactId> - </exclusion> - <exclusion> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <version>3.1.0-Alpha1</version> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - <version>3.1.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.15.B1</version> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>2.1.2-b04</version> - </dependency> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>${weld.version}</version> - </dependency> - - <dependency> <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - <version>${weld.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> - <version>${weld.version}</version> + <version>${weld.core.version}</version> </dependency> <dependency> <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - <version>${weld.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> <artifactId>weld-porting-package</artifactId> - <version>${weld.version}</version> + <version>${weld.core.version}</version> </dependency> - + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-logging</artifactId> - <version>${weld.version}</version> + <version>${weld.core.version}</version> </dependency> - + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-test</artifactId> - <version>${weld.version}</version> + <version>${weld.core.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-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.weld</groupId> - <artifactId>weld-wicket</artifactId> - <version>${weld.wicket.version}</version> - </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> - <version>${jsr299.tck.version}</version> + <version>${cdi.tck.version}</version> </dependency> - + <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> - <version>${jsr299.tck.version}</version> + <version>${cdi.tck.version}</version> </dependency> - + <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>${jboss.test.harness.version}</version> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + <version>${atinject.tck.version}</version> </dependency> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-50</artifactId> - <version>${jboss.test.harness.version}</version> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <version>${jboss.interceptor.version}</version> </dependency> - + + <!-- TODO Move to examples --> <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <version>${jboss.test.harness.version}</version> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> </dependency> - + <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-embedded</artifactId> - <version>${jboss.test.harness.version}</version> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-plus</artifactId> + <version>${jetty.version}</version> </dependency> - + <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-tomcat</artifactId> - <version>${jboss.test.harness.version}</version> + <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>6.0.20</version> + <version>${tomcat.version}</version> </dependency> - + <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>jasper</artifactId> - <version>6.0.20</version> + <version>${tomcat.version}</version> </dependency> - + <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>${google.collections.version}</version> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - </dependency> - + <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>2.4</version> + <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> - <build> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <version>1.0-alpha-1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ejb-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>2.3.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>1.0-alpha-1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>tomcat-maven-plugin</artifactId> - <version>1.0-beta-1</version> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>${jetty.version}</version> - </plugin> - <plugin> - <groupId>org.twdata.maven</groupId> - <artifactId>maven-cli-plugin</artifactId> - <version>0.6.3.CR2</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> - </plugin> - <plugin> - <groupId>com.pyx4j</groupId> - <artifactId>maven-junction-plugin</artifactId> - <version>1.0.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>2.0.9</version> - </requireMavenVersion> - <requirePluginVersions> - <unCheckedPlugins> - <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin> - </unCheckedPlugins> - </requirePluginVersions> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.2</version> - </plugin> - </plugins> - </pluginManagement> - </build> - + <!-- SCM and distribution management --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/versio... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/... - <url>http://fisheye.jboss.org/browse/Weld/ri</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom&... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trun... + <url>http://fisheye.jboss.org/browse/Weld/core</url> </scm> <distributionManagement> - <repository> - <id>jboss-releases</id> - <name>JBoss (Nexus) Release Staging Repository</name> - <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... + <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>jboss-snapshots</id> + <id>oss.sonatype.org/jboss-snapshots</id> <name>JBoss (Nexus) Snapshots Repository</name> <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... </snapshotRepository> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/impl/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,14 +1,15 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> - <version>1.0.0-SNAPSHOT</version> - <name>Weld Core</name> + <name>Weld Core Implementation</name> + <description>Weld's implementation of CDI</description> <dependencies> <dependency> @@ -35,20 +36,6 @@ <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> <optional>true</optional> - <exclusions> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jbossws</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jboss.jbossws</groupId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -98,12 +85,6 @@ </dependency> <dependency> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <optional>true</optional> @@ -128,15 +109,7 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> - - <build> - <defaultGoal>install</defaultGoal> - </build> <profiles> <profile> Modified: core/trunk/inject-tck-runner/pom.xml =================================================================== --- core/trunk/inject-tck-runner/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/inject-tck-runner/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,6 +1,6 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> @@ -8,8 +8,8 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-inject-tck-runner</artifactId> - <name>javax.inject TCK runner for Weld</name> - <description>Aggregates dependencies and run's the javax.inject TCK for Weld</description> + <name>AtInject TCK runner for Weld</name> + <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> <dependencies> Modified: core/trunk/jboss-tck-runner/pom.xml =================================================================== --- core/trunk/jboss-tck-runner/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/jboss-tck-runner/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,6 +1,6 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> @@ -8,8 +8,8 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-jboss-tck-runner</artifactId> - <name>JSR-299 TCK runner for JBoss AS</name> - <description>Aggregates dependencies and run's the JSR-299 TCK on JBoss AS</description> + <name>CDI TCK runner for Weld</name> + <description>Aggregates dependencies and run's the CDI TCK (both standalone and on JBoss AS)</description> <dependencies> <dependency> @@ -37,7 +37,6 @@ <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness-jboss-as-52</artifactId> </dependency> - </dependencies> @@ -268,6 +267,4 @@ </profile> </profiles> - - </project> Modified: core/trunk/logging/pom.xml =================================================================== --- core/trunk/logging/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/logging/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,14 +1,14 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-logging</artifactId> - <version>1.0.0-SNAPSHOT</version> <name>Weld Logging</name> + <description>Weld logging module (to be replaced with slf4j)</description> <dependencies> <dependency> Modified: core/trunk/osgi-bundle/pom.xml =================================================================== --- core/trunk/osgi-bundle/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/osgi-bundle/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -15,7 +15,7 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -24,7 +24,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-osgi-bundle</artifactId> <name>Weld OSGi Bundle</name> - <description>Weld packaged as an OSGi bundle</description> + <description>Weld runtime packaged as an OSGi bundle</description> <developers> <developer> @@ -52,14 +52,12 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.0</version> <configuration> <instructions> <_include>-osgi.bundle</_include> <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_exportcontents>javax.event; javax.context; - javax.weld; javax.decorator; javax.inject; + <_exportcontents>javax.decorator; javax.enterprise.*; version=${osgi.version}, org.jboss.weld.context; org.jboss.weld.ejb; org.jboss.weld.bean; org.jboss.weld.bean.proxy; Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/parent/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,24 +1,51 @@ -<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"> +<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> <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> - + <parent> <groupId>org.jboss.weld</groupId> - <artifactId>weld-version-matrix</artifactId> + <artifactId>weld-core-bom</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../version-matrix</relativePath> + <relativePath>../bom</relativePath> </parent> - <name>Weld, the reference implementation of JSR-299</name> + <name>Weld Core Parent</name> + + <!-- Full metadata --> + <url>http://www.seamframework.org/Weld</url> <description> The reference implementation of JSR 299: Weld </description> + <ciManagement> + <system>Hudson</system> + <url>http://hudson.jboss.org</url> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WELD</url> + </issueManagement> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + <developers> <developer> <name>Pete Muir</name> @@ -38,12 +65,101 @@ <developer> <name>David Allen</name> </developer> - + <developer> <name>Nicklas Karlsson</name> </developer> </developers> + + <properties> + <testng.version>5.9</testng.version> + <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version> + <apache.httpclient.version>3.1</apache.httpclient.version> + <junit.version>4.7</junit.version> + <htmlunit.version>2.4</htmlunit.version> + <glassfish.el.version>2.1.2-b04</glassfish.el.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + + <!-- Specify Weld non-runtime dependencies (e.g. testing) --> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-50</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-embedded</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-tomcat</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${apache.httpclient.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>${htmlunit.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <version>${glassfish.el.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <!-- Configure the build --> <build> <plugins> <plugin> @@ -52,7 +168,6 @@ <executions> <execution> <id>attach-sources</id> - <phase>verify</phase> <goals> <goal>jar</goal> </goals> @@ -63,23 +178,111 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/ri/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> </plugins> <defaultGoal>package</defaultGoal> + <!-- Configure all plugins, including versions to use in the build --> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.0.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.0.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.0-alpha-4</version> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-beta-1</version> + <executions> + <execution> + <id>enforce</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>2.0.9</version> + </requireMavenVersion> + <requirePluginVersions> + <unCheckedPlugins> + <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin> + </unCheckedPlugins> + </requirePluginVersions> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -88,6 +291,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> <configuration> <archive> <manifest> @@ -121,16 +325,8 @@ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <metadataFile>../target/coverage.em</metadataFile> - <outputDirectory>${project.build.directory}/generated-classes</outputDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> + <version>1.4</version> <executions> <execution> <phase>validate</phase> @@ -152,6 +348,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.0-beta-3</version> <executions> <execution> <id>set-build-properties</id> @@ -163,94 +360,17 @@ </executions> <inherited>true</inherited> <configuration> - <!-- If the plugin fails to get the scm revision, set it to "unavailable" --> + <!-- + If the plugin fails to get the scm revision, set it + to "unavailable" + --> <getRevisionOnlyOnce>true</getRevisionOnlyOnce> <revisionOnScmFailure>unavailable</revisionOnScmFailure> <timestampFormat>{0, date, long} {0, time, long}</timestampFormat> </configuration> - </plugin> + </plugin> </plugins> </pluginManagement> </build> - - <profiles> - <profile> - <id>api-coverage</id> - <activation> - <property> - <name>apiCoverage</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <forkMode>once</forkMode> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>emma</groupId> - <artifactId>emma</artifactId> - <version>2.0.5312</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> - - <ciManagement> - <system>Hudson</system> - <url /> - </ciManagement> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WELD</url> - </issueManagement> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - <license> - <name>Lesser Gnu Public License, Version 2.1</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk/parent... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk/... - <url>http://fisheye.jboss.org/browse/Weld/ri</url> - </scm> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <configuration> - <formats> - <format>html</format> - <format>xml</format> - </formats> - <instrumentation> - <ignores> - <ignore>javax.weld.*</ignore> - </ignores> - </instrumentation> - </configuration> - </plugin> - </plugins> - </reporting> - </project> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -2,49 +2,31 @@ 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>org.jboss.weld</groupId> - <artifactId>weld-build-aggregator</artifactId> + <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <name>Weld Build Aggregator</name> + + <!-- Minimal metadata --> <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description> - <url>http://www.seamframework.org/Weld</url> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - - <developers> - <developer> - <name>Pete Muir</name> - <id>pmuir</id> - <organization>Red Hat Inc.</organization> - <roles> - <role>Project Lead</role> - </roles> - <email&gt;pmuir(a)redhat.com&lt;/email&gt; - </developer> - </developers> - + <!-- SCM and distribution management --> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/ri/trunk</co... <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/ri/trunk&... <url>http://fisheye.jboss.org/browse/Weld</url> </scm> + <!-- Needed despite skipping the deployment of this --> <distributionManagement> <repository> - <id>jboss-releases</id> + <id>oss.sonatype.org/jboss-staging</id> <name>Sonatype Nexus Maven Repository</name> <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</ur... </repository> <snapshotRepository> - <id>jboss-snapshots</id> + <id>oss.sonatype.org/jboss-snapshots</id> <name>Sonatype Nexus Snapshot Repository</name> <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... </snapshotRepository> @@ -52,26 +34,13 @@ <profiles> <profile> - <id>apis-only</id> - <modules> - <module>version-matrix</module> - <module>parent</module> - <module>cdi-api</module> - <module>spi</module> - <module>core-api</module> - </modules> - </profile> - <profile> <id>default</id> <activation> <activeByDefault>true</activeByDefault> </activation> <modules> - <module>version-matrix</module> + <module>bom</module> <module>parent</module> - <module>cdi-api</module> - <module>spi</module> - <module>core-api</module> <module>logging</module> <module>impl</module> <module>tests</module> @@ -84,11 +53,8 @@ <profile> <id>skip-tests</id> <modules> - <module>version-matrix</module> + <module>bom</module> <module>parent</module> - <module>cdi-api</module> - <module>spi</module> - <module>core-api</module> <module>logging</module> <module>impl</module> <module>osgi-bundle</module> @@ -96,16 +62,29 @@ </profile> </profiles> - <build>s - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - </plugins> - </pluginManagement> + <!-- Minimal build configuration --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + <configuration> + <goals>deploy</goals> + <arguments>-Prelease</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> + <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.4</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> </build> </project> Modified: core/trunk/porting-package/pom.xml =================================================================== --- core/trunk/porting-package/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/porting-package/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,14 +1,13 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-porting-package</artifactId> - <version>1.0.0-SNAPSHOT</version> - <name>Weld Porting Package for JSR-299 TCK</name> + <name>Weld Porting Package for the CDI TCK</name> <dependencies> <dependency> @@ -25,10 +24,12 @@ <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> + <dependency> <groupId>org.glassfish.web</groupId> <artifactId>el-impl</artifactId> @@ -40,4 +41,5 @@ </dependency> </dependencies> + </project> Modified: core/trunk/tests/pom.xml =================================================================== --- core/trunk/tests/pom.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/tests/pom.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,14 +1,15 @@ <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"> <parent> - <artifactId>weld-parent</artifactId> + <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> + <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-test</artifactId> - <version>1.0.0-SNAPSHOT</version> <name>Weld Core Tests</name> + <description>Tests for Weld, not including the CDI and AtInject TCKs</description> <dependencies> <dependency> @@ -72,21 +73,8 @@ <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> - <exclusions> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jbossws</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-transaction-api</artifactId> - <groupId>org.jboss.javaee</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-jaxrpc</artifactId> - <groupId>jboss.jbossws</groupId> - </exclusion> - </exclusions> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: core/trunk/tests/unit-tests.xml =================================================================== --- core/trunk/tests/unit-tests.xml 2009-10-11 22:47:42 UTC (rev 3938) +++ core/trunk/tests/unit-tests.xml 2009-10-11 22:48:31 UTC (rev 3939) @@ -1,6 +1,6 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > -<suite name="Weld" verbose="3" > +<suite name="Weld" verbose="2" > <test name="Weld"> <method-selectors>