Author: pete.muir(a)jboss.org Date: 2009-10-12 09:06:22 -0400 (Mon, 12 Oct 2009) New Revision: 3949 Modified: cdi-tck/trunk/impl/pom.xml cdi-tck/trunk/pom.xml Log: use parent pom Modified: cdi-tck/trunk/impl/pom.xml =================================================================== --- cdi-tck/trunk/impl/pom.xml 2009-10-12 13:03:03 UTC (rev 3948) +++ cdi-tck/trunk/impl/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) @@ -124,7 +124,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>attach-artifacts</id> Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-12 13:03:03 UTC (rev 3948) +++ cdi-tck/trunk/pom.xml 2009-10-12 13:06:22 UTC (rev 3949) @@ -1,12 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<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.jsr299.tck</groupId> <artifactId>jsr299-tck-parent</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <name>CDI TCK</name> - + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <!-- Metadata --> <url>http://www.seamframework.org/Weld</url> @@ -26,18 +33,18 @@ <developer> <name>David Allen</name> </developer> - + <developer> <name>Nicklas Karlsson</name> </developer> - + <developer> <name>Jozef Hartinger</name> <email&gt;jharting(a)redhat.com&lt;/email&gt; <organization>Red Hat Inc.</organization> </developer> </developers> - + <ciManagement> <system>Hudson</system> <url /> @@ -56,12 +63,12 @@ <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> @@ -90,7 +97,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> - + <!-- Dependency management --> <repositories> @@ -112,117 +119,117 @@ </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> + <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> <dependencyManagement> <dependencies> - + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${testng.version}</version> <classifier>jdk15</classifier> </dependency> - + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <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>${jsp.api.version}</version> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>${jsp.api.version}</version> </dependency> - + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> <version>${atinject.api.version}</version> </dependency> - + <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> <version>${jta.api.version}</version> </dependency> - + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> </dependency> - + <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>${uel.api.version}</version> </dependency> - + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>${jsf.api.version}</version> </dependency> - + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <version>${validation.api.version}</version> </dependency> - + <dependency> <groupId>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId> <version>${jaxws.api.version}</version> </dependency> - + <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <version>${cdi.api.version}</version> </dependency> - + <dependency> <groupId>org.jboss.jsr299.tck</groupId> <artifactId>jsr299-tck-api</artifactId> <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>${ejb.api.version}</version> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <version>${ejb.api.version}</version> <exclusions> <exclusion> <artifactId>jboss-jaxrpc</artifactId> @@ -238,242 +245,67 @@ </exclusion> </exclusions> </dependency> - + <dependency> <groupId>org.jboss.interceptor</groupId> <artifactId>jboss-interceptor-api</artifactId> <version>${interceptor.api.version}</version> </dependency> - + <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>${jws.api.version}</version> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>${jws.api.version}</version> </dependency> - + <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>${jpa.api.version}</version> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>${jpa.api.version}</version> </dependency> - + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>${apache.httpclient.version}</version> </dependency> - + <dependency> <groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId> <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> - + + <!-- Configure the build --> <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/cdi-tck/tags</tagBase> - <autoVersionSubmodules>true</autoVersionSubmodules> - <allowTimestampedSnapshots>true</allowTimestampedSnapshots> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> <pluginManagement> <plugins> <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> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.2</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </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.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.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-assembly-plugin</artifactId> - <version>2.2-beta-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.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.10</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-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> <configuration> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> - </classpathContainers> + <tagBase>https://svn.jboss.org/repos/weld/cdi-tck/tags</tagBase> + <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> - </plugins> </pluginManagement> </build> - - <profiles> - <!-- The release profile --> - <profile> - <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>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk&l... @@ -495,5 +327,5 @@ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</u... </snapshotRepository> </distributionManagement> - + </project>