Author: pete.muir(a)jboss.org Date: 2009-10-11 20:03:37 -0400 (Sun, 11 Oct 2009) New Revision: 3943 Modified: cdi-tck/trunk/api/pom.xml cdi-tck/trunk/impl/pom.xml cdi-tck/trunk/pom.xml Log: various fixes Modified: cdi-tck/trunk/api/pom.xml =================================================================== --- cdi-tck/trunk/api/pom.xml 2009-10-11 23:32:25 UTC (rev 3942) +++ cdi-tck/trunk/api/pom.xml 2009-10-12 00:03:37 UTC (rev 3943) @@ -29,8 +29,8 @@ <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> <packaging>jar</packaging> - <name>JSR-299 TCK API</name> - <url>http://www.seamframework.org/Weld</url> + <name>CDI TCK Porting Package API</name> + <description>Porting Package APIs for CDI TCK</description> <dependencies> @@ -43,6 +43,11 @@ <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness-api</artifactId> </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> </dependencies> <build> Modified: cdi-tck/trunk/impl/pom.xml =================================================================== --- cdi-tck/trunk/impl/pom.xml 2009-10-11 23:32:25 UTC (rev 3942) +++ cdi-tck/trunk/impl/pom.xml 2009-10-12 00:03:37 UTC (rev 3943) @@ -1,5 +1,6 @@ <?xml version="1.0"?> -<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"> <parent> <artifactId>jsr299-tck-parent</artifactId> <groupId>org.jboss.jsr299.tck</groupId> @@ -8,8 +9,10 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-impl</artifactId> - <name>JSR-299 TCK tests and harness</name> - + <name>CDI TCK tests</name> + + <description>CDI TCK tests</description> + <dependencies> <dependency> @@ -21,7 +24,7 @@ <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> </dependency> - + <dependency> <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness</artifactId> @@ -37,51 +40,37 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> - + <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> - + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> </dependency> - + <dependency> - <groupId>org.jboss.test-audit</groupId> - <artifactId>jboss-test-audit-api</artifactId> - </dependency> + <groupId>org.jboss.test-audit</groupId> + <artifactId>jboss-test-audit-api</artifactId> + </dependency> <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>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> </dependency> - + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> @@ -106,22 +95,22 @@ <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> </dependency> - + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> - + <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> - + <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> @@ -130,7 +119,7 @@ </dependencies> <build> - <defaultGoal>install</defaultGoal> + <defaultGoal>install</defaultGoal> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -196,32 +185,32 @@ </plugin> </plugins> </build> - + <profiles> <profile> <id>tck-audit</id> <activation> - <property> - <name>tck-audit</name> - </property> - </activation> + <property> + <name>tck-audit</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.jboss.test-audit</groupId> <artifactId>jboss-test-audit-impl</artifactId> </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> <configuration> <source>1.5</source> <target>1.5</target> <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit-cdi.xml,${basedir}/src/main/resources/tck-audit-mb.xml,${basedir}/src/main/resources/tck-audit-int.xml</compilerArgument> </configuration> - </plugin> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> @@ -283,17 +272,17 @@ <file>../target/coverage-mb.html</file> <type>html</type> <classifier>coverage-mb</classifier> - </artifact> + </artifact> </artifacts> </configuration> </execution> </executions> </plugin> - </plugins> - <defaultGoal>compile</defaultGoal> - </build> + </plugins> + <defaultGoal>compile</defaultGoal> + </build> </profile> - + <profile> <id>write-artifacts-to-disk</id> <activation> @@ -309,9 +298,9 @@ <executions> <execution> <id>generate-jsr-299-artifacts</id> - <phase>package</phase> + <phase>package</phase> <goals> - <goal>java</goal> + <goal>java</goal> </goals> </execution> </executions> @@ -336,20 +325,20 @@ </plugins> </build> </profile> - - <profile> + + <profile> <id>javax.xml.ws</id> <activation> - <jdk>1.5</jdk> + <jdk>1.5</jdk> </activation> <dependencies> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> </dependencies> </profile> - </profiles> + </profiles> </project> Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-11 23:32:25 UTC (rev 3942) +++ cdi-tck/trunk/pom.xml 2009-10-12 00:03:37 UTC (rev 3943) @@ -5,20 +5,22 @@ <artifactId>jsr299-tck-parent</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> - <name>JSR-299 TCK</name> + <name>CDI TCK</name> + + <!-- Metadata --> <url>http://www.seamframework.org/Weld</url> <developers> <developer> <name>Pete Muir</name> <email&gt;pete.muir(a)jboss.org&lt;/email&gt; - <organization>JBoss, a division of Red Hat</organization> + <organization>Red Hat Inc.</organization> <url>http://in.relation.to/Bloggers/Pete</url> </developer> <developer> <name>Shane Bryzak</name> - <organization>JBoss, a division of Red Hat</organization> + <organization>Red Hat Inc.</organization> </developer> <developer> @@ -32,10 +34,65 @@ <developer> <name>Jozef Hartinger</name> <email&gt;jharting(a)redhat.com&lt;/email&gt; - <organization>JBoss, a division of Red Hat</organization> + <organization>Red Hat Inc.</organization> </developer> </developers> + + <ciManagement> + <system>Hudson</system> + <url /> + </ciManagement> + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WBTCK</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> + </licenses> + + <modules> + <module>api</module> + <module>impl</module> + </modules> + + <properties> + <jsr299.tck.version>${project.version}</jsr299.tck.version> + <jboss.test.audit.version>1.1.0-SNAPSHOT</jboss.test.audit.version> + <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <testng.version>5.8</testng.version> + <jsr250.api.version>1.0</jsr250.api.version> + <cdi.api.version>1.0-SNAPSHOT</cdi.api.version> + <atinject.api.version>1.0-PFD-1</atinject.api.version> + <ejb.api.version>3.1.0-Alpha1</ejb.api.version> + <jsr250.api.version>1.0</jsr250.api.version> + <jpa.api.version>1.0</jpa.api.version> + <validation.api.version>1.0.0.GA</validation.api.version> + <servlet.api.version>2.5</servlet.api.version> + <jsp.api.version>2.1</jsp.api.version> + <jstl.api.version>1.2</jstl.api.version> + <jta.api.version>1.0.1B</jta.api.version> + <jms.api.version>1.1</jms.api.version> + <uel.api.version>2.1.2-b04</uel.api.version> + <jsf.api.version>1.2_13</jsf.api.version> + <jaxws.api.version>2.1</jaxws.api.version> + <interceptor.api.version>3.1.0-SNAPSHOT</interceptor.api.version> + <log4j.version>1.2.14</log4j.version> + <jws.api.version>1.0-MR1</jws.api.version> + <apache.httpclient.version>3.1</apache.httpclient.version> + <htmlunit.version>2.4</htmlunit.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> + + <!-- Dependency management --> + <repositories> <repository> <id>repository.jboss.org</id> @@ -54,167 +111,181 @@ <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</u... + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> </repositories> - <pluginRepositories> - <pluginRepository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/maven2</url> - </pluginRepository> - </pluginRepositories> - - <modules> - <module>api</module> - <module>impl</module> - </modules> - - <properties> - <jboss.test.audit.version>1.0.0-SNAPSHOT</jboss.test.audit.version> - <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version> - </properties> - <dependencyManagement> <dependencies> + <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - </dependency> - <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.8</version> + <version>${testng.version}</version> <classifier>jdk15</classifier> </dependency> + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> - <version>1.0</version> + <version>${jsr250.api.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> + <version>${jsp.api.version}</version> </dependency> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1.0-PFD-1</version> + <version>${atinject.api.version}</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.0.1B</version> + <version>${jta.api.version}</version> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>${log4j.version}</version> </dependency> + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>2.1.2-b04</version> + <version>${uel.api.version}</version> </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_10</version> + <version>${jsf.api.version}</version> </dependency> + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.CR3</version> + <version>${validation.api.version}</version> </dependency> + <dependency> <groupId>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId> - <version>2.1</version> + <version>${jaxws.api.version}</version> </dependency> + <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${cdi.api.version}</version> </dependency> + <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> - <version>${project.version}</version> + <version>${jsr299.tck.version}</version> </dependency> + <dependency> <groupId>org.jboss.test-audit</groupId> <artifactId>jboss-test-audit-api</artifactId> <version>${jboss.test.audit.version}</version> </dependency> + <dependency> <groupId>org.jboss.test-audit</groupId> <artifactId>jboss-test-audit-impl</artifactId> <version>${jboss.test.audit.version}</version> </dependency> + <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> - <version>3.1.0-Alpha1</version> - <exclusions> - <exclusion> - </exclusion> - </exclusions> + <version>${ejb.api.version}</version> + <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>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor-api</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>${interceptor.api.version}</version> </dependency> + <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> + <version>${jws.api.version}</version> </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> - <version>1.0</version> + <version>${jpa.api.version}</version> </dependency> + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.1</version> + <version>${apache.httpclient.version}</version> </dependency> + <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> - <version>2.4</version> + <version>${htmlunit.version}</version> </dependency> + <dependency> <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness-api</artifactId> <version>${jboss.test.harness.version}</version> </dependency> + <dependency> <groupId>org.jboss.test-harness</groupId> <artifactId>jboss-test-harness</artifactId> <version>${jboss.test.harness.version}</version> </dependency> + </dependencies> </dependencyManagement> <build> <defaultGoal>install</defaultGoal> - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - </extensions> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -257,6 +328,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> <configuration> <archive> <manifest> @@ -281,14 +353,9 @@ <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> + <version>2.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -298,12 +365,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.2</version> + <version>2.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-6</version> + <version>2.0.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -313,17 +380,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> + <version>2.4.1</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> + <version>2.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -339,11 +401,16 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-4</version> - </plugin> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.0-alpha-4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-4</version> + <version>1.0-beta-1</version> <executions> <execution> <id>enforce</id> @@ -353,7 +420,7 @@ <configuration> <rules> <requireMavenVersion> - <version>2.0.9</version> + <version>2.0.10</version> </requireMavenVersion> <requirePluginVersions> <unCheckedPlugins> @@ -385,55 +452,29 @@ </build> <profiles> + <!-- The release profile --> <profile> - <id>assembly</id> - <properties> - <tck-audit>true</tck-audit> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <finalName>jsr299-tck-dist-${project.version}</finalName> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> + <id>release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> <goals> - <goal>single</goal> + <goal>sign</goal> </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> - - <ciManagement> - <system>Hudson</system> - <url /> - </ciManagement> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WBTCK</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> - </licenses> - <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk&l... <developerConnection> @@ -443,15 +484,15 @@ </scm> <distributionManagement> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Releases Repository</name> - <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</ur... + <repository> + <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>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>Sonatype Nexus Snapshot Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... </snapshotRepository> </distributionManagement>