Navigation Menu

Skip to content

Commit

Permalink
ARQ-1793 Remove import of weld-bom from adapters
Browse files Browse the repository at this point in the history 
Importing weld-bom cause multiple different versions of
Arquillian Core artifacts to be pulled in.
  • Loading branch information
@aslakknutsen
aslakknutsen committed Jun 12, 2014
1 parent fedc88e commit f10efb0
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 79 deletions.
11 changes: 10 additions & 1 deletion pom.xml
View file
Expand Up @@ -30,8 +30,17 @@
<properties>

<!-- Versioning -->
<version.arquillian_core>1.0.2.Final</version.arquillian_core>
<version.arquillian_core>1.1.4.Final</version.arquillian_core>

<version.weld_api_1>1.0-SP1</version.weld_api_1>
<version.weld_core_1>1.0.1-SP4</version.weld_core_1>

<version.weld_api_1_1>2.0.Final</version.weld_api_1_1>
<version.weld_core_1_1>1.1.17.SP3</version.weld_core_1_1>

<version.weld_api_2>2.2.SP1</version.weld_api_2>
<version.weld_core_2>2.2.1.Final</version.weld_core_2>

<!-- override from parent -->
<maven.compiler.argument.target>1.5</maven.compiler.argument.target>
<maven.compiler.argument.source>1.5</maven.compiler.argument.source>
Expand Down
73 changes: 36 additions & 37 deletions weld-ee-embedded-1.1/pom.xml
View file
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<!-- Parent -->
<parent>
Expand All @@ -20,11 +21,14 @@

<!-- Properties -->
<properties>
<weld-core-1_1.version>1.1.13.Final</weld-core-1_1.version>
<weld-core-2.version>2.0.0.Final</weld-core-2.version>
<weld-api.version>2.0.Final</weld-api.version>
<javax.el.version>3.0-b08</javax.el.version>
<cdi.api.version>1.1</cdi.api.version>

<jboss.spec.ejb.version>1.0.2.Final</jboss.spec.ejb.version>
<jboss.spec.servlet.version>1.0.2.Final</jboss.spec.servlet.version>
<validation.api.version>1.0.0.GA</validation.api.version>
<jpa.api.version>1.0</jpa.api.version>
<jta.api.version>1.1</jta.api.version>
</properties>

<!-- Dependencies -->
Expand Down Expand Up @@ -61,6 +65,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
<version>${weld-core.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -81,30 +86,35 @@
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>${jboss.spec.servlet.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${validation.api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
<version>${jta.api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>${jpa.api.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
<version>${jboss.spec.ejb.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -114,6 +124,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -139,47 +150,35 @@
<profiles>
<profile>
<id>1.1.x</id>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<version>${weld-core-1_1.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<weld-api.version>${version.weld_api_1_1}</weld-api.version>
<weld-core.version>${version.weld_core_1_1}</weld-core.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/WeldEmbeddedCDIProviderTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/WeldEmbeddedCDIProviderTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>2.x</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<version>${weld-core-2.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<weld-api.version>${version.weld_api_2}</weld-api.version>
<weld-core.version>${version.weld_core_2}</weld-core.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
</profile>
</profiles>
</project>
39 changes: 13 additions & 26 deletions weld-se-embedded-1.1/pom.xml
View file
Expand Up @@ -22,11 +22,8 @@
<properties>

<!-- Versioning -->
<weld-core-1_1.version>1.1.13.Final</weld-core-1_1.version>
<weld-core-2.version>2.0.0.Final</weld-core-2.version>
<weld-api.version>2.0.Final</weld-api.version>
<javax.el.version>3.0-b08</javax.el.version>
<cdi.api.version>1.1</cdi.api.version>
<javax.el.version>3.0-b08</javax.el.version>

</properties>

Expand Down Expand Up @@ -69,6 +66,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
<version>${weld-core.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -90,6 +88,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -110,17 +109,11 @@
<profiles>
<profile>
<id>1.1.x</id>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<version>${weld-core-1_1.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<weld-api.version>${version.weld_api_1_1}</weld-api.version>
<weld-core.version>${version.weld_core_1_1}</weld-core.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
<build>
<plugins>
<plugin>
Expand All @@ -140,17 +133,11 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<version>${weld-core-2.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<weld-api.version>${version.weld_api_2}</weld-api.version>
<weld-core.version>${version.weld_core_2}</weld-core.version>
<slf4j.version>1.7.2</slf4j.version>
</properties>
</profile>
</profiles>
</project>
21 changes: 6 additions & 15 deletions weld-se-embedded-1/pom.xml
View file
Expand Up @@ -21,24 +21,11 @@
<!-- Properties -->
<properties>

<!-- Versioning -->
<version.weld_core>1.0.1-SP4</version.weld_core>
<javax.el.version>2.2</javax.el.version>
<slf4j.version>1.5.10</slf4j.version>

</properties>

<dependencyManagement>
<dependencies>
<!-- org.jboss.weld -->
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<version>${version.weld_core}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<!-- Dependencies -->
<dependencies>

Expand Down Expand Up @@ -66,24 +53,28 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
<version>${version.weld_api_1}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
<version>${version.weld_core_1}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>${javax.el.version}</version>
<scope>provided</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>

Expand Down

0 comments on commit f10efb0

Please sign in to comment.