You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/09/02 22:41:56 UTC
svn commit: r1622115 - in /myfaces/core/trunk: impl/pom.xml parent/pom.xml
Author: lu4242
Date: Tue Sep 2 20:41:55 2014
New Revision: 1622115
URL: http://svn.apache.org/r1622115
Log:
MYFACES-3917 Remove compile scope dependency - geronimo jcdi spec 1.0 from myfaces-api maven build (change to provided to avoid transitive dependency that clash with weld)
Modified:
myfaces/core/trunk/impl/pom.xml
myfaces/core/trunk/parent/pom.xml
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=1622115&r1=1622114&r2=1622115&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Tue Sep 2 20:41:55 2014
@@ -1100,6 +1100,12 @@
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
+
+ <!-- CDI -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ </dependency>
<!-- builder-annotations like @JSFWebConfigParam -->
<dependency>
Modified: myfaces/core/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/parent/pom.xml?rev=1622115&r1=1622114&r2=1622115&view=diff
==============================================================================
--- myfaces/core/trunk/parent/pom.xml (original)
+++ myfaces/core/trunk/parent/pom.xml Tue Sep 2 20:41:55 2014
@@ -458,8 +458,12 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
<version>1.0</version>
+ <scope>provided</scope>
+ <!-- MYFACES-3917 set compile/optional, clashes
+ with weld cdi by transitive dependency effect
<scope>compile</scope>
<optional>true</optional>
+ -->
</dependency>
<!-- Injection -->