This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
The following commit(s) were added to refs/heads/jbake by this push:
new 166c5cb updates for 2.11.0.M2 release
166c5cb is described below
commit 166c5cbd35f67c57742d5275bf1367a6f480ce2b
Author: Juan Pablo Santos RodrÃguez <[email protected]>
AuthorDate: Fri Mar 8 00:26:03 2019 +0100
updates for 2.11.0.M2 release
---
pom.xml | 64 +++++------------------------
src/main/jbake/content/general/downloads.md | 9 ++--
src/main/jbake/content/general/news.md | 3 ++
src/main/jbake/content/index.md | 6 ++-
4 files changed, 23 insertions(+), 59 deletions(-)
diff --git a/pom.xml b/pom.xml
index dcc79bb..ef7eb2f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -86,75 +86,31 @@
<version>${plugin.dependency}</version>
<executions>
<execution>
- <id>unpack-apidocs-2.10</id>
+ <id>unpack-apidocs-2.11</id>
<phase>generate-resources</phase>
<goals><goal>unpack</goal></goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>2.10.0</version>
- <classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/2.10.0</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>2.10.1</version>
- <classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/2.10.1</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>2.10.2</version>
- <classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/2.10.2</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>2.10.3</version>
- <classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/2.10.3</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>2.10.4</version>
+ <artifactId>jspwiki-main</artifactId>
+ <version>2.11.0.M2</version>
<classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/2.10.4</outputDirectory>
+
<outputDirectory>${jbake.dest}/apidocs/2.11.0.M2/main</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-war</artifactId>
- <version>2.10.5</version>
- <classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/2.10.5</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>unpack-apidocs-2.11</id>
- <phase>generate-resources</phase>
- <goals><goal>unpack</goal></goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-main</artifactId>
- <version>2.11.0.M2-SNAPSHOT</version>
+ <artifactId>jspwiki-markdown</artifactId>
+ <version>2.11.0.M2</version>
<classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/main/2.11.0.M2</outputDirectory>
+
<outputDirectory>${jbake.dest}/apidocs/2.11.0.M2/markdown</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.jspwiki</groupId>
- <artifactId>jspwiki-markdown</artifactId>
- <version>2.11.0.M2-SNAPSHOT</version>
+ <artifactId>jspwiki-util</artifactId>
+ <version>2.11.0.M2</version>
<classifier>javadoc</classifier>
-
<outputDirectory>${jbake.dest}/apidocs/markdown/2.11.0.M2</outputDirectory>
+
<outputDirectory>${jbake.dest}/apidocs/2.11.0.M2/util</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/src/main/jbake/content/general/downloads.md
b/src/main/jbake/content/general/downloads.md
index e7a2beb..0d2a958 100755
--- a/src/main/jbake/content/general/downloads.md
+++ b/src/main/jbake/content/general/downloads.md
@@ -16,9 +16,12 @@ If you want to build directly from the sources, please check
the [Get and Build
<br/> **Release Index**
-* **29-Jan-2019**: The current release version is <a class="external"
href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M1ReleasedOn29012019";>2.11.0.M1</a>.
This release fixes the following issues:
-https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12343348
<br/>
-<strong><a class="external"
href="https://www.apache.org/dyn/closer.lua/jspwiki/2.11.0.M1/source";>source</a></strong>
| <strong><a class="external"
href="https://www.apache.org/dist/jspwiki/2.11.0.M1/source/jspwiki-builder-2.11.0.M1-source-release.zip.sha512";>checksum</a></strong>
| <strong><a class="external"
href="https://www.apache.org/dist/jspwiki/2.11.0.M1/source/jspwiki-builder-2.11.0.M1-source-release.zip.asc";>signature</a></strong>
+* **29-Jan-2019**: The current release version is <a class="external"
href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M2ReleasedOn08032019";>2.11.0.M2</a>.
This release fixes the following issues:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12343994
<br/>
+<strong><a class="external"
href="https://www.apache.org/dyn/closer.lua/jspwiki/2.11.0.M2/source";>source</a></strong>
| <strong><a class="external"
href="https://www.apache.org/dist/jspwiki/2.11.0.M2/source/jspwiki-builder-2.11.0.M2-source-release.zip.sha512";>checksum</a></strong>
| <strong><a class="external"
href="https://www.apache.org/dist/jspwiki/2.11.0.M2/source/jspwiki-builder-2.11.0.M2-source-release.zip.asc";>signature</a></strong>
+
+* **29-Jan-2019**: released version <a class="external"
href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M1ReleasedOn29012019";>2.11.0.M1</a>.
This release fixes the following issues:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12343348
* **04-Sep-2018**: released version <a class="external"
href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-SectionNewIn2.10NewInJSPWiki2.10.5ReleasedOn04092018";>2.10.5</a>.
This release fixes the following issues:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&version=12343310
diff --git a/src/main/jbake/content/general/news.md
b/src/main/jbake/content/general/news.md
index c15b429..dc7be6f 100755
--- a/src/main/jbake/content/general/news.md
+++ b/src/main/jbake/content/general/news.md
@@ -6,6 +6,8 @@ type=page
## Project News
+ * **08-Mar-2019:** Official [Apache JSPWiki 2.11.0.M2 release][] is out!
+
* **30-Jan-2019:** Apache JSPWiki [CVE-2018-20242][] vulnerability
disclosure
* **29-Jan-2019:** Official [Apache JSPWiki 2.11.0.M1 release][] is out!
@@ -64,4 +66,5 @@ type=page
[Apache JSPWiki 2.10.4 release]: downloads.html
[Apache JSPWiki 2.10.5 release]: downloads.html
[Apache JSPWiki 2.11.0.M1 release]: downloads.html
+[Apache JSPWiki 2.11.0.M2 release]: downloads.html
[CVE-2018-20242]: https://jspwiki-wiki.apache.org/Wiki.jsp?page=CVE-2018-20242
\ No newline at end of file
diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md
index 3b95169..3364cc6 100755
--- a/src/main/jbake/content/index.md
+++ b/src/main/jbake/content/index.md
@@ -27,6 +27,8 @@ JSPWiki is open-source software that is released under the
Apache Public License
## Project status
+ * **08-Mar-2019:** Official [Apache JSPWiki 2.11.0.M2 release][] is out!
+
* **30-Jan-2019:** Apache JSPWiki [CVE-2018-20242][] vulnerability
disclosure
* **29-Jan-2019:** Official [Apache JSPWiki 2.11.0.M1 release][] is out!
@@ -39,8 +41,6 @@ JSPWiki is open-source software that is released under the
Apache Public License
* **11-Dec-2017:** JSPWiki development now occurs on
[GitHub](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Building%20from%20source%20code)!
- * **01-Jul-2017:** new website!
-
[Apache JSPWiki]: https://jspwiki.apache.org
@@ -66,6 +66,8 @@ JSPWiki is open-source software that is released under the
Apache Public License
[Getting Involved]:
https://jspwiki-wiki.apache.org/Wiki.jsp?page=Getting%20Involved
+[Apache JSPWiki 2.11.0.M2 release]:
https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M2ReleasedOn08032019
+
[Apache JSPWiki 2.11.0.M1 release]:
https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.11#section-NewIn2.11-SectionNewIn2.11NewInJSPWiki2.11.0.M1ReleasedOn29012019
[Apache JSPWiki 2.10.5 release]:
https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.10#section-NewIn2.10-NewInJSPWiki2.10.5ReleasedOn04092018
