| commit | 4c7dde5af93298b216568e2eb1f4e566bf68ee33 | [log] [tgz] |
|---|---|---|
| author | juanpablo <juanpablo@apache.org> | Thu May 21 21:38:32 2020 +0200 |
| committer | juanpablo <juanpablo@apache.org> | Thu May 21 21:38:32 2020 +0200 |
| tree | fe9d15c43673362c17a51c402e82833ac78a9aba | |
| parent | 72d2a869ba120dc41174701e7683510ab5d2ef20 [diff] |
2.11.0-M7-git-20: Dependency updates * Flexmark to 0.61.32 * Tomcat to 9.0.35
diff --git a/ChangeLog.md b/ChangeLog.md index abff20b..979d779 100644 --- a/ChangeLog.md +++ b/ChangeLog.md
@@ -17,6 +17,14 @@ under the License. --> +**2020-05-21 Juan Pablo Santos (juanpablo AT apache DOT org)** + +* _2.11.0-M7-git-20_ + +* Dependency updates + * Flexmark to 0.61.32 + * Tomcat to 9.0.35 + **2020-04-09 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.11.0-M7-git-19_
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 04d1e73..599a53a 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
@@ -69,7 +69,7 @@ * <p> * If the build identifier is empty, it is not added. */ - public static final String BUILD = "git-19"; + public static final String BUILD = "git-20"; /** * This is the generic version string you should use when printing out the version. It is of
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 b45c51d..1842a58 100644 --- 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 Binary files 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 13dabd0..55b1ff6 100644 --- 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 Binary files differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe index e6350e7..e05716b 100644 --- a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe +++ b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe Binary files differ
diff --git a/pom.xml b/pom.xml index f2a6add..28a710e 100644 --- a/pom.xml +++ b/pom.xml
@@ -52,7 +52,7 @@ <commons-lang.version>3.10</commons-lang.version> <commons-text.version>1.8</commons-text.version> <ehcache.version>2.10.6</ehcache.version> - <flexmark.version>0.61.26</flexmark.version> + <flexmark.version>0.61.32</flexmark.version> <freshcookies-security.version>0.60</freshcookies-security.version> <gson.version>2.8.5</gson.version> <hsqldb.version>2.5.0</hsqldb.version> @@ -75,7 +75,7 @@ <slf4j.version>1.7.30</slf4j.version> <stripes.version>1.7.0-async-beta</stripes.version> <tika.version>1.24.1</tika.version> - <tomcat.version>9.0.34</tomcat.version> + <tomcat.version>9.0.35</tomcat.version> <wro4j.version>1.8.0</wro4j.version> <xmlrpc.version>2.0.1</xmlrpc.version>