You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/12/17 19:50:31 UTC
[jspwiki] branch master updated (31c3421 -> 4d7028a)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from 31c3421 JSPWIKI-1136 - Refine Class member fields
new 43394e8 Update tomcat to 9.0.41 and Gson to 2.8.6
new 4d7028a 2.11.0-git-01
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 13 ++++++++++++-
.../src/main/java/org/apache/wiki/api/Release.java | 4 ++--
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35909 -> 35909 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49777 -> 49778 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3630174 -> 3633627 bytes
pom.xml | 4 ++--
6 files changed, 16 insertions(+), 5 deletions(-)
[jspwiki] 01/02: Update tomcat to 9.0.41 and Gson to 2.8.6
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 43394e82e0fdb2e29b5cf11874ffbfae459550d5
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Thu Dec 17 20:49:41 2020 +0100
Update tomcat to 9.0.41 and Gson to 2.8.6
---
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35909 -> 35909 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49777 -> 49778 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3630174 -> 3633627 bytes
pom.xml | 4 ++--
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index 4536d3e..3641090 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index 3f35d8f..23c6071 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index 32a8fcf..1b638fe 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
diff --git a/pom.xml b/pom.xml
index dba87fc..7a562c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<ehcache.version>2.10.6</ehcache.version>
<flexmark.version>0.62.2</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
- <gson.version>2.8.5</gson.version>
+ <gson.version>2.8.6</gson.version>
<hsqldb.version>2.5.1</hsqldb.version>
<jaxen.version>1.2.0</jaxen.version>
<javax-jstl.version>1.2</javax-jstl.version>
@@ -76,7 +76,7 @@
<slf4j.version>1.7.30</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>1.25</tika.version>
- <tomcat.version>9.0.40</tomcat.version>
+ <tomcat.version>9.0.41</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
[jspwiki] 02/02: 2.11.0-git-01
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 4d7028a0b70d3e761af6591b86c43a8e3a8d61f3
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Thu Dec 17 20:50:04 2020 +0100
2.11.0-git-01
---
ChangeLog.md | 13 ++++++++++++-
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 4 ++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 8b818be..cc0b14f 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,17 @@ specific language governing permissions and limitations
under the License.
-->
+**2020-12-17 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.0-git-01_
+
+* [JSPWIKI-1136](https://issues.apache.org/jira/browse/JSPWIKI-1136 ) - Refine Class member fields
+ * Merged [PR #16](https://github.com/apache/jspwiki/pull/16), contributed by Arturo Bernal, thanks!
+
+* Dependency updates
+ * Gson to 2.8.6
+ * Tomcat to 9.0.41
+
**2020-12-01 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.0-M8-git-06_
@@ -76,7 +87,7 @@ under the License.
* _2.11.0-M8-git-02_
-* [JSPWIKI-1114](https://issues.apache.org/jira/browse/JSPWIKI-1131): Show only part of Weblog entry on the overview page.
+* [JSPWIKI-1114](https://issues.apache.org/jira/browse/JSPWIKI-1114): Show only part of Weblog entry on the overview page.
* Preview parameter cutting now only at newlines, patch suggested by Ulf Dittmer - thanks!
* LuceneSearchProvider using now NIOFSDirectory instead of (deprecated) SimpleFSDirectory. Also, all Lucene's index
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index b7edc8b..9dbfc0e 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -50,7 +50,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "M8";
+ private static final String POSTFIX = "";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "";
+ public static final String BUILD = "git-01";
/**
* This is the generic version string you should use when printing out the version. It is of