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 d718b8225954f0b52fa08b581c0c325e713152d9
Author: Juan Pablo Santos RodrÃguez <juanpablo.san...@gmail.com>
AuthorDate: Sat Apr 27 15:58:05 2024 +0200
2.12.2-git-13
---
ChangeLog.md | 19 +++++++++++++++++++
LICENSE | 7 ++++---
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 81bd61fe3..90eacef23 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,25 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-04-27 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-13_
+
+* [JSPWIKI-1188](https://issues.apache.org/jira/browse/JSPWIKI-1188) - Support
system property / env replacement for JSPWiki configuration properties
+ * [PR #330](https://github.com/apache/jspwiki/pull/330) provided by Alex
O'Ree, thanks!
+
+* `MailUtil` now uses every `mail.smtp` / `mail.smtps` property provided
through your `jspwiki[-custom].properties` file
+ * This allows to set f.ex., `mail.smtp.ssl.protocols=TLSv1.2` or
`mail.smtp.ssl.trust=your.domain.org`
+ * Keep in mind that, to you use `mail.smtps`, you should override to blank
default `mail.smtp` properties at `jspwiki.properties`
+
+* Dependency updates
+ * Apache parent to 32
+ * Commons Text to 1.12.0
+ * JavaMail to 1.6.2
+ * Jetty to 9.4.54.v20240208 (closes [PR
#334](https://github.com/apache/jspwiki/pull/334), thanks to Dependabot)
+ * Tomcat to 9.0.88
+ * Maven plugins: jar to 3.4.1, cargo to 1.10.12 (closes [PR
#331](https://github.com/apache/jspwiki/pull/331), thanks to Dependabot), sonar
to 3.11.0.3922 (closes [PR #333](https://github.com/apache/jspwiki/pull/333),
thanks to Dependabot)
+
**2024-04-09 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-12_
diff --git a/LICENSE b/LICENSE
index aa2de99ee..b0deb7545 100644
--- a/LICENSE
+++ b/LICENSE
@@ -219,7 +219,7 @@ commons-httpclient-3.1.jar LICENSE
commons-io-2.16.1.jar LICENSE
commons-lang-3.14.0.jar LICENSE
commons-logging-1.0.4.jar LICENSE
-commons-text-1.11.0.jar LICENSE
+commons-text-1.12.0.jar LICENSE
ehcache-2.10.9.2.jar LICENSE
flexmark-0.64.8.jar
./jspwiki-war/src/main/config/doc/LICENSE.flexmark
flexmark-ext-attributes-0.64.8.jar
./jspwiki-war/src/main/config/doc/LICENSE.flexmark
@@ -253,6 +253,7 @@ jdom2-2.0.6.jar
./jspwiki-war/src/main/config/doc/LI
jmespath-java-1.12.565 LICENSE
joda-time-2.8.1 LICENSE
jstl-1.2.jar LICENSE
+logging-mailhandler-1.6.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
log4j-1.2-api-2.23.0.jar LICENSE
log4j-api-2.23.0.jar LICENSE
log4j-core-2.23.0.jar LICENSE
@@ -265,7 +266,7 @@ lucene-memory-9.10.0.jar LICENSE
lucene-queries-9.10.0.jar LICENSE
lucene-queryparser-9.10.0.jar LICENSE
lucene-sandbox-9.10.0.jar LICENSE
-mail-1.4.7.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
+javax.mail-1.6.2.jar
./jspwiki-war/src/main/config/doc/LICENSE.cddl
nekohtml-2.0.2.jar (codelibs fork) LICENSE
org.suigeneris.jrcs.diff-0.4.2 LICENSE
oro-2.0.8.jar LICENSE
@@ -305,7 +306,7 @@ SlimBox
./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.87 LICENSE
+Apache Tomcat 9.0.88 LICENSE
Font Awesome (CSS & LESS files)
./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts)
./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet
./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
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 1c6bef6af..e09d1299a 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 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "12";
+ public static final String BUILD = "13";
/**
* This is the generic version string you should use when printing out
the version. It is of
