cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1545642 - in /cxf/branches/2.7.x-fixes: ./ rt/rs/security/oauth-parent/oauth/pom.xml rt/rs/security/oauth-parent/oauth2/pom.xml
Date Tue, 26 Nov 2013 12:59:33 GMT
Author: sergeyb
Date: Tue Nov 26 12:59:33 2013
New Revision: 1545642

URL: http://svn.apache.org/r1545642
Log:
Merged revisions 1545640 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1545640 | sergeyb | 2013-11-26 12:55:45 +0000 (Tue, 26 Nov 2013) | 1 line
  
  [CXF-5421] Making the servlet api dependency optional in OAuth poms
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/pom.xml
    cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/pom.xml

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1545640

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/pom.xml?rev=1545642&r1=1545641&r2=1545642&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/pom.xml Tue Nov 26 12:59:33
2013
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>${cxf.servlet-api.group}</groupId>
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
-            <version>${cxf.servlet-api.version}</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/pom.xml?rev=1545642&r1=1545641&r2=1545642&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/pom.xml Tue Nov 26 12:59:33
2013
@@ -45,7 +45,8 @@
         <dependency>
             <groupId>${cxf.servlet-api.group}</groupId>
             <artifactId>${cxf.servlet-api.artifact}</artifactId>
-            <version>${cxf.servlet-api.version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <!--test dependencies-->
         <dependency>



Mime
View raw message