Tag for 1.1 vote and release.fop-1_1

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1@1398854 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 36 insertions, 30 deletions

diff --git a/build.xml b/build.xml
index 5ee0adf08..7c05049fa 100644
--- a/build.xml
+++ b/build.xml
@@ -58,62 +58,68 @@ list of possible build targets.
   <property file="${basedir}/build-local.properties"/>
   <property file="${basedir}/build.properties"/>
   <fileset dir="${basedir}" id="dist.bin">
-    <include name="conf/**"/>
-    <include name="examples/**"/>
+    <include name="KEYS"/>
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <include name="KEYS"/>
-    <include name="status.xml"/>
+    <include name="conf/**"/>
+    <include name="examples/**"/>
+    <include name="fop"/>
     <include name="fop.bat"/>
     <include name="fop.cmd"/>
     <include name="fop.js"/>
-    <include name="fop"/>
+    <include name="status.xml"/>
   </fileset>
   <fileset dir="${basedir}" id="dist.bin.lib">
     <patternset id="dist.lib">
+      <include name="lib/README*"/>
       <include name="lib/avalon-framework*"/>
-      <include name="lib/xmlgraphics-commons*"/>
       <include name="lib/batik*"/>
       <include name="lib/commons-io*"/>
       <include name="lib/commons-logging*"/>
-      <include name="lib/README*"/>
       <include name="lib/serializer*"/>
       <include name="lib/xalan*"/>
       <include name="lib/xerces*"/>
       <include name="lib/xml-apis*"/>
+      <include name="lib/xmlgraphics-commons*"/>
     </patternset>
   </fileset>
-  <patternset id="dist.src.lib.tools">
+  <patternset id="dist.src.lib.build">
     <include name="lib/build/asm*"/>
-    <include name="lib/build/backport-util-concurrent*"/>
+    <include name="lib/build/hamcrest*"/>
     <include name="lib/build/jaxen*"/>
+    <include name="lib/build/mockito*"/>
+    <include name="lib/build/objenesis*"/>
     <include name="lib/build/pmd*"/>
     <include name="lib/build/qdox*"/>
     <include name="lib/build/xmlunit*"/>
   </patternset>
   <fileset dir="${basedir}" id="dist.src">
-    <include name="src/**"/>
-    <include name="conf/**"/>
-    <include name="hyph/hyphenation.dtd"/>
-    <include name="hyph/readme"/>
-    <patternset refid="dist.lib"/>
-    <patternset refid="dist.src.lib.tools"/>
-    <include name="lib/servlet*"/>
-    <include name="test/**"/>
-    <include name="examples/**"/>
+    <include name="KEYS"/>
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <include name="KEYS"/>
-    <include name="known-issues.xml"/>
-    <include name="status.xml"/>
     <include name="build.*"/>
-    <include name="forrest.properties"/>
+    <include name="checkstyle*"/>
+    <exclude name="checkstyle-noframes.xsl"/>
+    <include name="conf/**"/>
+    <include name="examples/**"/>
+    <include name="findbugs*"/>
+    <include name="fop"/>
     <include name="fop.bat"/>
     <include name="fop.cmd"/>
     <include name="fop.js"/>
-    <include name="fop"/>
+    <include name="forrest.*"/>
+    <include name="hyph/hyphenation.dtd"/>
+    <include name="hyph/readme"/>
+    <include name="jacoco*"/>
+    <include name="known-issues.xml"/>
+    <include name="lib/servlet*"/>
+    <include name="src/**"/>
+    <include name="status.xml"/>
+    <include name="test/**"/>
+    <patternset refid="dist.lib"/>
+    <patternset refid="dist.src.lib.build"/>
   </fileset>
   <path id="libs-build-classpath">
     <fileset dir="${basedir}/lib">
diff --git a/lib/xmlgraphics-commons-1.5.jar b/lib/xmlgraphics-commons-1.5.jar
index e9ab55d30..0ff3b4f46 100644
--- a/lib/xmlgraphics-commons-1.5.jar
+++ b/lib/xmlgraphics-commons-1.5.jar
diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf
index 4f28acd05..a55870a74 100644
--- a/src/documentation/content/doap.rdf
+++ b/src/documentation/content/doap.rdf
@@ -76,7 +76,7 @@
     <release>
       <Version>
         <name>Current release (stable)</name>
-        <created>2012-10-18</created>
+        <created>2012-10-20</created>
         <revision>1.1</revision>
       </Version>
     </release>
diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index 8280ff56a..9d3784d8a 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -145,7 +145,7 @@
       <question>When is the next released planned?</question>
       <answer>
         <p>
-          Version 1.1 of FOP was released on 18 October 2012.
+          Version 1.1 of FOP was released on 20 October 2012.
           Work on a new Version 1.2 of Apache FOP is underway at this time, with
           no fixed date set for its release.
           If you want to speed up the process, consider <link
diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml
index 008d6ad0d..6ac7ac3f0 100644
--- a/src/documentation/content/xdocs/news-data.xml
+++ b/src/documentation/content/xdocs/news-data.xml
@@ -17,7 +17,7 @@
 -->
 <!-- $Id$ -->
 <news>
-  <item date="2012-10-18" title="Apache™ FOP 1.1 Released">
+  <item date="2012-10-20" title="Apache™ FOP 1.1 Released">
     <p>
       Apache™ FOP 1.1 contains bug fixes and a number of new features. See
       <a href="1.1/releaseNotes_1.1.html">Release Notes</a> for a list of
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 01a77674c..b774130e9 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -27,9 +27,9 @@
   <body>
     <section>
       <title>Status</title>
-      <p>Last updated 18 October 2012.</p>
+      <p>Last updated 20 October 2012.</p>
       <p>
-        Apache™ FOP Version 1.1 was released on 18 October 2012.
+        Apache™ FOP Version 1.1 was released on 20 October 2012.
       </p>
     </section>
     <section>
@@ -37,7 +37,7 @@
       <p>
         The FOP code base is gradually evolving, from Version 0.90,
 	released on 22 November 2005, to Version 1.1, released on
-        18 October 2012. Further releases in the 1.x series and beyond are expected.
+        20 October 2012. Further releases in the 1.x series and beyond are expected.
       </p>
       <p>
         FOP releases prior to version 0.90 were based on a different
diff --git a/status.xml b/status.xml
index 7ddaeaa89..af2fb66ea 100644
--- a/status.xml
+++ b/status.xml
@@ -61,7 +61,7 @@
       users, i.e. when the behaviour changes and could affect the layout of existing
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
-    <release version="1.1" date="18 October 2012">
+    <release version="1.1" date="20 October 2012">
       <action context="Test" dev="GA" type="fix">
         Fix errors and warnings in example files. Add build.xml for documentation examples.
       </action>