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 2023/05/05 20:37:16 UTC
[jspwiki] branch master updated (6256f8b8c -> 8d82efd00)
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 6256f8b8c Add default maven goal.
new 166b24957 Update mockito to 5.3.1 (closes #269) and flexmark-java to 0.64.2 (closes #270)
new 58df877a7 2.12.0-git-06
new 8d82efd00 prepare for 2.12.0
The 3 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 | 11 ++++++-
LICENSE | 36 +++++++++++-----------
.../src/main/java/org/apache/wiki/api/Release.java | 4 +--
pom.xml | 4 +--
4 files changed, 32 insertions(+), 23 deletions(-)
[jspwiki] 03/03: prepare for 2.12.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 8d82efd006ac63d8a0a783b3953135a416d0eb96
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 5 22:36:57 2023 +0200
prepare for 2.12.0
---
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 ed56713d1..6020ad018 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 = "-git-";
+ 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 = "06";
+ public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out the version. It is of
[jspwiki] 01/03: Update mockito to 5.3.1 (closes #269) and flexmark-java to 0.64.2 (closes #270)
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 166b249576362e5f4f05a561f90a0a2e35eb4ebd
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 5 22:35:17 2023 +0200
Update mockito to 5.3.1 (closes #269) and flexmark-java to 0.64.2 (closes #270)
---
LICENSE | 36 ++++++++++++++++++------------------
pom.xml | 4 ++--
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/LICENSE b/LICENSE
index cf5916ea6..9d6716f13 100644
--- a/LICENSE
+++ b/LICENSE
@@ -221,24 +221,24 @@ commons-lang-3.12.0.jar LICENSE
commons-logging-1.0.4.jar LICENSE
commons-text-1.9.jar LICENSE
ehcache-2.10.9.2.jar LICENSE
-flexmark-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-attributes-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-definition-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-footnotes-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-tables-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-ext-toc-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-ast-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-builder-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-collection-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-data-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-dependency-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-format-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-html-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-misc-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-options-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-sequence-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
-flexmark-util-visitor-0.64.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-attributes-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-definition-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-footnotes-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-tables-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-ext-toc-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-ast-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-builder-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-collection-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-data-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-dependency-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-format-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-html-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-misc-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-options-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-sequence-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
+flexmark-util-visitor-0.64.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.flexmark
freshcookies-security-0.60.jar LICENSE
gson-2.10.1 LICENSE
httpclient-4.5.13 LICENSE
diff --git a/pom.xml b/pom.xml
index a2c0ceda0..891e78c4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.10.0</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
- <flexmark.version>0.64.0</flexmark.version>
+ <flexmark.version>0.64.2</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
<gson.version>2.10.1</gson.version>
<hsqldb.version>2.7.1</hsqldb.version>
@@ -70,7 +70,7 @@
<junit.version>5.9.3</junit.version>
<log4j2.version>2.20.0</log4j2.version>
<lucene.version>9.5.0</lucene.version>
- <mockito.version>5.2.0</mockito.version>
+ <mockito.version>5.3.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/03: 2.12.0-git-06
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 58df877a7bdce33d3ca54b19561ad0b03c1b9c67
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 5 22:35:47 2023 +0200
2.12.0-git-06
---
ChangeLog.md | 11 ++++++++++-
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index dc5b6fe02..645f0caed 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,16 @@ specific language governing permissions and limitations
under the License.
-->
+**2023-05-05 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.0-git-06_
+
+* Merged [#241](https://github.com/apache/jspwiki/pull/241), provided by [Arturo Bernal](https://github.com/arturobernalg), thanks!
+
+* Dependency updates
+ * Flexmark to 0.64.2 (closes [#270](https://github.com/apache/jspwiki/pull/270)), thanks to dependabot
+ * Mockito to 5.3.1 (closes [#269](https://github.com/apache/jspwiki/pull/269)), thanks to dependabot
+
**2023-04-28 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.0-git-05_
@@ -27,7 +37,6 @@ under the License.
* Gson to 2.10.1 (closes [#265](https://github.com/apache/jspwiki/pull/265)), thanks to dependabot
* Jaxen to 2.0.0 (closes [#264](https://github.com/apache/jspwiki/pull/264)), thanks to dependabot
* JUnit to 5.9.3
- * Mockito to 5.3.1
* Selenide to 6.13.1
* Tomcat to 9.0.74
* Maven plugins: enforcer to 3.3.0 (closes [#266](https://github.com/apache/jspwiki/pull/266), thanks to dependabot), project-info-reports to 3.4.3
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 33b91e0d8..ed56713d1 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 = "05";
+ public static final String BUILD = "06";
/**
* This is the generic version string you should use when printing out the version. It is of