Updating site with 1.2.1 release
git-svn-id: https://svn.apache.org/repos/asf/wink/site/trunk@1445473 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven/pom.xml b/maven/pom.xml
index bb6184a..4a4ac45 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -29,6 +29,14 @@
</parent>
<properties>
+ <!-- Wink 1.2.1 -->
+ <download_1_2_1Version>1.2.1-incubating</download_1_2_1Version>
+ <download_1_2_1Name>Wink-${download_1_2_1Version}</download_1_2_1Name>
+ <download_1_2_1MirrorUrl>http://www.apache.org/dyn/closer.cgi/incubator/wink/${download_1_2_1Version}</download_1_2_1MirrorUrl>
+ <download_1_2_1DistUrl>http://www.apache.org/dist/incubator/wink/${download_1_2_1Version}</download_1_2_1DistUrl>
+ <download_1_2_1File>apache-wink-${download_1_2_1Version}</download_1_2_1File>
+ <download_1_2_1TagUrl>http://svn.apache.org/repos/asf/incubator/wink/tags/wink-${download_1_2_1Version}</download_1_2_1TagUrl>
+
<!-- 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>
diff --git a/maven/src/site/apt/documentation.apt b/maven/src/site/apt/documentation.apt
index 73ca2ef..286137f 100644
--- a/maven/src/site/apt/documentation.apt
+++ b/maven/src/site/apt/documentation.apt
@@ -25,11 +25,11 @@
Apache Wink Documentation
-* Wink 1.2.0
+* Wink 1.2.1
- * User Guide {{{./1.2.0/Apache_Wink_User_Guide.pdf}PDF}}
+ * User Guide {{{./1.2.1/Apache_Wink_User_Guide.pdf}PDF}}
- * {{{./1.2.0/api/index.html}API}} (Javadoc)
+ * {{{./1.2.1/api/index.html}API}} (Javadoc)
* Wiki
@@ -49,6 +49,12 @@
* Previous Releases
+* Wink 1.2.0
+
+ * User Guide {{{./1.2.0/Apache_Wink_User_Guide.pdf}PDF}}
+
+ * {{{./1.2.0/api/index.html}API}} (Javadoc)
+
* Wink 1.1.2
* User Guide {{{./1.1.2/Apache_Wink_User_Guide.pdf}PDF}}
diff --git a/maven/src/site/confluence/downloads.confluence.vm b/maven/src/site/confluence/downloads.confluence.vm
index b8aeda3..110471a 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.2.0
+h2. Download Wink 1.2.1
|| Name || Archive || MD5 || SHA-1 || Signature ||
-| ${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] | | | |
+| ${download_1_2_1Name} (tar.gz) | [tar.gz|${download_1_2_1MirrorUrl}/${download_1_2_1File}.tar.gz] | [MD5|${download_1_2_1DistUrl}/${download_1_2_1File}.tar.gz.md5] | [SHA-1|${download_1_2_1DistUrl}/${download_1_2_1File}.tar.gz.sha1] | [ASC|${download_1_2_1DistUrl}/${download_1_2_1File}.tar.gz.asc] |
+| ${download_1_2_1Name} (zip) | [zip|${download_1_2_1MirrorUrl}/${download_1_2_1File}.zip] | [MD5|${download_1_2_1DistUrl}/${download_1_2_1File}.zip.md5] | [SHA-1|${download_1_2_1DistUrl}/${download_1_2_1File}.zip.sha1] | [ASC|${download_1_2_1DistUrl}/${download_1_2_1File}.zip.asc] |
+| ${download_1_2_1Name} (Source tar.gz) | [tar.gz|${download_1_2_1MirrorUrl}/${download_1_2_1File}-src.tar.gz] | [MD5|${download_1_2_1DistUrl}/${download_1_2_1File}-src.tar.gz.md5] | [SHA-1|${download_1_2_1DistUrl}/${download_1_2_1File}-src.tar.gz.sha1] | [ASC|${download_1_2_1DistUrl}/${download_1_2_1File}-src.tar.gz.asc] |
+| ${download_1_2_1Name} (Source zip) | [zip|${download_1_2_1MirrorUrl}/${download_1_2_1File}-src.zip] | [MD5|${download_1_2_1DistUrl}/${download_1_2_1File}-src.zip.md5] | [SHA-1|${download_1_2_1DistUrl}/${download_1_2_1File}-src.zip.sha1] | [ASC|${download_1_2_1DistUrl}/${download_1_2_1File}-src.zip.asc] |
+| Release Notes | [${download_1_2_1Version}|1.2.1/release\_notes] | | | |
+| KEYS for {$download_1_2_1Name} | [KEYS|${download_1_2_1TagUrl}/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_2_0TagUrl}/
+svn co ${download_1_2_1TagUrl}/
{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_2_0TagUrl}/
+svn co ${download_1_2_1TagUrl}/
{code}
h3. Using Maven
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
- <version>${download_1_2_0Version}</version>
+ <version>${download_1_2_1Version}</version>
</dependency>
{code}
@@ -55,12 +55,22 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-client</artifactId>
- <version>${download_1_2_0Version}</version>
+ <version>${download_1_2_1Version}</version>
</dependency>
{code}
h2. Previous Releases
+h3. Download Wink 1.2.0
+
+|| Name || Archive || MD5 || SHA-1 || Signature ||
+| ${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] | | | |
+
h3. Wink 1.1.3
|| Name || Archive || MD5 || SHA-1 || Signature ||
diff --git a/maven/src/site/confluence/news.confluence b/maven/src/site/confluence/news.confluence
index 812a8ec..50ee8c8 100644
--- a/maven/src/site/confluence/news.confluence
+++ b/maven/src/site/confluence/news.confluence
@@ -1,5 +1,6 @@
h1. News
-
+
+* 2012-08-21 - Wink-1.2.1 released.
* 2012-05-21 - Wink-1.2.0 released.
* 2011-05-09 - Wink-1.1.3 released.
* 2010-11-15 - Wink 1.1.2 released.
diff --git a/maven/src/site/confluence/roadmap.confluence b/maven/src/site/confluence/roadmap.confluence
index e1f1f7b..db5948b 100644
--- a/maven/src/site/confluence/roadmap.confluence
+++ b/maven/src/site/confluence/roadmap.confluence
@@ -1,3 +1,3 @@
h1. Roadmap
-* The 1.2.0-incubation release is tentatively planned to summer 2011. \\ [Issues|https://issues.apache.org/jira/browse/WINK/fixforversion/12316345] that are scheduled for this release.
\ No newline at end of file
+* The 1.3.0 release is tentatively planned to winter 2013. \\ [Issues|https://issues.apache.org/jira/browse/WINK/fixforversion/12321645] that are scheduled for this release.
\ No newline at end of file
