[weld-commits] Weld SVN: r4123 - in core/branches: 1.0.0-CR1 and 9 other directories.

Author: rogerk Date: 2009-10-15 14:37:51 -0400 (Thu, 15 Oct 2009) New Revision: 4123 Added: core/branches/1.0.0-CR1/ core/branches/1.0.0-CR1/bom/pom.xml core/branches/1.0.0-CR1/impl/pom.xml core/branches/1.0.0-CR1/inject-tck-runner/pom.xml core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml core/branches/1.0.0-CR1/logging/pom.xml core/branches/1.0.0-CR1/osgi-bundle/pom.xml core/branches/1.0.0-CR1/parent/pom.xml core/branches/1.0.0-CR1/pom.xml core/branches/1.0.0-CR1/porting-package/pom.xml core/branches/1.0.0-CR1/tests/pom.xml Removed: core/branches/1.0.0-CR1/bom/pom.xml core/branches/1.0.0-CR1/impl/pom.xml core/branches/1.0.0-CR1/inject-tck-runner/pom.xml core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml core/branches/1.0.0-CR1/logging/pom.xml core/branches/1.0.0-CR1/osgi-bundle/pom.xml core/branches/1.0.0-CR1/parent/pom.xml core/branches/1.0.0-CR1/pom.xml core/branches/1.0.0-CR1/porting-package/pom.xml core/branches/1.0.0-CR1/tests/pom.xml Log: [maven-release-plugin] copy for branch 1.0.0-CR1 Copied: core/branches/1.0.0-CR1 (from rev 4120, core/tags/1.0.0-CR1) Deleted: core/branches/1.0.0-CR1/bom/pom.xml =================================================================== --- core/tags/1.0.0-CR1/bom/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,163 +0,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"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>2</version> - </parent> - - <name>Weld Core BOM</name> - <url>http://www.seamframework.org/Weld</url> - - <!-- 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> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - - <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> - <weld.api.version>1.0-CR1</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-Beta4</cdi.tck.version> - <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> - <jboss.interceptor.version>1.0.0-CR1</jboss.interceptor.version> - </properties> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-api</artifactId> - <version>${cdi.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <version>${cdi.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.atinject</groupId> - <artifactId>inject-tck</artifactId> - <version>${atinject.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - <version>${jboss.interceptor.version}</version> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>${google.collections.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <!-- SCM and distribution management --> - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... - <url>https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/core/bom&... - </scm> - -</project> Copied: core/branches/1.0.0-CR1/bom/pom.xml (from rev 4122, core/tags/1.0.0-CR1/bom/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/bom/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,163 @@ +<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-core-bom</artifactId> + <packaging>pom</packaging> + <version>1.0.0-CR1-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>2</version> + </parent> + + <name>Weld Core BOM</name> + <url>http://www.seamframework.org/Weld</url> + + <!-- 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> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + + <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> + <weld.api.version>1.0-CR1</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-Beta4</cdi.tck.version> + <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> + <jboss.interceptor.version>1.0.0-CR1</jboss.interceptor.version> + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-api</artifactId> + <version>${cdi.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <version>${cdi.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + <version>${atinject.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <version>${jboss.interceptor.version}</version> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>${google.collections.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <!-- SCM and distribution management --> + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</... + </scm> + +</project> Deleted: core/branches/1.0.0-CR1/impl/pom.xml =================================================================== --- core/tags/1.0.0-CR1/impl/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/impl/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,130 +0,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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <name>Weld Core Implementation</name> - <description>Weld's implementation of CDI</description> - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - <!-- WELD-198 --> -<!-- <optional>true</optional>--> - </dependency> - - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - <!-- WELD-198 --> -<!-- <optional>true</optional>--> - </dependency> - - </dependencies> - - <profiles> - <profile> - <id>javax.xml.ws</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> -</project> Copied: core/branches/1.0.0-CR1/impl/pom.xml (from rev 4122, core/tags/1.0.0-CR1/impl/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/impl/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/impl/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,130 @@ +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <name>Weld Core Implementation</name> + <description>Weld's implementation of CDI</description> + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + <!-- WELD-198 --> +<!-- <optional>true</optional>--> + </dependency> + + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <!-- WELD-198 --> +<!-- <optional>true</optional>--> + </dependency> + + </dependencies> + + <profiles> + <profile> + <id>javax.xml.ws</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> +</project> Deleted: core/branches/1.0.0-CR1/inject-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,58 +0,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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-inject-tck-runner</artifactId> - <name>AtInject TCK runner for Weld</name> - <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.atinject</groupId> - <artifactId>inject-tck</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/AtInjectTCK.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/branches/1.0.0-CR1/inject-tck-runner/pom.xml (from rev 4122, core/tags/1.0.0-CR1/inject-tck-runner/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/inject-tck-runner/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,58 @@ +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-inject-tck-runner</artifactId> + <name>AtInject TCK runner for Weld</name> + <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/AtInjectTCK.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,290 +0,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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-jboss-tck-runner</artifactId> - <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> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> - </suiteXmlFiles> - <argLine>-Xmx256m</argLine> - <forkMode>once</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>run</id> - <activation> - <property> - <name>!osgi.bundles.defaultStartLevel</name> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>incontainer-debug</id> - <activation> - <property> - <name>incontainer-debug</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jsr-299-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/jsr299-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml (from rev 4122, core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,290 @@ +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-jboss-tck-runner</artifactId> + <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> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx256m</argLine> + <forkMode>once</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>run</id> + <activation> + <property> + <name>!osgi.bundles.defaultStartLevel</name> + </property> + </activation> + <dependencies> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + </dependency> + + </dependencies> + </profile> + <profile> + <id>incontainer-debug</id> + <activation> + <property> + <name>incontainer-debug</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jsr-299-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/jsr299-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Deleted: core/branches/1.0.0-CR1/logging/pom.xml =================================================================== --- core/tags/1.0.0-CR1/logging/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/logging/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,34 +0,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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - <name>Weld Logging</name> - <description>Weld logging module (to be replaced with slf4j)</description> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <optional>true</optional> - </dependency> - - </dependencies> -</project> Copied: core/branches/1.0.0-CR1/logging/pom.xml (from rev 4122, core/tags/1.0.0-CR1/logging/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/logging/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/logging/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,34 @@ +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + <name>Weld Logging</name> + <description>Weld logging module (to be replaced with slf4j)</description> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <optional>true</optional> + </dependency> + + </dependencies> +</project> Deleted: core/branches/1.0.0-CR1/osgi-bundle/pom.xml =================================================================== --- core/tags/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,146 +0,0 @@ - - <!-- - /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * - Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. * - * Use is subject to license terms. * * Licensed under the Apache - License, Version 2.0 (the "License"); * you may not use this file - except in compliance with the License. * You may obtain a copy of - the License at * http://www.apache.org/licenses/LICENSE-2.0 * - Unless required by applicable law or agreed to in writing, - software * distributed under the License is distributed on an "AS - IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - express or implied. * See the License for the specific language - governing permissions and * limitations under the License. */ - --> -<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-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.jboss.weld</groupId> - <artifactId>weld-osgi-bundle</artifactId> - <name>Weld OSGi Bundle</name> - <description>Weld runtime packaged as an OSGi bundle</description> - - <developers> - <developer> - <id>ss141213</id> - <name>Sanjeeb Sahoo</name> - <url>http://weblogs.dev.java.net/ss141213</url> - <organization>Sun Microsystems, Inc.</organization> - <roles> - <role>developer</role> - </roles> - </developer> - <developer> - <name>Roger Kitain</name> - <id>rogerk</id> - <organization>Sun Microsystems, Inc.</organization> - </developer> - </developers> - - <properties> - <osgi.version>1.0</osgi.version> - </properties> - <build> - <plugins> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <_include>-osgi.bundle</_include> - - <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_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; - org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; - org.jboss.weld.conversation; org.jboss.weld; - org.jboss.weld.bootstrap; - org.jboss.weld.introspector; - org.jboss.weld.servlet; version=${osgi.version}, - org.jboss.weld.el; version=${osgi.version}, - org.jboss.weld.jsf; include:="WeldPhaseListener"; - version=${osgi.version}, - javassist.util.proxy;version="3.8.1.GA" - </_exportcontents> - <Import-Package>javax.annotation, javax.interceptor, - *;resolution:=optional</Import-Package> - <Private-Package>!javax.annotation.*, - !javax.interceptor.*</Private-Package> - </instructions> - <!-- - Maven uses the output directory (target/classes) - rather than the final bundle, when compiling against - projects in the same reactor (ie. the same build). - Since this jar comprises of classes that come from - some other jar and other modules may depend on this - artifact, we need to unpack. - --> - <unpackBundle>true</unpackBundle> - </configuration> - <executions> - <execution> - <id>osgi-bundle</id> - <goals> - <goal>bundle</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - - </dependencies> - -</project> - Copied: core/branches/1.0.0-CR1/osgi-bundle/pom.xml (from rev 4122, core/tags/1.0.0-CR1/osgi-bundle/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/osgi-bundle/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,146 @@ + + <!-- + /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * + Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. * + * Use is subject to license terms. * * Licensed under the Apache + License, Version 2.0 (the "License"); * you may not use this file + except in compliance with the License. * You may obtain a copy of + the License at * http://www.apache.org/licenses/LICENSE-2.0 * + Unless required by applicable law or agreed to in writing, + software * distributed under the License is distributed on an "AS + IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + express or implied. * See the License for the specific language + governing permissions and * limitations under the License. */ + --> +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.weld</groupId> + <artifactId>weld-osgi-bundle</artifactId> + <name>Weld OSGi Bundle</name> + <description>Weld runtime packaged as an OSGi bundle</description> + + <developers> + <developer> + <id>ss141213</id> + <name>Sanjeeb Sahoo</name> + <url>http://weblogs.dev.java.net/ss141213</url> + <organization>Sun Microsystems, Inc.</organization> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Roger Kitain</name> + <id>rogerk</id> + <organization>Sun Microsystems, Inc.</organization> + </developer> + </developers> + + <properties> + <osgi.version>1.0</osgi.version> + </properties> + <build> + <plugins> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <_include>-osgi.bundle</_include> + + <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> + <_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; + org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; + org.jboss.weld.conversation; org.jboss.weld; + org.jboss.weld.bootstrap; + org.jboss.weld.introspector; + org.jboss.weld.servlet; version=${osgi.version}, + org.jboss.weld.el; version=${osgi.version}, + org.jboss.weld.jsf; include:="WeldPhaseListener"; + version=${osgi.version}, + javassist.util.proxy;version="3.8.1.GA" + </_exportcontents> + <Import-Package>javax.annotation, javax.interceptor, + *;resolution:=optional</Import-Package> + <Private-Package>!javax.annotation.*, + !javax.interceptor.*</Private-Package> + </instructions> + <!-- + Maven uses the output directory (target/classes) + rather than the final bundle, when compiling against + projects in the same reactor (ie. the same build). + Since this jar comprises of classes that come from + some other jar and other modules may depend on this + artifact, we need to unpack. + --> + <unpackBundle>true</unpackBundle> + </configuration> + <executions> + <execution> + <id>osgi-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + + </dependencies> + +</project> + Deleted: core/branches/1.0.0-CR1/parent/pom.xml =================================================================== --- core/tags/1.0.0-CR1/parent/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/parent/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,167 +0,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"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-parent</artifactId> - <packaging>pom</packaging> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../bom</relativePath> - </parent> - - <name>Weld Core Parent</name> - - <!-- Full metadata --> - - <url>http://www.seamframework.org/Weld</url> - - <description> - Parent for 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> - <roles> - <role>Project Lead</role> - </roles> - <email&gt;pete.muir(a)jboss.org&lt;/email&gt; - <organization>JBoss, a division of Red Hat</organization> - <url>http://in.relation.to/Bloggers/Pete</url> - </developer> - - <developer> - <name>Shane Bryzak</name> - <organization>JBoss, a division of Red Hat</organization> - </developer> - - <developer> - <name>David Allen</name> - </developer> - - <developer> - <name>Nicklas Karlsson</name> - </developer> - </developers> - - - <properties> - <glassfish.el.version>2.1.2-b04</glassfish.el.version> - <log4j.version>1.2.14</log4j.version> - <!-- Testing deps --> - <testng.version>5.9</testng.version> - <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> - <apache.httpclient.version>3.1</apache.httpclient.version> - <junit.version>4.7</junit.version> - <htmlunit.version>2.4</htmlunit.version> - </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> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - -</project> Copied: core/branches/1.0.0-CR1/parent/pom.xml (from rev 4122, core/tags/1.0.0-CR1/parent/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/parent/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/parent/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,167 @@ +<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-core-parent</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../bom</relativePath> + </parent> + + <name>Weld Core Parent</name> + + <!-- Full metadata --> + + <url>http://www.seamframework.org/Weld</url> + + <description> + Parent for 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> + <roles> + <role>Project Lead</role> + </roles> + <email&gt;pete.muir(a)jboss.org&lt;/email&gt; + <organization>JBoss, a division of Red Hat</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + + <developer> + <name>Shane Bryzak</name> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <developer> + <name>David Allen</name> + </developer> + + <developer> + <name>Nicklas Karlsson</name> + </developer> + </developers> + + + <properties> + <glassfish.el.version>2.1.2-b04</glassfish.el.version> + <log4j.version>1.2.14</log4j.version> + <!-- Testing deps --> + <testng.version>5.9</testng.version> + <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> + <apache.httpclient.version>3.1</apache.httpclient.version> + <junit.version>4.7</junit.version> + <htmlunit.version>2.4</htmlunit.version> + </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> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + +</project> Deleted: core/branches/1.0.0-CR1/pom.xml =================================================================== --- core/tags/1.0.0-CR1/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,78 +0,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"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-build-aggregator</artifactId> - <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>2</version> - </parent> - - <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> - - <!-- SCM and distribution management --> - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.... - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... - <url>https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</url> - </scm> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>bom</module> - <module>parent</module> - <module>logging</module> - <module>impl</module> - <module>tests</module> - <module>porting-package</module> - <module>inject-tck-runner</module> - <module>jboss-tck-runner</module> - <module>osgi-bundle</module> - </modules> - </profile> - <profile> - <id>skip-tests</id> - <modules> - <module>bom</module> - <module>parent</module> - <module>logging</module> - <module>impl</module> - <module>osgi-bundle</module> - </modules> - </profile> - </profiles> - - <!-- 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/core/tags</tagBase> - <!-- As we need access to our own artifacts --> - <preparationGoals>install</preparationGoals> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/branches/1.0.0-CR1/pom.xml (from rev 4122, core/tags/1.0.0-CR1/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,78 @@ +<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-core-build-aggregator</artifactId> + <packaging>pom</packaging> + <version>1.0.0-CR1-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>2</version> + </parent> + + <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> + + <!-- SCM and distribution management --> + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR... + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/bran... + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> + </scm> + + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>bom</module> + <module>parent</module> + <module>logging</module> + <module>impl</module> + <module>tests</module> + <module>porting-package</module> + <module>inject-tck-runner</module> + <module>jboss-tck-runner</module> + <module>osgi-bundle</module> + </modules> + </profile> + <profile> + <id>skip-tests</id> + <modules> + <module>bom</module> + <module>parent</module> + <module>logging</module> + <module>impl</module> + <module>osgi-bundle</module> + </modules> + </profile> + </profiles> + + <!-- 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/core/tags</tagBase> + <!-- As we need access to our own artifacts --> + <preparationGoals>install</preparationGoals> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/branches/1.0.0-CR1/porting-package/pom.xml =================================================================== --- core/tags/1.0.0-CR1/porting-package/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,46 +0,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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <name>Weld Porting Package for the CDI TCK</name> - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <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> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - </dependency> - - </dependencies> - -</project> Copied: core/branches/1.0.0-CR1/porting-package/pom.xml (from rev 4122, core/tags/1.0.0-CR1/porting-package/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/porting-package/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,46 @@ +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <name>Weld Porting Package for the CDI TCK</name> + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <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> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + </dependency> + + </dependencies> + +</project> Deleted: core/branches/1.0.0-CR1/tests/pom.xml =================================================================== --- core/tags/1.0.0-CR1/tests/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/tests/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,265 +0,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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <name>Weld Core Tests</name> - <description>Tests for Weld, not including the CDI and AtInject TCKs</description> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - </dependency> - - </dependencies> - - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <classpathScope>test</classpathScope> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/test-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> Copied: core/branches/1.0.0-CR1/tests/pom.xml (from rev 4122, core/tags/1.0.0-CR1/tests/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/tests/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/tests/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,265 @@ +<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-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <name>Weld Core Tests</name> + <description>Tests for Weld, not including the CDI and AtInject TCKs</description> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + </dependency> + + </dependencies> + + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-test-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <classpathScope>test</classpathScope> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/test-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project>