Updating 1.2.0 release references

git-svn-id: https://svn.apache.org/repos/asf/incubator/wink/site/trunk@1341752 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven/pom.xml b/maven/pom.xml
index e96fb9d..f7a0fcf 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -19,16 +19,24 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.wink</groupId>
 	<artifactId>wink</artifactId>
-	<version>1.1.3-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Apache Wink</name>
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
-		<version>8</version>
+		<version>10</version>
 	</parent>
 
     <properties>
+        <!-- Wink 1.2.0 -->
+       	<download_1_2_0Version>1.2.0-incubating</download_1_2_0Version>
+       	<download_1_2_0Name>Wink-${download_1_2_0Version}</download_1_2_0Name>
+       	<download_1_2_0MirrorUrl>http://www.apache.org/dyn/closer.cgi/incubator/wink/${download_1_2_0Version}</download_1_2_0MirrorUrl>
+       	<download_1_2_0DistUrl>http://www.apache.org/dist/incubator/wink/${download_1_2_0Version}</download_1_2_0DistUrl>
+       	<download_1_2_0File>apache-wink-${download_1_2_0Version}</download_1_2_0File>
+       	<download_1_2_0TagUrl>http://svn.apache.org/repos/asf/incubator/wink/tags/wink-${download_1_2_0Version}</download_1_2_0TagUrl>
+
         <!-- Wink 1.1.3 -->
        	<download_1_1_3Version>1.1.3-incubating</download_1_1_3Version>
        	<download_1_1_3Name>Wink-${download_1_1_3Version}</download_1_1_3Name>
diff --git a/maven/src/site/confluence/1.2.0/release_notes.confluence b/maven/src/site/confluence/1.2.0/release_notes.confluence
new file mode 100644
index 0000000..0aef49c
--- /dev/null
+++ b/maven/src/site/confluence/1.2.0/release_notes.confluence
@@ -0,0 +1,48 @@
+h2. Apache Wink 1.1.3 Release Notes
+
+h3. Overview
+ 
+This is the fifth official release of Apache Wink project.
+Apache Wink is a framework that helps you to produce and consume RESTful Web Services. 
+Apache Wink is TCK compliant implementation of the JAX-RS v1.1 specification. 
+The project also introduces Java API for writing clients that consume HTTP-based RESTful Web Services. 
+
+h3. Complete list of issues fixed in 1.1.3
+
+h4. Bug
+    * WINK-286 - GET methods fail to serve requests without Content-Type if the class/interface has @Consumes
+    * WINK-292 - Add proxy authentification support for the RestClient
+    * WINK-307 - Fix obscure error message during Service Doc generation
+    * WINK-311 - Resource Locator's @PathParam resolution is not correct.
+    * WINK-312 - GenericsUtils.isAssignable() cannot handle primitive types
+    * WINK-316 - AdminServlet doesn't process QueryParams properly
+    * WINK-317 - HttpHeadersImpl.getCookies() only ever returns the first cookie in the Cookie header
+    * WINK-320 - The JSON4J tests are failing due to not being able to find test resources
+    * WINK-332 - JAXBXmlProvider blocks JAXB implementation from successfully parsing XML when no concrete type can be found.
+    * WINK-339 - org.apache.wink.test.mock.MockHttpServletRequestWrapper doesn't handle getContentType() and parameter related methods
+
+h4. Improvement
+    * WINK-287 - Support web beans / (J)CDI / JSR-299
+    * WINK-294 - Some plugins missing versions
+    * WINK-295 - Upgrade to SLF4J 1.6.0
+    * WINK-296 - DEBUG -> TRACE logging reform
+    * WINK-297 - serviceability improvement; externalize strings, confirm formatting
+    * WINK-299 - Make Jackson the default JSON provider for Wink
+    * WINK-304 - serviceability improvement, output information upon application registration, errors
+    * WINK-305 - allow configuration file for SSL
+    * WINK-310 - Annotations inherited by a resource class should determine parameter type from the subclass, not the superclass
+    * WINK-315 - Improve the tolerance of malformed media types
+    * WINK-319 - Simplify addition of Request/Response handlers
+    * WINK-325 - Allow AtomCommonAttributes#otherAttributes and AtomCommonAttributesSimpleContent#otherAttributes to be lazy initialized.
+
+h4. New Feature
+    * WINK-313 - WADL support
+    * WINK-318 - Wink JSON model
+    * WINK-321 - Support @XmlJavaTypeAdapter and @XmlElement on method params
+    * WINK-322 - Add JSR250 life cycle management support
+    * WINK-326 - AsyncHttpClient module
+    * WINK-336 - Add a wink provider for Google Protocol Buffer
+    * WINK-337 - Add a wink provider for Apache Thrift
+
+h4.Test
+    * WINK-298 - enhance DTD expansion tests
diff --git a/maven/src/site/confluence/downloads.confluence.vm b/maven/src/site/confluence/downloads.confluence.vm
index fed84a5..b8aeda3 100644
--- a/maven/src/site/confluence/downloads.confluence.vm
+++ b/maven/src/site/confluence/downloads.confluence.vm
@@ -7,28 +7,28 @@
  Apache Wink is distributed under the [Apache License, version 2.0|http://maven.apache.org/license.html].
 
 
-h2. Download Wink 1.1.3
+h2. Download Wink 1.2.0
 
 || Name ||  Archive || MD5 || SHA-1 || Signature ||
-| ${download_1_1_3Name} (tar.gz) | [tar.gz|${download_1_1_3MirrorUrl}/${download_1_1_3File}.tar.gz] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}.tar.gz.md5] |  [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}.tar.gz.sha1]  | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}.tar.gz.asc] |
-| ${download_1_1_3Name} (zip) | [zip|${download_1_1_3MirrorUrl}/${download_1_1_3File}.zip] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}.zip.md5] |  [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}.zip.sha1] | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}.zip.asc] |
-| ${download_1_1_3Name} (Source tar.gz) | [tar.gz|${download_1_1_3MirrorUrl}/${download_1_1_3File}-src.tar.gz] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}-src.tar.gz.md5]  | [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}-src.tar.gz.sha1] | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}-src.tar.gz.asc] |
-| ${download_1_1_3Name} (Source zip) | [zip|${download_1_1_3MirrorUrl}/${download_1_1_3File}-src.zip] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}-src.zip.md5] |  [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}-src.zip.sha1] | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}-src.zip.asc] |
-| Release Notes | [${download_1_1_3Version}|1.1.3/release\_notes] | | | |
-| KEYS for {$download_1_1_3Name} | [KEYS|${download_1_1_3TagUrl}/KEYS] | | | |
+| ${download_1_2_0Name} (tar.gz) | [tar.gz|${download_1_2_0MirrorUrl}/${download_1_2_0File}.tar.gz] |  [MD5|${download_1_2_0DistUrl}/${download_1_2_0File}.tar.gz.md5] |  [SHA-1|${download_1_2_0DistUrl}/${download_1_2_0File}.tar.gz.sha1]  | [ASC|${download_1_2_0DistUrl}/${download_1_2_0File}.tar.gz.asc] |
+| ${download_1_2_0Name} (zip) | [zip|${download_1_2_0MirrorUrl}/${download_1_2_0File}.zip] |  [MD5|${download_1_2_0DistUrl}/${download_1_2_0File}.zip.md5] |  [SHA-1|${download_1_2_0DistUrl}/${download_1_2_0File}.zip.sha1] | [ASC|${download_1_2_0DistUrl}/${download_1_2_0File}.zip.asc] |
+| ${download_1_2_0Name} (Source tar.gz) | [tar.gz|${download_1_2_0MirrorUrl}/${download_1_2_0File}-src.tar.gz] |  [MD5|${download_1_2_0DistUrl}/${download_1_2_0File}-src.tar.gz.md5]  | [SHA-1|${download_1_2_0DistUrl}/${download_1_2_0File}-src.tar.gz.sha1] | [ASC|${download_1_2_0DistUrl}/${download_1_2_0File}-src.tar.gz.asc] |
+| ${download_1_2_0Name} (Source zip) | [zip|${download_1_2_0MirrorUrl}/${download_1_2_0File}-src.zip] |  [MD5|${download_1_2_0DistUrl}/${download_1_2_0File}-src.zip.md5] |  [SHA-1|${download_1_2_0DistUrl}/${download_1_2_0File}-src.zip.sha1] | [ASC|${download_1_2_0DistUrl}/${download_1_2_0File}-src.zip.asc] |
+| Release Notes | [${download_1_2_0Version}|1.2.0/release\_notes] | | | |
+| KEYS for {$download_1_2_0Name} | [KEYS|${download_1_2_0TagUrl}/KEYS] | | | |
 
 Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.
 
 You can also retrieve the source files from our svn repository by typing
 {code}
-svn co ${download_1_1_3TagUrl}/
+svn co ${download_1_2_0TagUrl}/
 {code}
 
 Instructions for checking hashes and signatures is indicated on the [Verifying Apache Software Foundation Releases|http://www.apache.org/info/verification.html] page.
 
 You can also retrieve the source files from our svn repository by typing
 {code}
-svn co ${download_1_1_3TagUrl}/
+svn co ${download_1_2_0TagUrl}/
 {code}
 
 h3. Using Maven
@@ -45,7 +45,7 @@
 <dependency>
     <groupId>org.apache.wink</groupId>
     <artifactId>wink-server</artifactId>
-    <version>${download_1_1_3Version}</version>
+    <version>${download_1_2_0Version}</version>
 </dependency>
 {code}
 
@@ -55,12 +55,22 @@
 <dependency>
     <groupId>org.apache.wink</groupId>
     <artifactId>wink-client</artifactId>
-    <version>${download_1_1_3Version}</version>
+    <version>${download_1_2_0Version}</version>
 </dependency>
 {code}
 
 h2. Previous Releases
 
+h3. Wink 1.1.3
+
+|| Name ||  Archive || MD5 || SHA-1 || Signature ||
+| ${download_1_1_3Name} (tar.gz) | [tar.gz|${download_1_1_3MirrorUrl}/${download_1_1_3File}.tar.gz] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}.tar.gz.md5] |  [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}.tar.gz.sha1]  | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}.tar.gz.asc] |
+| ${download_1_1_3Name} (zip) | [zip|${download_1_1_3MirrorUrl}/${download_1_1_3File}.zip] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}.zip.md5] |  [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}.zip.sha1] | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}.zip.asc] |
+| ${download_1_1_3Name} (Source tar.gz) | [tar.gz|${download_1_1_3MirrorUrl}/${download_1_1_3File}-src.tar.gz] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}-src.tar.gz.md5]  | [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}-src.tar.gz.sha1] | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}-src.tar.gz.asc] |
+| ${download_1_1_3Name} (Source zip) | [zip|${download_1_1_3MirrorUrl}/${download_1_1_3File}-src.zip] |  [MD5|${download_1_1_3DistUrl}/${download_1_1_3File}-src.zip.md5] |  [SHA-1|${download_1_1_3DistUrl}/${download_1_1_3File}-src.zip.sha1] | [ASC|${download_1_1_3DistUrl}/${download_1_1_3File}-src.zip.asc] |
+| Release Notes | [${download_1_1_3Version}|1.1.3/release\_notes] | | | |
+| KEYS for {$download_1_1_3Name} | [KEYS|${download_1_1_3TagUrl}/KEYS] | | | |
+
 h3. Wink 1.1.2
 | ${download_1_1_2Name} (tar.gz) | [tar.gz|${download_1_1_2MirrorUrl}/${download_1_1_2File}.tar.gz] |  [MD5|${download_1_1_2DistUrl}/${download_1_1_2File}.tar.gz.md5] |  [SHA-1|${download_1_1_2DistUrl}/${download_1_1_2File}.tar.gz.sha1]  | [ASC|${download_1_1_2DistUrl}/${download_1_1_2File}.tar.gz.asc] |
 | ${download_1_1_2Name} (zip) | [zip|${download_1_1_2MirrorUrl}/${download_1_1_2File}.zip] |  [MD5|${download_1_1_2DistUrl}/${download_1_1_2File}.zip.md5] |  [SHA-1|${download_1_1_2DistUrl}/${download_1_1_2File}.zip.sha1] | [ASC|${download_1_1_2DistUrl}/${download_1_1_2File}.zip.asc] |
diff --git a/maven/src/site/confluence/news.confluence b/maven/src/site/confluence/news.confluence
index 4a7b683..812a8ec 100644
--- a/maven/src/site/confluence/news.confluence
+++ b/maven/src/site/confluence/news.confluence
@@ -1,5 +1,6 @@
 h1. News

-
+

+* 2012-05-21 - Wink-1.2.0 released.

 * 2011-05-09 - Wink-1.1.3 released.

 * 2010-11-15 - Wink 1.1.2 released.

 * 2010-07-07 - Wink 1.1.1 released.