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/04/09 20:38:00 UTC
[jspwiki] branch master updated (5c43566 -> 76e5e27)
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 5c43566 2.11.0-M7-git-18
new 1fbd364 Update tomcat to 9.0.34
new 65db8b4 update portable binaries launchers
new 4dab6ec fix small issue raised by SonarQube
new 76e5e27 no version bump
The 4 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 | 3 +++
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35071 -> 35071 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49372 -> 49369 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3575670 -> 3582770 bytes
.../main/java/org/apache/wiki/util/ClassUtil.java | 2 +-
pom.xml | 2 +-
6 files changed, 5 insertions(+), 2 deletions(-)
[jspwiki] 02/04: update portable binaries launchers
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 65db8b49e2201e9dd07dbc28c9d9c8e08a8eaa65
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Apr 9 22:36:29 2020 +0200
update portable binaries launchers
---
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35071 -> 35071 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49372 -> 49369 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3575670 -> 3582770 bytes
3 files changed, 0 insertions(+), 0 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 498c7ce..b45c51d 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 af0362c..13dabd0 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 7dbe7ac..e6350e7 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
[jspwiki] 04/04: no version bump
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 76e5e27e90fa584a731916cafcdb9741cd39b7af
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Apr 9 22:37:20 2020 +0200
no version bump
---
ChangeLog.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ChangeLog.md b/ChangeLog.md
index 2b502d6..7e70096 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -24,6 +24,9 @@ under the License.
* [JSPWIKI-303](https://issues.apache.org/jira/browse/JSPWIKI-303): [JSPWiki API](https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiPublicAPI) library creation
* Promote `RenderingManager#textToHtml( Context, String )` to the public API
+* Dependency updates
+ * Tomcat to 9.0.34
+
**2020-03-29 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.0-M7-git-17_
[jspwiki] 03/04: fix small issue raised by SonarQube
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 4dab6ec8b2cfe840263e739273404fd14bf5ece0
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Apr 9 22:37:05 2020 +0200
fix small issue raised by SonarQube
---
jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
index 8da9f83..d8118ca 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
@@ -68,7 +68,7 @@ public final class ClassUtil {
final Map< String, String > map = new ConcurrentHashMap<>();
final List< Element > nodes = XmlUtil.parse( fileLoc, "/classmappings/mapping" );
- if( nodes.size() > 0 ) {
+ if( !nodes.isEmpty() ) {
for( final Element f : nodes ) {
final String key = f.getChildText( "requestedClass" );
final String className = f.getChildText( "mappedClass" );
[jspwiki] 01/04: Update tomcat to 9.0.34
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 1fbd3648c02a42bf3c2f7386a98d2b24e38c9f2d
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Apr 9 22:36:02 2020 +0200
Update tomcat to 9.0.34
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1b4fcf4..80ef327 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<slf4j.version>1.7.30</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
<tika.version>1.24</tika.version>
- <tomcat.version>9.0.33</tomcat.version>
+ <tomcat.version>9.0.34</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>