Author: acumiskey Date: Thu Nov 13 08:20:48 2008 New Revision: 713749 URL: http://svn.apache.org/viewvc?rev=713749&view=rev Log: Merged revisions 711781 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........ r711781 | maxberger | 2008-11-06 07:22:15 +0000 (Thu, 06 Nov 2008) | 4 lines Readded dependency on avalon-framework-impl http://markmail.org/message/kkdfwhkblb2mltla http://fop-dev.markmail.org/message/col6fuklj7f545k3 ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/xmlgraphics-fop-pom-template.pom Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 13 08:20:48 2008 @@ -1,2 +1,2 @@ /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696 -/xmlgraphics/fop/trunk:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627,707631-708012,708192-708851 +/xmlgraphics/fop/trunk:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627,707631-708012,708192-708851,711781 Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Nov 13 08:20:48 2008 @@ -1 +1 @@ -/xmlgraphics/fop/trunk:1-708873 +/xmlgraphics/fop/trunk:1-713748 Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 13 08:20:48 2008 @@ -1,2 +1,2 @@ /xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java:684572,688085,688696 -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPForeignAttributeReader.java:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627,711781 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/xmlgraphics-fop-pom-template.pom URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/xmlgraphics-fop-pom-template.pom?rev=713749&r1=713748&r2=713749&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/xmlgraphics-fop-pom-template.pom (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/xmlgraphics-fop-pom-template.pom Thu Nov 13 08:20:48 2008 @@ -130,6 +130,11 @@ <version>4.3.1</version> </dependency> <dependency> + <groupId>org.apache.avalon.framework</groupId> + <artifactId>avalon-framework-impl</artifactId> + <version>4.3.1</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.2</version> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
