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/11/25 14:28:31 UTC
(jspwiki) branch master updated (4b2323ce6 -> 7b4e95c13)
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 4b2323ce6 Update Viewer.js
new 87bbf3fa7 Add some unit tests for URLConstructor#parsePageFromURL
new 2340cd013 fix typo
new 2c83da12c Update dependencies
new 7b4e95c13 2.12.2-git-09
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 | 12 ++++++++++
LICENSE | 2 +-
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 2 +-
.../org/apache/wiki/url/UrlConstructorTest.java | 28 ++++++++++++++++++++++
pom.xml | 6 ++---
6 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
(jspwiki) 03/04: 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 2c83da12c59b6575b8f4d04577c77172ecc9ccce
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Sat Nov 25 15:27:28 2023 +0100
Update dependencies
* Mockito to 5.7.0 (closes #319, thanks to dependabot)
* Cargo maven plugin to 1.10.10 (closes #320, thanks to dependabot)
---
LICENSE | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/LICENSE b/LICENSE
index 6a399276f..912ad116f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -288,7 +288,7 @@ sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LI
jamm-0.4.0.jar LICENSE
jetty-all-9.4.53.v20231009.jar LICENSE
junit-5.10.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
-mockito-core-5.5.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+mockito-core-5.7.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui
diff --git a/pom.xml b/pom.xml
index 6deed41f2..1ffdbaf4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2023-08-07T19:55:12Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases -->
<jdk.version>11</jdk.version>
- <jdk.javadoc.doclet.version>2.1.0</jdk.javadoc.doclet.version>
+ <jdk.javadoc.doclet.version>2.1.1</jdk.javadoc.doclet.version>
<maven.version>3.5</maven.version>
<akismet-java.version>1.02</akismet-java.version>
@@ -70,7 +70,7 @@
<junit.version>5.10.1</junit.version>
<log4j2.version>2.20.0</log4j2.version>
<lucene.version>9.8.0</lucene.version>
- <mockito.version>5.5.0</mockito.version>
+ <mockito.version>5.7.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
@@ -104,7 +104,7 @@
<plugin.jspc.version>3.2.2</plugin.jspc.version>
<plugin.checksum.version>1.11</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
- <plugin.cargo.version>1.10.9</plugin.cargo.version>
+ <plugin.cargo.version>1.10.10</plugin.cargo.version>
<plugin.clirr.version>2.8</plugin.clirr.version>
<plugin.cobertura.version>2.7</plugin.cobertura.version>
<plugin.sonar.version>3.10.0.2594</plugin.sonar.version>
(jspwiki) 02/04: fix typo
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 2340cd0134fecb7a29f5c4f24cddc08150f77e5d
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Sat Nov 25 15:25:47 2023 +0100
fix typo
---
jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index 9f961efea..fa8590d92 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -99,7 +99,7 @@ public class WikiJSPFilter extends WikiServletFilter {
fireEvent( WikiPageEvent.PAGE_REQUESTED, pagename );
super.doFilter( request, responseWrapper, chain );
- // The response is now complete. Lets replace the markers now.
+ // The response is now complete. Let's replace the markers now.
// WikiContext is only available after doFilter! (That is after interpreting the jsp)
(jspwiki) 01/04: Add some unit tests for URLConstructor#parsePageFromURL
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 87bbf3fa7c8c291611d2837788ebccedf6f35e66
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Sat Nov 25 15:25:32 2023 +0100
Add some unit tests for URLConstructor#parsePageFromURL
---
.../org/apache/wiki/url/UrlConstructorTest.java | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
new file mode 100644
index 000000000..1af5a9490
--- /dev/null
+++ b/jspwiki-main/src/test/java/org/apache/wiki/url/UrlConstructorTest.java
@@ -0,0 +1,28 @@
+package org.apache.wiki.url;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
+
+class UrlConstructorTest {
+
+ @Test
+ void testParsePageFromURLUsingPathInfo() {
+ final HttpServletRequest req = Mockito.mock( HttpServletRequest.class );
+ Mockito.doReturn( "MyPage" ).when( req ).getPathInfo();
+ Assertions.assertEquals( "MyPage", URLConstructor.parsePageFromURL( req, StandardCharsets.UTF_8 ) );
+ }
+
+ @Test
+ void testParsePageFromURLUsingRequestParam() {
+ final HttpServletRequest req = Mockito.mock( HttpServletRequest.class );
+ Mockito.doReturn( null ).when( req ).getPathInfo();
+ Mockito.doReturn( "MyPage", ( String )null ).when( req ).getParameter( "page" );
+ Assertions.assertEquals( "MyPage", URLConstructor.parsePageFromURL( req, StandardCharsets.UTF_8 ) );
+ Assertions.assertNull( URLConstructor.parsePageFromURL( req, StandardCharsets.UTF_8 ) ); // no req parameter should return null
+ }
+
+}
(jspwiki) 04/04: 2.12.2-git-09
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 7b4e95c131a24c12113472e105c7319759ddd10d
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Sat Nov 25 15:27:48 2023 +0100
2.12.2-git-09
---
ChangeLog.md | 12 ++++++++++++
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index d6b99dd7e..1ea85bec8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,18 @@ specific language governing permissions and limitations
under the License.
-->
+**2023-11-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-09_
+
+* Make `URLConstructor#parsePageFromURL` work with default URL style (closes [#322](https://github.com/apache/jspwiki/pull/322), thanks to Ulf Dittmer)
+
+* Update `Viewer.js` so that Vimeo uses html5 player instead of the flash based one (closes [#321](https://github.com/apache/jspwiki/pull/321), thanks to Ulf Dittmer)
+
+* Dependency updates
+ * Mockito to 5.7.0 (closes [#319](https://github.com/apache/jspwiki/pull/319), thanks to dependabot)
+ * Maven plugins: cargo to 1.10.10 (closes [#320](https://github.com/apache/jspwiki/pull/320), thanks to dependabot)
+
**2023-11-19 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-08_
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 b96bcaa45..97c850251 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 = "08";
+ public static final String BUILD = "09";
/**
* This is the generic version string you should use when printing out the version. It is of