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 2022/10/19 20:25:58 UTC
[jspwiki] branch master updated (4b196bfb7 -> 191d4bfa6)
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 4b196bfb7 [maven-release-plugin] prepare for next development iteration
new 278f17c5e set build version to 2.12.0-SNAPSHOT
new 4aa268cd5 require JDK-11, drop JDK-8 build, tentatively build with jdk-19
new 7ac34ca75 Update dependencies
new 6867c8802 Update Lucene to 9.4.0
new f361900d2 Update portable build binaries
new 875b70a71 2.12.0-git-01
new 191d4bfa6 Update Mockito to 4.8.1 - closes #225
The 7 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 | 22 ++++++++++
Jenkinsfile | 11 +++--
README.md | 4 +-
UPGRADING | 12 +++++-
jspwiki-210-adapters/pom.xml | 2 +-
jspwiki-210-test-adaptees/pom.xml | 2 +-
jspwiki-api/pom.xml | 2 +-
.../src/main/java/org/apache/wiki/api/Release.java | 8 ++--
jspwiki-bom/pom.xml | 4 +-
jspwiki-bootstrap/pom.xml | 2 +-
jspwiki-cache/pom.xml | 2 +-
jspwiki-event/pom.xml | 2 +-
jspwiki-http/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
.../jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
.../jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-kendra-searchprovider/pom.xml | 2 +-
jspwiki-main/pom.xml | 4 +-
.../apache/wiki/search/LuceneSearchProvider.java | 3 +-
jspwiki-markdown/pom.xml | 2 +-
jspwiki-portable/build.xml | 4 +-
jspwiki-portable/pom.xml | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34700 -> 34701 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 47050 -> 49002 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3670538 -> 3665488 bytes
jspwiki-tika-searchprovider/pom.xml | 2 +-
jspwiki-util/pom.xml | 2 +-
jspwiki-war/pom.xml | 2 +-
jspwiki-wikipages/de/pom.xml | 2 +-
jspwiki-wikipages/en/pom.xml | 2 +-
jspwiki-wikipages/es/pom.xml | 2 +-
jspwiki-wikipages/fi/pom.xml | 2 +-
jspwiki-wikipages/fr/pom.xml | 2 +-
jspwiki-wikipages/it/pom.xml | 2 +-
jspwiki-wikipages/nl/pom.xml | 2 +-
jspwiki-wikipages/pom.xml | 2 +-
jspwiki-wikipages/pt_BR/pom.xml | 2 +-
jspwiki-wikipages/ru/pom.xml | 2 +-
jspwiki-wikipages/zh_CN/pom.xml | 2 +-
jspwiki-wysiwyg/pom.xml | 2 +-
pom.xml | 48 ++++++++++-----------
45 files changed, 110 insertions(+), 74 deletions(-)
[jspwiki] 06/07: 2.12.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 875b70a71865e4b0f28c04048e832466d2dce4e5
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 22:23:49 2022 +0200
2.12.0-git-01
* closes #219
* closes #224
* closes #233
---
ChangeLog.md | 21 +++++++++++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 8 ++++----
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 7c9bfa3f8..a434bfea9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,27 @@ specific language governing permissions and limitations
under the License.
-->
+**2022-10-19 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.0-git-01_
+
+* Require at least Java 11 to build & run
+
+* Add missing licenses PR [#220](https://github.com/apache/jspwiki/pull/206) provided by [Arturo Bernal](https://github.com/arturobernalg), thanks!
+
+* Dependency updates
+ * commons-text to 1.10.0
+ * Flexmark to 0.64.0
+ * Gson to 2.9.1 (closes [#219](https://github.com/apache/jspwiki/pull/219)), thanks to dependabot
+ * JUnit to 5.9.1
+ * Log4J to 2.19.0
+ * Lucene to 9.4.0
+ * NekoHTML to 2.1.2
+ * Selenide to 6.9.0 (closes [#233](https://github.com/apache/jspwiki/pull/233)), thanks to dependabot
+ * Tika to 2.5.0
+ * Tomcat to 9.0.68
+ * Maven plugins: jar to 3.3.0, javadoc to 3.4.1, jxr to 3.3.0, project-info-reports to 3.4.1 (closes [#224](https://github.com/apache/jspwiki/pull/224), thanks to dependabot), wro4j to 1.10.1
+
**2022-07-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.3-git-12_
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 13e31e9e1..939753158 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,16 +50,16 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "-git-";
/** The JSPWiki major version. */
public static final int VERSION = 2;
/** The JSPWiki revision. */
- public static final int REVISION = 11;
+ public static final int REVISION = 12;
/** The minor revision. */
- public static final int MINORREVISION = 3;
+ public static final int MINORREVISION = 0;
/** The build number/identifier. This is a String as opposed to an integer, just so that people can add other identifiers to it.
* The build number is incremented every time a committer checks in code, and reset when a release is made.
@@ -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 = "01";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 01/07: set build version to 2.12.0-SNAPSHOT
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 278f17c5e3c78282fbf485d7b19bbf123b95e7e9
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 21:07:06 2022 +0200
set build version to 2.12.0-SNAPSHOT
---
jspwiki-210-adapters/pom.xml | 2 +-
jspwiki-210-test-adaptees/pom.xml | 2 +-
jspwiki-api/pom.xml | 2 +-
jspwiki-bom/pom.xml | 4 ++--
jspwiki-bootstrap/pom.xml | 2 +-
jspwiki-cache/pom.xml | 2 +-
jspwiki-event/pom.xml | 2 +-
jspwiki-http/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-cma/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-it-test-custom/pom.xml | 2 +-
jspwiki-it-tests/jspwiki-selenide-tests/pom.xml | 2 +-
jspwiki-it-tests/pom.xml | 2 +-
jspwiki-kendra-searchprovider/pom.xml | 2 +-
jspwiki-main/pom.xml | 2 +-
jspwiki-markdown/pom.xml | 2 +-
jspwiki-portable/pom.xml | 2 +-
jspwiki-tika-searchprovider/pom.xml | 2 +-
jspwiki-util/pom.xml | 2 +-
jspwiki-war/pom.xml | 2 +-
jspwiki-wikipages/de/pom.xml | 2 +-
jspwiki-wikipages/en/pom.xml | 2 +-
jspwiki-wikipages/es/pom.xml | 2 +-
jspwiki-wikipages/fi/pom.xml | 2 +-
jspwiki-wikipages/fr/pom.xml | 2 +-
jspwiki-wikipages/it/pom.xml | 2 +-
jspwiki-wikipages/nl/pom.xml | 2 +-
jspwiki-wikipages/pom.xml | 2 +-
jspwiki-wikipages/pt_BR/pom.xml | 2 +-
jspwiki-wikipages/ru/pom.xml | 2 +-
jspwiki-wikipages/zh_CN/pom.xml | 2 +-
jspwiki-wysiwyg/pom.xml | 2 +-
pom.xml | 2 +-
35 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/jspwiki-210-adapters/pom.xml b/jspwiki-210-adapters/pom.xml
index 27ea83f2e..85f450457 100644
--- a/jspwiki-210-adapters/pom.xml
+++ b/jspwiki-210-adapters/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-210-test-adaptees/pom.xml b/jspwiki-210-test-adaptees/pom.xml
index 1f68b01ce..1d38b8472 100644
--- a/jspwiki-210-test-adaptees/pom.xml
+++ b/jspwiki-210-test-adaptees/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-api/pom.xml b/jspwiki-api/pom.xml
index 99f245aa6..a747f2217 100644
--- a/jspwiki-api/pom.xml
+++ b/jspwiki-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-bom/pom.xml b/jspwiki-bom/pom.xml
index dbde4d41d..b2bf5936b 100644
--- a/jspwiki-bom/pom.xml
+++ b/jspwiki-bom/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<properties>
- <jspwiki.version>2.11.4-SNAPSHOT</jspwiki.version>
+ <jspwiki.version>2.12.0-SNAPSHOT</jspwiki.version>
</properties>
<dependencyManagement>
diff --git a/jspwiki-bootstrap/pom.xml b/jspwiki-bootstrap/pom.xml
index 7c4fefe20..7ccec2d84 100644
--- a/jspwiki-bootstrap/pom.xml
+++ b/jspwiki-bootstrap/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-cache/pom.xml b/jspwiki-cache/pom.xml
index ba08ce77e..fbb1afdac 100644
--- a/jspwiki-cache/pom.xml
+++ b/jspwiki-cache/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-event/pom.xml b/jspwiki-event/pom.xml
index f3ec694e1..53828207f 100644
--- a/jspwiki-event/pom.xml
+++ b/jspwiki-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-http/pom.xml b/jspwiki-http/pom.xml
index 6096f2cca..6e42e46af 100644
--- a/jspwiki-http/pom.xml
+++ b/jspwiki-http/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
index 4167c2c1f..ba3780a87 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
diff --git a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
index ba1fab33c..23f7703e2 100644
--- a/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<!-- Container Managed Authentication -->
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
index a1ce81dc0..640df9b76 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
index 9199ee340..3970714d9 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom-jdbc</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
index 4e829b912..d7ba70d75 100644
--- a/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
+++ b/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
@@ -22,7 +22,7 @@
<parent> <!-- tests reuse [1/3]: reads common configuration for ITs and brings jspwiki-war as dependency -->
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-it-test-custom</artifactId>
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
index 4075756c4..379866e08 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.it</groupId>
<artifactId>jspwiki-it-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/jspwiki-it-tests/pom.xml b/jspwiki-it-tests/pom.xml
index ef10227ad..6dd82bb2f 100644
--- a/jspwiki-it-tests/pom.xml
+++ b/jspwiki-it-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.jspwiki.it</groupId>
diff --git a/jspwiki-kendra-searchprovider/pom.xml b/jspwiki-kendra-searchprovider/pom.xml
index d720c22b3..fb52ac9e0 100644
--- a/jspwiki-kendra-searchprovider/pom.xml
+++ b/jspwiki-kendra-searchprovider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-kendra-searchprovider</artifactId>
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 2f0c4fc6d..377e1f3c5 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 658b92b01..296b306a7 100644
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-markdown</artifactId>
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index 7b16b2430..22ec596db 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-tika-searchprovider/pom.xml b/jspwiki-tika-searchprovider/pom.xml
index d69280a99..fff11ba41 100644
--- a/jspwiki-tika-searchprovider/pom.xml
+++ b/jspwiki-tika-searchprovider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<artifactId>jspwiki-tika-searchprovider</artifactId>
diff --git a/jspwiki-util/pom.xml b/jspwiki-util/pom.xml
index efdd79cce..1d6ac7b55 100644
--- a/jspwiki-util/pom.xml
+++ b/jspwiki-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index 122f8a51f..c218fa7c0 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/de/pom.xml b/jspwiki-wikipages/de/pom.xml
index 095e0deaf..841009288 100644
--- a/jspwiki-wikipages/de/pom.xml
+++ b/jspwiki-wikipages/de/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/en/pom.xml b/jspwiki-wikipages/en/pom.xml
index 9d2ed6fa3..8a4910f57 100644
--- a/jspwiki-wikipages/en/pom.xml
+++ b/jspwiki-wikipages/en/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/es/pom.xml b/jspwiki-wikipages/es/pom.xml
index fe9eec7ab..9a7424427 100644
--- a/jspwiki-wikipages/es/pom.xml
+++ b/jspwiki-wikipages/es/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fi/pom.xml b/jspwiki-wikipages/fi/pom.xml
index 752cd6c90..8e7d853b9 100644
--- a/jspwiki-wikipages/fi/pom.xml
+++ b/jspwiki-wikipages/fi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/fr/pom.xml b/jspwiki-wikipages/fr/pom.xml
index 803628013..9ca3bdc54 100644
--- a/jspwiki-wikipages/fr/pom.xml
+++ b/jspwiki-wikipages/fr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/it/pom.xml b/jspwiki-wikipages/it/pom.xml
index b38f8419c..c494d2064 100644
--- a/jspwiki-wikipages/it/pom.xml
+++ b/jspwiki-wikipages/it/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/nl/pom.xml b/jspwiki-wikipages/nl/pom.xml
index d6234d06b..1d9501a76 100644
--- a/jspwiki-wikipages/nl/pom.xml
+++ b/jspwiki-wikipages/nl/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pom.xml b/jspwiki-wikipages/pom.xml
index cffad7836..a7cfad117 100644
--- a/jspwiki-wikipages/pom.xml
+++ b/jspwiki-wikipages/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/pt_BR/pom.xml b/jspwiki-wikipages/pt_BR/pom.xml
index 19777a7e4..915808400 100644
--- a/jspwiki-wikipages/pt_BR/pom.xml
+++ b/jspwiki-wikipages/pt_BR/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/ru/pom.xml b/jspwiki-wikipages/ru/pom.xml
index 888a8eff9..117695fcf 100644
--- a/jspwiki-wikipages/ru/pom.xml
+++ b/jspwiki-wikipages/ru/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wikipages/zh_CN/pom.xml b/jspwiki-wikipages/zh_CN/pom.xml
index 8cd591be2..d3901db56 100644
--- a/jspwiki-wikipages/zh_CN/pom.xml
+++ b/jspwiki-wikipages/zh_CN/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki.wikipages</groupId>
<artifactId>jspwiki-wikipages-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/jspwiki-wysiwyg/pom.xml b/jspwiki-wysiwyg/pom.xml
index d87ac62c7..7750b1036 100644
--- a/jspwiki-wysiwyg/pom.xml
+++ b/jspwiki-wysiwyg/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.jspwiki</groupId>
<artifactId>jspwiki-builder</artifactId>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 01a513f7c..c51878229 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>jspwiki-builder</artifactId>
<modelVersion>4.0.0</modelVersion>
<name>Apache JSPWiki</name>
- <version>2.11.4-SNAPSHOT</version>
+ <version>2.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich
and built around standard JEE components (Java, servlets, JSP).</description>
[jspwiki] 04/07: Update Lucene to 9.4.0
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 6867c880226e164d7030f2646a51d775a3f21fe2
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 21:12:25 2022 +0200
Update Lucene to 9.4.0
---
jspwiki-main/pom.xml | 2 +-
.../src/main/java/org/apache/wiki/search/LuceneSearchProvider.java | 3 ++-
pom.xml | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 377e1f3c5..54b71c7d1 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
+ <artifactId>lucene-analysis-common</artifactId>
</dependency>
<dependency>
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index 90677ada8..c93b33b83 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.classic.ClassicAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
@@ -103,7 +104,7 @@ public class LuceneSearchProvider implements SearchProvider {
private static final String PROP_LUCENE_INDEXDELAY = "jspwiki.lucene.indexdelay";
private static final String PROP_LUCENE_INITIALDELAY = "jspwiki.lucene.initialdelay";
- private String m_analyzerClass = "org.apache.lucene.analysis.standard.ClassicAnalyzer";
+ private String m_analyzerClass = ClassicAnalyzer.class.getName();
private static final String LUCENE_DIR = "lucene";
diff --git a/pom.xml b/pom.xml
index 10a62364e..5c8c772f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.9.1</junit.version>
<log4j2.version>2.19.0</log4j2.version>
- <lucene.version>8.11.2</lucene.version>
+ <lucene.version>9.4.0</lucene.version>
<mockito.version>4.6.1</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
@@ -298,7 +298,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
+ <artifactId>lucene-analysis-common</artifactId>
<version>${lucene.version}</version>
</dependency>
[jspwiki] 03/07: Update dependencies
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 7ac34ca75eab874b8e0a71e0fda43c790c53d094
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 21:11:26 2022 +0200
Update dependencies
* commons-text to 1.10.0
* Flexmark to 0.64.0
* Gsonnit to 5.9.1
* to 2.9.1
* JU Log4J to 2.19.0
* NekoHTML to 2.1.2
* Selenide to 6.9.0
* Tika to 2.5.0
* Tomcat to 9.0.68
* Maven plugins: jar to 3.3.0, javadoc to 3.4.1, jxr to 3.3.0, project-info-reports to 3.4.1, wro4j to 1.10.1
---
pom.xml | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 066372791..10a62364e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,11 +52,11 @@
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>3.12.0</commons-lang.version>
- <commons-text.version>1.9</commons-text.version>
+ <commons-text.version>1.10.0</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
- <flexmark.version>0.62.2</flexmark.version> <!-- 0.64.0 and above require JDK >= 11 to execute -->
+ <flexmark.version>0.64.0</flexmark.version> <!-- 0.64.0 and above require JDK >= 11 to execute -->
<freshcookies-security.version>0.60</freshcookies-security.version>
- <gson.version>2.9.0</gson.version>
+ <gson.version>2.9.1</gson.version>
<hsqldb.version>2.7.0</hsqldb.version>
<jamm.version>0.3.3</jamm.version>
<jaxen.version>1.2.0</jaxen.version>
@@ -67,19 +67,19 @@
<jdom2.version>2.0.6</jdom2.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
- <junit.version>5.9.0</junit.version>
- <log4j2.version>2.18.0</log4j2.version>
- <lucene.version>8.11.2</lucene.version> <!-- 9.0.0 and above require JDK >= 11 to execute -->
+ <junit.version>5.9.1</junit.version>
+ <log4j2.version>2.19.0</log4j2.version>
+ <lucene.version>8.11.2</lucene.version>
<mockito.version>4.6.1</mockito.version>
- <nekohtml.version>2.0.2</nekohtml.version> <!-- 2.1.0 and above require JDK >= 11 to execute -->
+ <nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
- <selenide.version>6.6.6</selenide.version>
+ <selenide.version>6.9.0</selenide.version>
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
- <tika.version>2.4.1</tika.version>
- <tomcat.version>9.0.65</tomcat.version>
- <wro4j.version>1.8.0</wro4j.version> <!-- 1.9.0 and above require JDK >= 9 to execute -->
+ <tika.version>2.5.0</tika.version>
+ <tomcat.version>9.0.68</tomcat.version>
+ <wro4j.version>1.10.1</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
<plugin.antrun.version>3.1.0</plugin.antrun.version>
@@ -89,10 +89,10 @@
<plugin.dependency.version>3.3.0</plugin.dependency.version>
<plugin.enforcer.version>3.1.0</plugin.enforcer.version>
<plugin.install.version>3.0.1</plugin.install.version>
- <plugin.jar.version>3.2.2</plugin.jar.version>
- <plugin.javadoc.version>3.4.0</plugin.javadoc.version>
- <plugin.jxr.version>3.2.0</plugin.jxr.version>
- <plugin.project-info-reports.version>3.4.0</plugin.project-info-reports.version>
+ <plugin.jar.version>3.3.0</plugin.jar.version>
+ <plugin.javadoc.version>3.4.1</plugin.javadoc.version>
+ <plugin.jxr.version>3.3.0</plugin.jxr.version>
+ <plugin.project-info-reports.version>3.4.1</plugin.project-info-reports.version>
<plugin.release.version>3.0.0-M6</plugin.release.version>
<plugin.remote-resources.version>3.0.0</plugin.remote-resources.version>
<plugin.resources.version>3.3.0</plugin.resources.version>
@@ -716,11 +716,11 @@
<jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
</configuration>
- <dependencies><!-- https://github.com/wro4j/wro4j/issues/1039#issuecomment-382474533 -->
+ <dependencies><!-- https://github.com/wro4j/wro4j/issues/1129 -->
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>glob</artifactId>
+ <version>7.2.0</version>
</dependency>
</dependencies>
</plugin>
[jspwiki] 07/07: Update Mockito to 4.8.1 - closes #225
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 191d4bfa65818292f83ca83cec492221fc6a424a
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 22:25:13 2022 +0200
Update Mockito to 4.8.1 - closes #225
---
ChangeLog.md | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index a434bfea9..b3b24791d 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -32,6 +32,7 @@ under the License.
* JUnit to 5.9.1
* Log4J to 2.19.0
* Lucene to 9.4.0
+ * Mockito to 4.8.1 (closes/superseeds [#225](https://github.com/apache/jspwiki/pull/225))
* NekoHTML to 2.1.2
* Selenide to 6.9.0 (closes [#233](https://github.com/apache/jspwiki/pull/233)), thanks to dependabot
* Tika to 2.5.0
diff --git a/pom.xml b/pom.xml
index 5c8c772f7..fecd3836c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
<junit.version>5.9.1</junit.version>
<log4j2.version>2.19.0</log4j2.version>
<lucene.version>9.4.0</lucene.version>
- <mockito.version>4.6.1</mockito.version>
+ <mockito.version>4.8.1</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
[jspwiki] 02/07: require JDK-11, drop JDK-8 build, tentatively build with jdk-19
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 4aa268cd5bd6d7e7bfb649300d0f80bee4ef7edd
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 21:10:03 2022 +0200
require JDK-11, drop JDK-8 build, tentatively build with jdk-19
---
Jenkinsfile | 11 +++++++----
README.md | 4 ++--
UPGRADING | 12 +++++++++++-
jspwiki-portable/build.xml | 4 ++--
pom.xml | 4 ++--
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index aecebd482..b7c76a1e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,9 +18,9 @@
*/
buildRepo = 'https://github.com/apache/jspwiki'
-buildJdk8 = 'jdk_1.8_latest'
buildJdk11 = 'jdk_11_latest'
buildJdk17 = 'jdk_17_latest'
+buildJdk19 = 'jdk_19_latest'
buildMvn = 'maven_3_latest'
errMsg = ''
@@ -30,11 +30,14 @@ try {
parallel jdk11Build: {
buildAndSonarWith( buildJdk11 )
},
- jdk8Build: {
- buildWith( buildJdk8 )
- },
jdk17Build: {
buildWith( buildJdk17 )
+ },
+ jdk19Build: {
+ // don't fail build if jdk-19 build doesn't succeed
+ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+ buildWith( buildJdk19 )
+ }
}
}
diff --git a/README.md b/README.md
index 3b5e19bb6..3d43a5131 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache JSPWiki 2.11 - Documentation
+# Apache JSPWiki 2.12 - Documentation
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -45,7 +45,7 @@ REQUIRED:
* And of course, a server to run the JSP engine on.
-* JDK 8+
+* JDK 11+
OPTIONAL:
diff --git a/UPGRADING b/UPGRADING
index 08588c232..a14f33ece 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,5 +1,5 @@
-Apache JSPWiki 2.11.0 - Upgrading Notes
+Apache JSPWiki 2.12.0 - Upgrading Notes
==================================================
Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,16 @@ Apache JSPWiki 2.11.0 - Upgrading Notes
The license file can be found in LICENSE.
+Upgrading JSPWiki to 2.12.0
+---------------------------
+
+Please see https://jspwiki-wiki.apache.org/Wiki.jsp?page=NewIn2.12 for details
+
+1. New requirements
+ * Java 11 needed to run JSPWiki
+
+2. Backwards API incompatible changes: https://jspwiki.apache.org/japicmp/2.12.0/
+
Upgrading JSPWiki to 2.11.0
---------------------------
diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index 06031ff52..b8758553a 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -26,7 +26,7 @@
<property environment="env"/>
<!-- the build version if not overwritten by the caller -->
- <property name="jspwiki.woas.version" value="2.11.0" />
+ <property name="jspwiki.woas.version" value="2.12.0" />
<!-- define the temporary build directory -->
<property name="jspwiki.woas.target.dir" value="${basedir}/target" />
@@ -159,7 +159,7 @@
<cp>${basedir}/target/unpack/tomcat/${jspwiki.tomcat.distribution}/bin/tomcat-juli.jar</cp>
</classPath>
<singleInstance mutexName="org.apache.jspwiki.jspwiki-portable" />
- <jre minVersion="1.8.0" />
+ <jre minVersion="11.0.0" />
<versionInfo
fileVersion="${jspwiki.woas.version}.0"
txtFileVersion="JSPWiki ${jspwiki.woas.version}"
diff --git a/pom.xml b/pom.xml
index c51878229..066372791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2022-07-30T11:42:48Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases -->
- <jdk.version>1.8</jdk.version>
- <jdk.javadoc.doclet.version>1.1.4</jdk.javadoc.doclet.version>
+ <jdk.version>11</jdk.version>
+ <jdk.javadoc.doclet.version>2.0.19</jdk.javadoc.doclet.version>
<maven.version>3.5</maven.version>
<akismet-java.version>1.02</akismet-java.version>
[jspwiki] 05/07: Update portable build binaries
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 f361900d290980b586e3b4acec41ec2b1244cd5b
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Wed Oct 19 21:12:52 2022 +0200
Update portable build binaries
---
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 34700 -> 34701 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 47050 -> 49002 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3670538 -> 3665488 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 863127b08..af85ac7f8 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 301ecf3d2..e39305ee0 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 41dbdb4e6..980d953dc 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ