Repository: deltaspike Updated Branches: refs/heads/master 9525d6c65 -> 3a967e95f
DELTASPIKE-929 Temporary workaround for WELD-1892 Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3a967e95 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3a967e95 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3a967e95 Branch: refs/heads/master Commit: 3a967e95f73e7476ecad0726eeef7b5e7b5ddccf Parents: 9525d6c Author: Jozef Hartinger <[email protected]> Authored: Tue Jun 16 15:02:41 2015 +0200 Committer: Jozef Hartinger <[email protected]> Committed: Tue Jun 16 15:06:42 2015 +0200 ---------------------------------------------------------------------- deltaspike/parent/code/pom.xml | 75 ++++++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3a967e95/deltaspike/parent/code/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index 86b5493..fd44088 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -346,18 +346,71 @@ </dependencyManagement> <dependencies> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> + <!-- + This is a temporary workaround for WELD-1892 + We add a dependency on the bom directly. This is ugly but the only option right now to support Weld 1.1.x, 2.x and 3.x without + requiring separate profiles. + --> <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - <scope>provided</scope> + <artifactId>weld-core-bom</artifactId> + <type>pom</type> + <version>${weld.version}</version> + <scope>test</scope> + <exclusions> + <!-- Common --> + <exclusion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + </exclusion> + <exclusion> + <groupId>javax.inject</groupId> + <artifactId>javax.inject-tck</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.weld.se</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>*</artifactId> + </exclusion> + <!-- Weld 1.x --> + <exclusion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-vfs</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <!-- Weld 2.x --> + <exclusion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-jsf</artifactId> + </exclusion> + <!-- Weld 3.x --> + <exclusion> + <groupId>org.jboss.weld.module</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> + <artifactId>weld-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -382,12 +435,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-interceptor_1.1_spec</artifactId> </dependency>
