You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/07/06 22:10:24 UTC

git commit: DELTASPIKE-224 remove weld-pom from jbossas profiles

Updated Branches:
  refs/heads/master 62876d088 -> 35af48a96


DELTASPIKE-224 remove weld-pom from jbossas profiles

It seems there is a mismatch between weld and as versions internally.


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/35af48a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/35af48a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/35af48a9

Branch: refs/heads/master
Commit: 35af48a96e2aeec221cb6451eb5b340656af63f0
Parents: 62876d0
Author: Mark Struberg <st...@apache.org>
Authored: Fri Jul 6 22:09:23 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Fri Jul 6 22:09:23 2012 +0200

----------------------------------------------------------------------
 deltaspike/parent/code/pom.xml |   46 +++++++++++++---------------------
 1 files changed, 18 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/35af48a9/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 980232d..75dc75a 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -319,24 +319,19 @@
              -->
             <id>jbossas-managed-7</id>
 
-            <dependencyManagement>
-                <dependencies><!-- org.jboss.weld -->
-                    <dependency>
-                        <groupId>org.jboss.weld</groupId>
-                        <artifactId>weld-core-bom</artifactId>
-                        <version>${weld.version}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.weld</groupId>
-                    <artifactId>weld-api</artifactId>
+                    <groupId>javax.enterprise</groupId>
+                    <artifactId>cdi-api</artifactId>
+                    <version>1.0-SP4</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.inject</groupId>
+                    <artifactId>javax.inject</artifactId>
+                    <version>1</version>
                     <scope>provided</scope>
                 </dependency>
-
                 <dependency>
                     <groupId>org.jboss.as</groupId>
                     <artifactId>jboss-as-arquillian-container-managed</artifactId>
@@ -396,22 +391,17 @@
              *
              -->
             <id>jbossas-build-managed-7</id>
-
-            <dependencyManagement>
-                <dependencies><!-- org.jboss.weld -->
-                    <dependency>
-                        <groupId>org.jboss.weld</groupId>
-                        <artifactId>weld-core-bom</artifactId>
-                        <version>${weld.version}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.weld</groupId>
-                    <artifactId>weld-api</artifactId>
+                    <groupId>javax.enterprise</groupId>
+                    <artifactId>cdi-api</artifactId>
+                    <version>1.0-SP4</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.inject</groupId>
+                    <artifactId>javax.inject</artifactId>
+                    <version>1</version>
                     <scope>provided</scope>
                 </dependency>
                 <dependency>