[weld-commits] Weld SVN: r6651 - cdi-api/trunk/trunk.

Author: pete.muir(a)jboss.org Date: 2010-07-14 18:44:37 -0400 (Wed, 14 Jul 2010) New Revision: 6651 Added: cdi-api/trunk/trunk/src/ Removed: cdi-api/trunk/trunk/bom/ cdi-api/trunk/trunk/cdi/ cdi-api/trunk/trunk/parent/ Modified: cdi-api/trunk/trunk/pom.xml Log: flatten out structure Modified: cdi-api/trunk/trunk/pom.xml =================================================================== --- cdi-api/trunk/trunk/pom.xml 2010-07-14 22:42:31 UTC (rev 6650) +++ cdi-api/trunk/trunk/pom.xml 2010-07-14 22:44:37 UTC (rev 6651) @@ -1,8 +1,174 @@ +<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> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <packaging>jar</packaging> + + <name>CDI APIs</name> + <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</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> + + + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.1_spec</artifactId> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/cdi&l... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk... + <url>http://fisheye.jboss.org/browse/weld/api/trunk/cdi</url> + </scm> + + +</project> <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> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../bom/pom.xml</relativePath> + </parent> <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-build-aggregator</artifactId> + <artifactId>weld-api-parent</artifactId> <packaging>pom</packaging> + + <name>Weld and CDI APIs Parent</name> + + + <!-- Full project metadata --> + <url>http://www.seamframework.org/Weld</url> + + <description> + APIs for CDI and Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE + </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> + <id>pmuir</id> + <organization>Red Hat Inc.</organization> + <roles> + <role>Project Lead</role> + </roles> + <email&gt;pmuir(a)redhat.com&lt;/email&gt; + </developer> + + <developer> + <name>Shane Bryzak</name> + <organization>Red Hat Inc.</organization> + </developer> + + <developer> + <name>David Allen</name> + </developer> + + <developer> + <name>Nicklas Karlsson</name> + </developer> + </developers> + + <!-- Configure non-API dependencies (e.g. testing)--> + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + </dependency> + + </dependencies> + </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/paren... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk... + <url>http://fisheye.jboss.org/browse/weld/api/trunk/parent</url> + </scm> + + +</project> +<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-api-bom</artifactId> + <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> <parent> @@ -11,44 +177,224 @@ <version>12</version> </parent> - <name>Weld and CDI APIs Build Aggregator</name> + <name>Weld and CDI APIs BOM</name> <!-- Minimal project metadata, for more see parent/pom.xml --> - <description>The build aggregator for Weld and the CDI APIs, which takes care of calling the modules which make up Weld and CDI APIs</description> - <!-- SCM and Distribution management --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk</c... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk... - <url>http://fisheye.jboss.org/browse/Weld</url> - </scm> + <description>Weld and CDI APIs "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the developer APIs and SPIs, as well as container integrator SPIs</description> - <modules> - <module>bom</module> - <module>parent</module> - <module>cdi</module> - <module>weld</module> - <module>weld-spi</module> - </modules> + <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> - <!-- Minimal build configuration --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/api/tags</tagBase> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> + <developers> + <developer> + <name>Weld committers</name> + </developer> + </developers> + <!-- Dependency management, including extra repositories if needed --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Release Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <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</u... + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + + <properties> + <atinject.api.version>1</atinject.api.version> + <ejb.api.version>3.1.0</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.1</jta.api.version> + <jms.api.version>1.1</jms.api.version> + <uel.api.version>2.2</uel.api.version> + <!-- Stick with JSF API 1.2 to preserve backwards compatibility with JSF 1.2 - we don't need any JSF 2 features --> + <jsf.api.version>1.2_13</jsf.api.version> + <jaxws.api.version>2.1</jaxws.api.version> + <interceptor.api.version>1.0.0.Beta1</interceptor.api.version> + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>${jsr250.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>${jpa.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>${validation.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>${atinject.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>${jsp.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>${jstl.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>${jta.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>${jms.api.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> + + <!-- + TODO replace with javax.ejb:ejb-api:3.1 once the JCP/Sun + publish this + --> + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <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> + + <!-- + TODO replace with javax.interceptor:interceptor-api:3.1 once + the JCP/Sun publish this + --> + <dependency> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.1_spec</artifactId> + <version>${interceptor.api.version}</version> + </dependency> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.api.version}</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/bom&l... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk... + <url>http://fisheye.jboss.org/browse/weld/api/trunk/bom</url> + </scm> + </project> Copied: cdi-api/trunk/trunk/src (from rev 6649, cdi-api/trunk/trunk/cdi/src)