Author: dkulp Date: Wed Dec 16 22:21:26 2009 New Revision: 891455 URL: http://svn.apache.org/viewvc?rev=891455&view=rev Log: Merged revisions 891453 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r891453 | dkulp | 2009-12-16 17:19:59 -0500 (Wed, 16 Dec 2009) | 10 lines Merged revisions 891452 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r891452 | dkulp | 2009-12-16 17:19:02 -0500 (Wed, 16 Dec 2009) | 2 lines Make sure only snaps come from codehaus Remove incubator repo as abdera is now in central ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Dec 16 22:21:26 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:891302 -/cxf/trunk:891301 +/cxf/branches/2.2.x-fixes:891302,891453 +/cxf/trunk:891301,891452 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml?rev=891455&r1=891454&r2=891455&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml Wed Dec 16 22:21:26 2009 @@ -154,13 +154,4 @@ <scope>test</scope> </dependency> </dependencies> - - <repositories> - <repository> - <id>apache.incubating</id> - <name>Apache Incubating Repository</name> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - </repository> - </repositories> - </project>
