[jspwiki] branch master updated: update changelog
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 The following commit(s) were added to refs/heads/master by this push: new 6d0dcc23b update changelog 6d0dcc23b is described below commit 6d0dcc23bfe3e841fba961b13361a4be722cd175 Author: Juan Pablo Santos Rodríguez AuthorDate: Fri May 5 22:44:16 2023 +0200 update changelog --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 645f0caed..2ac0518cb 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -24,7 +24,7 @@ under the License. * 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 +* Flexmark to 0.64.4 (closes [#270](https://github.com/apache/jspwiki/pull/270) and [#271](https://github.com/apache/jspwiki/pull/271)), 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)**
[jspwiki] branch master updated (8d82efd00 -> 1f36589c8)
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 8d82efd00 prepare for 2.12.0 add 1f36589c8 Update flexmark-java to 0.64.4 - closes #271 No new revisions were added by this update. Summary of changes: LICENSE | 36 ++-- pom.xml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-)
[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] 01/03: Update mockito to 5.3.1 (closes #269) and flexmark-java to 0.64.2 (closes #270)
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 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.jarLICENSE ehcache-2.10.9.2.jarLICENSE -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 @@ 3.12.0 1.10.0 2.10.9.2 -0.64.0 +0.64.2 0.60 2.10.1 2.7.1 @@ -70,7 +70,7 @@ 5.9.3 2.20.0 9.5.0 -5.2.0 +5.3.1 2.1.2 2.0.8 0.5
[jspwiki] 02/03: 2.12.0-git-06
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
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 {
*
* 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
[jspwiki] 03/03: prepare for 2.12.0
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
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 {
*
* If the POSTFIX is empty, it is not added to the version string.
*/
-private static final StringPOSTFIX = "-git-";
+private static final StringPOSTFIX = "";
/** The JSPWiki major version. */
public static final intVERSION = 2;
@@ -69,7 +69,7 @@ public final class Release {
*
* 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] branch master updated (7b1d9eaaa -> 6256f8b8c)
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 7b1d9eaaa fix compilation errors introduced by #240 add 6256f8b8c Add default maven goal. No new revisions were added by this update. Summary of changes: mvn_cheat-sheet.md | 1 + pom.xml| 1 + 2 files changed, 2 insertions(+)
[jspwiki] branch master updated: fix compilation errors introduced by #240
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
The following commit(s) were added to refs/heads/master by this push:
new 7b1d9eaaa fix compilation errors introduced by #240
7b1d9eaaa is described below
commit 7b1d9eaaacd747d78482a2bd7d94784cc7443cb0
Author: Juan Pablo Santos Rodríguez
AuthorDate: Fri Apr 28 23:02:07 2023 +0200
fix compilation errors introduced by #240
---
.../src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java | 2 +-
.../src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 9 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
index 026237427..62fad8eb5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
@@ -518,7 +518,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
* @return the text nodes that are immediate children of the base element,
concatenated together
*/
private String extractText( final Element element ) {
-final String text = "";
+String text = "";
if( element.getChildNodes().getLength() > 0 ) {
final NodeList children = element.getChildNodes();
text = IntStream.range(0,
children.getLength()).mapToObj(children::item).filter(child ->
child.getNodeType() == Node.TEXT_NODE).map(child -> ((Text)
child).getData()).collect(Collectors.joining());
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
index 28dbfbff4..ec7f88c05 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java
@@ -33,7 +33,6 @@ import java.util.Date;
import java.util.Hashtable;
import java.util.Set;
import java.util.Vector;
-import java.util.stream.Collectors;
/**
* Provides definitions for RPC handler routines.
@@ -73,7 +72,7 @@ public abstract class AbstractRPCHandler implements
WikiRPCHandler {
public Vector getRecentChanges( final Date since ) {
checkPermission( PagePermission.VIEW );
final Set< Page > pages = m_engine.getManager( PageManager.class
).getRecentChanges();
-final Vector< Hashtable< ?, ? > > result;
+final Vector< Hashtable< ?, ? > > result = new Vector<>();
// Transform UTC into local time.
final Calendar cal = Calendar.getInstance();
@@ -81,7 +80,11 @@ public abstract class AbstractRPCHandler implements
WikiRPCHandler {
cal.add( Calendar.MILLISECOND, cal.get( Calendar.ZONE_OFFSET ) +
(cal.getTimeZone().inDaylightTime( since ) ? cal.get(
Calendar.DST_OFFSET ) : 0 ) );
-result = pages.stream().filter(page ->
page.getLastModified().after(cal.getTime())).map(this::encodeWikiPage).collect(Collectors.toCollection(Vector::new));
+for( final Page page : pages ) {
+if( page.getLastModified().after( cal.getTime() ) ) {
+result.add( encodeWikiPage( page ) );
+}
+}
return result;
}
[jspwiki] branch master updated (42a70bcdc -> a9a90caa6)
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 42a70bcdc implements Serializable tp Non-Serializable classes that define a serialVersionUID field. add 96ac92c21 remove unneeded package add 483ddf984 add format add 22323c591 update portable binaries to tomcat 9.0.74 add d84716e71 Update dependencies add d493ee543 update versions add a9a90caa6 2.12.0-git-05 No new revisions were added by this update. Summary of changes: ChangeLog.md | 15 +++ LICENSE| 12 +-- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../org/apache/wiki/preferences/Preferences.java | 2 +- .../src/main/java/org/apache/wiki/tags/TabTag.java | 114 - .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35213 -> 35213 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 48971 -> 48970 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3682537 -> 3694121 bytes pom.xml| 14 +-- 9 files changed, 71 insertions(+), 88 deletions(-)
[jspwiki] branch master updated: implements Serializable tp Non-Serializable classes that define a serialVersionUID field.
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
The following commit(s) were added to refs/heads/master by this push:
new 42a70bcdc implements Serializable tp Non-Serializable classes that
define a serialVersionUID field.
42a70bcdc is described below
commit 42a70bcdc494ef7ede27c74936e4a732bd887255
Author: Arturo Bernal
AuthorDate: Fri Jul 22 21:53:17 2022 +0200
implements Serializable tp Non-Serializable classes that define a
serialVersionUID field.
---
.../main/java/org/apache/wiki/references/DefaultReferenceManager.java | 2 +-
.../src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
index 1c5b2b6a0..d293705af 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
@@ -107,7 +107,7 @@ import java.util.stream.Collectors;
// FIXME: The way that we save attributes is now a major booboo, and must be
//replaced forthwith. However, this is a workaround for the great deal
//of problems that occur here...
-public class DefaultReferenceManager extends BasePageFilter implements
ReferenceManager {
+public class DefaultReferenceManager extends BasePageFilter implements
ReferenceManager, Serializable {
/**
* Maps page wikiname to a Collection of pages it refers to. The
Collection must contain Strings. The Collection may contain
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
index 473abe866..8c9ac578a 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
@@ -47,7 +47,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
* users or groups expected to approve particular Workflows.
*
*/
-public class DefaultWorkflowManager implements WorkflowManager {
+public class DefaultWorkflowManager implements WorkflowManager, Serializable {
private static final Logger LOG = LogManager.getLogger(
DefaultWorkflowManager.class );
static final String SERIALIZATION_FILE = "wkflmgr.ser";
[jspwiki] branch master updated: Use java Stream instead.
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
The following commit(s) were added to refs/heads/master by this push:
new 0013d81d6 Use java Stream instead.
0013d81d6 is described below
commit 0013d81d626174ee8e72b851ab8c58091670e402
Author: Arturo Bernal
AuthorDate: Thu Oct 20 21:58:06 2022 +0200
Use java Stream instead.
---
.../src/main/java/org/apache/wiki/WikiSession.java | 15 ++-
.../apache/wiki/auth/AuthenticationManager.java| 7 +
.../wiki/auth/DefaultAuthorizationManager.java | 6 +
.../java/org/apache/wiki/auth/SessionMonitor.java | 7 +++--
.../org/apache/wiki/auth/acl/AclEntryImpl.java | 21 +++
.../java/org/apache/wiki/auth/acl/AclImpl.java | 7 +
.../wiki/auth/authorize/DefaultGroupManager.java | 8 ++
.../java/org/apache/wiki/auth/authorize/Group.java | 21 +++
.../auth/authorize/WebContainerAuthorizer.java | 30 +-
.../wiki/auth/permissions/GroupPermission.java | 8 +-
.../org/apache/wiki/auth/user/XMLUserDatabase.java | 22 +---
.../apache/wiki/diff/ContextualDiffProvider.java | 24 +
.../org/apache/wiki/filters/ProfanityFilter.java | 10 ++--
.../java/org/apache/wiki/parser/LinkParser.java| 7 ++---
.../apache/wiki/plugin/AbstractReferralPlugin.java | 16
.../main/java/org/apache/wiki/plugin/Denounce.java | 7 +
.../java/org/apache/wiki/plugin/IndexPlugin.java | 12 +++--
.../wiki/plugin/ReferringUndefinedPagesPlugin.java | 14 --
.../wiki/providers/CachingAttachmentProvider.java | 6 +
.../wiki/references/DefaultReferenceManager.java | 19 +++---
.../org/apache/wiki/render/CreoleRenderer.java | 5 ++--
.../apache/wiki/search/LuceneSearchProvider.java | 17
.../org/apache/wiki/tags/AdminBeanIteratorTag.java | 8 ++
.../org/apache/wiki/tags/EditorIteratorTag.java| 7 +++--
.../java/org/apache/wiki/tags/UserProfileTag.java | 18 +
.../main/java/org/apache/wiki/ui/Installer.java| 9 +++
.../org/apache/wiki/ui/WikiRequestWrapper.java | 11 ++--
.../wiki/ui/admin/DefaultAdminBeanManager.java | 7 +
.../wiki/variables/DefaultVariableManager.java | 22 +++-
.../wiki/workflow/DefaultWorkflowManager.java | 7 ++---
.../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 9 +++
.../java/org/apache/wiki/xmlrpc/RPCHandler.java| 10 ++--
.../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 10 ++--
.../main/java/org/apache/wiki/util/TextUtil.java | 15 +++
.../org/apache/wiki/util/TimedCounterList.java | 10 ++--
.../main/java/org/apache/wiki/util/XmlUtil.java| 11 +++-
.../htmltowiki/XHtmlElementToWikiTranslator.java | 7 ++---
37 files changed, 110 insertions(+), 340 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
index 318b2156b..c161cf6e7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -91,12 +91,7 @@ public class WikiSession implements Session {
* @return the result
*/
protected boolean isInGroup( final Group group ) {
-for( final Principal principal : getPrincipals() ) {
-if( isAuthenticated() && group.isMember( principal ) ) {
-return true;
-}
-}
-return false;
+return Arrays.stream(getPrincipals()).anyMatch(principal ->
isAuthenticated() && group.isMember(principal));
}
/**
@@ -211,16 +206,10 @@ public class WikiSession implements Session {
/** {@inheritDoc} */
@Override
public Principal[] getPrincipals() {
-final ArrayList< Principal > principals = new ArrayList<>();
// Take the first non Role as the main Principal
-for( final Principal principal : m_subject.getPrincipals() ) {
-if ( AuthenticationManager.isUserPrincipal( principal ) ) {
-principals.add( principal );
-}
-}
-return principals.toArray( new Principal[0] );
+return
m_subject.getPrincipals().stream().filter(AuthenticationManager::isUserPrincipal).toArray(Principal[]::new);
}
/** {@inheritDoc} */
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
index 72a93f92a..3657473ca 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
@@ -187,12 +187,7 @@ public interface AuthenticationManager extends
[jspwiki] branch master updated: Remove unnecessary variables. There re not used in the scope.
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
The following commit(s) were added to refs/heads/master by this push:
new 116c0c236 Remove unnecessary variables. There re not used in the scope.
116c0c236 is described below
commit 116c0c23629ab9f8b80befcf7f8f05bd15b0beeb
Author: Arturo Bernal
AuthorDate: Sun Feb 5 18:16:06 2023 +0100
Remove unnecessary variables. There re not used in the scope.
---
.../apache/wiki/content/DefaultPageRenamer.java| 14 +++
.../java/org/apache/wiki/filters/SpamFilter.java | 46 +++---
.../apache/wiki/parser/JSPWikiMarkupParser.java| 11 +++---
.../wiki/references/DefaultReferenceManager.java | 5 +--
4 files changed, 36 insertions(+), 40 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
index 8cb403f5d..16371e4f9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
@@ -179,11 +179,11 @@ public class DefaultPageRenamer implements PageRenamer {
final Page p = engine.getManager( PageManager.class ).getPage(
pageName );
final String sourceText = engine.getManager( PageManager.class
).getPureText( p );
-String newText = replaceReferrerString( context, sourceText,
fromPage.getName(), toPage.getName() );
+String newText = replaceReferrerString(sourceText,
fromPage.getName(), toPage.getName() );
m_camelCase = TextUtil.getBooleanProperty(
engine.getWikiProperties(), MarkupParser.PROP_CAMELCASELINKS, m_camelCase );
if( m_camelCase ) {
-newText = replaceCCReferrerString( context, newText,
fromPage.getName(), toPage.getName() );
+newText = replaceCCReferrerString(newText, fromPage.getName(),
toPage.getName() );
}
if( !sourceText.equals( newText ) ) {
@@ -226,7 +226,7 @@ public class DefaultPageRenamer implements PageRenamer {
/**
* Replaces camelcase links.
*/
-private String replaceCCReferrerString( final Context context, final
String sourceText, final String from, final String to ) {
+private String replaceCCReferrerString( final String sourceText, final
String from, final String to ) {
final StringBuilder sb = new StringBuilder( sourceText.length()+32 );
final Pattern linkPattern = Pattern.compile(
"\\p{Lu}+\\p{Ll}+\\p{Lu}+[\\p{L}\\p{Digit}]*" );
final Matcher matcher = linkPattern.matcher( sourceText );
@@ -252,7 +252,7 @@ public class DefaultPageRenamer implements PageRenamer {
return sb.toString();
}
-private String replaceReferrerString( final Context context, final String
sourceText, final String from, final String to ) {
+private String replaceReferrerString(final String sourceText, final String
from, final String to ) {
final StringBuilder sb = new StringBuilder( sourceText.length()+32 );
// This monstrosity just looks for a JSPWiki link pattern. But it is
pretty cool for a regexp, isn't it? If you can
@@ -280,9 +280,9 @@ public class DefaultPageRenamer implements PageRenamer {
final String attr = matcher.group(6);
if( link.isEmpty() ) {
-text = replaceSingleLink( context, text, from, to );
+text = replaceSingleLink(text, from, to );
} else {
-link = replaceSingleLink( context, link, from, to );
+link = replaceSingleLink(link, from, to );
// A very simple substitution, but should work for quite a
few cases.
text = TextUtil.replaceString( text, from, to );
@@ -312,7 +312,7 @@ public class DefaultPageRenamer implements PageRenamer {
/**
* This method does a correct replacement of a single link, taking into
account anchors and attachments.
*/
-private String replaceSingleLink( final Context context, final String
original, final String from, final String newlink ) {
+private String replaceSingleLink(final String original, final String from,
final String newlink ) {
final int hash = original.indexOf( '#' );
final int slash = original.indexOf( '/' );
String realLink = original;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
index c12940119..1160d8b74 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
@@ -314,10 +314,10 @@ public class SpamFilter extends Base
[jspwiki-asf-docs] branch master updated: [DRAFT] 2023/04 Board report
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new 171be84 [DRAFT] 2023/04 Board report 171be84 is described below commit 171be8405e33a779c1f46777a81107874e39efb4 Author: Juan Pablo Santos Rodríguez AuthorDate: Mon Apr 10 21:37:03 2023 +0200 [DRAFT] 2023/04 Board report --- board-reports/2023-04.txt | 35 +++ 1 file changed, 35 insertions(+) diff --git a/board-reports/2023-04.txt b/board-reports/2023-04.txt new file mode 100755 index 000..cb5a36a --- /dev/null +++ b/board-reports/2023-04.txt @@ -0,0 +1,35 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Issues: +There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (10 years ago) +There are currently 14 committers and 8 PMC members in this project. +The Committer-to-PMC ratio is 7:4. + +Community changes, past quarter: +- No new PMC members. Last addition was Dave Koelmeyer on 2016-04-06. +- No new committers. Last addition was Dave Koelmeyer on 2016-04-06. + +## Project Activity: +Quiet period, with small developments pushed into master. Aiming for the +2.12.0 release, the associated vote should start somewhere this week. This +release contains a fix for some XSS vulnerabilities that has been sitting +on master for a while now. We would like to thank Arnout Engelen from the +Security team for kindly following through this reports and ensuring they +are fixed and released on a reasonable time span. + +This quarter we've also reviewed almost all of our pending PRs, and +discarded a bunch of dependabot false positives. + +Last release was 2.11.3 on 2022-08-02. + +## Community Health: +Traffic on both MLs has decreased compared with last quarter, mostly +reflecting PRs movement. + +There is enough people appearing on the ML and providing project oversight.
[jspwiki] branch master updated: fix markdown heading
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 The following commit(s) were added to refs/heads/master by this push: new 457f182c9 fix markdown heading 457f182c9 is described below commit 457f182c9adf59f0dfcf753ee89fbd36b556d9fb Author: Juan Pablo Santos Rodríguez AuthorDate: Fri Mar 31 00:11:28 2023 +0200 fix markdown heading --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index 2393eb7d1..dd577b3de 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -16,6 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> + **2023-03-26 Dirk Frederickx (brushed AT apache DOT org)** * Remove files incorrectly added to the code base.
[jspwiki] 01/02: ansiColor seems to have been removed from builds.a.o
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 04efed62c5fa308bc8bc530f123999130a35b5f8
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Mar 30 23:05:52 2023 +0200
ansiColor seems to have been removed from builds.a.o
---
Jenkinsfile | 64 ++---
1 file changed, 31 insertions(+), 33 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index edf10f6f1..277913769 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,45 +24,43 @@ buildJdk19 = 'jdk_19_latest'
buildMvn = 'maven_3_latest'
errMsg = ''
-ansiColor( 'xterm' ) {
-try {
+try {
-stage( 'build source' ) {
-parallel jdk11Build: {
-buildAndSonarWith( buildJdk11 )
-},
-jdk17Build: {
-buildWith( buildJdk17 )
-},
-jdk19Build: {
-// don't fail build if jdk-19 build doesn't succeed
-catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-buildWith( buildJdk19 )
-}
+stage( 'build source' ) {
+parallel jdk11Build: {
+buildAndSonarWith( buildJdk11 )
+},
+jdk17Build: {
+buildWith( buildJdk17 )
+},
+jdk19Build: {
+// don't fail build if jdk-19 build doesn't succeed
+catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+buildWith( buildJdk19 )
}
}
+}
-if( env.BRANCH_NAME == 'master' ) {
-build wait: false, job: 'JSPWiki/site', parameters: [ text( name:
'version', value: 'master' ) ]
-}
+if( env.BRANCH_NAME == 'master' ) {
+build wait: false, job: 'JSPWiki/site', parameters: [ text( name:
'version', value: 'master' ) ]
+}
-currentBuild.result = 'SUCCESS'
+currentBuild.result = 'SUCCESS'
-} catch( Exception err ) {
-currentBuild.result = 'FAILURE'
-echo err.message
-errMsg = '- ' + err.message
-} finally {
-node( 'ubuntu' ) {
-if( currentBuild.result == null ) {
-currentBuild.result = 'ABORTED'
-}
-if( env.BRANCH_NAME == 'master' ) {
-emailext body: "See ${env.BUILD_URL} $errMsg",
- replyTo: 'd...@jspwiki.apache.org',
- to: 'commits@jspwiki.apache.org',
- subject: "[${env.JOB_NAME}] build
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
-}
+} catch( Exception err ) {
+currentBuild.result = 'FAILURE'
+echo err.message
+errMsg = '- ' + err.message
+} finally {
+node( 'ubuntu' ) {
+if( currentBuild.result == null ) {
+currentBuild.result = 'ABORTED'
+}
+if( env.BRANCH_NAME == 'master' ) {
+emailext body: "See ${env.BUILD_URL} $errMsg",
+ replyTo: 'd...@jspwiki.apache.org',
+ to: 'commits@jspwiki.apache.org',
+ subject: "[${env.JOB_NAME}] build
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
}
}
}
[jspwiki] branch master updated (7d92f33b0 -> 32dec4f93)
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 7d92f33b0 Merge branch 'master' of https://github.com/apache/jspwiki new 04efed62c ansiColor seems to have been removed from builds.a.o new 32dec4f93 fix last commits order - no version bump The 2 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 | 10 -- Jenkinsfile | 64 +--- 2 files changed, 35 insertions(+), 39 deletions(-)
[jspwiki] 02/02: fix last commits order - no version bump
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 32dec4f93223bc5239cf022c3e8b3ac7c67ad51f Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Mar 30 23:06:21 2023 +0200 fix last commits order - no version bump --- ChangeLog.md | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index c044b4fdc..2393eb7d1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -16,6 +16,10 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> +**2023-03-26 Dirk Frederickx (brushed AT apache DOT org)** + +* Remove files incorrectly added to the code base. + **2023-03-24 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.12.0-git-04_ @@ -45,12 +49,6 @@ downloading them, set the `jspwiki.attachment.forceDownload` property to empty o * Maven plugins: assembly to 3.5.0, compiler to 3.11.0, dependency to 3.5.0, enforcer to 3.2.1, install to 3.1.1, javadoc to 3.5.0, project info reports to 3.4.2, release to 3.0.0, resources to 3.3.1, surefire to 3.0.0, cargo to 1.10.6, jspc to 3.2.2 (closes [#257](https://github.com/apache/jspwiki/pull/257), thanks to dependabot) -**2023-03-26 Dirk Frederickx (brushed AT apache DOT org)** - -* _2.12.0-git-04_ - -* Remove files incorrectly added to the code base. - **2023-01-04 Juan Pablo Santos (juanpablo AT apache DOT org)** * _2.12.0-git-03_
[jspwiki-site] 02/02: update freemarker to 2.3.32, enforcer to 3.2.1 and resources to 3.3.1
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit a77b064e530388b6078c8ae8f7da279e9eb77631
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Mar 30 23:05:05 2023 +0200
update freemarker to 2.3.32, enforcer to 3.2.1 and resources to 3.3.1
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73e1998ffe..ad45bbcfef 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
${project.build.directory}/content
-3.1.0
-3.3.0
+3.2.1
+3.3.1
0.17.1
2.12.0-SNAPSHOT
2.11.0
@@ -46,7 +46,7 @@
UTF-8
UTF-8
0.64.0
-2.3.31
+2.3.32
11
3.5.0
[jspwiki-site] 01/02: ansiColor seems to have been removed from builds.a.o
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit cfabef0ccb6852adeeedda1339de2d8ef990c53d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Mar 30 23:04:16 2023 +0200
ansiColor seems to have been removed from builds.a.o
---
Jenkinsfile | 146 ++--
1 file changed, 72 insertions(+), 74 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e9bce0711f..4cfb4d28aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,97 +25,95 @@ build = 'build'
jbake = 'jbake'
errMsg = ''
-ansiColor( 'xterm' ) {
-try {
+try {
-def pom
-def docsVersion
+def pom
+def docsVersion
-node( 'ubuntu' ) {
-def JAVA_JDK_11=tool name: 'jdk_11_latest', type:
'hudson.model.JDK'
-def MAVEN_3_LATEST=tool name: 'maven_3_latest', type:
'hudson.tasks.Maven$MavenInstallation'
-def version = params?.version ?: 'master'
+node( 'ubuntu' ) {
+def JAVA_JDK_11=tool name: 'jdk_11_latest', type: 'hudson.model.JDK'
+def MAVEN_3_LATEST=tool name: 'maven_3_latest', type:
'hudson.tasks.Maven$MavenInstallation'
+def version = params?.version ?: 'master'
-stage( 'clean workspace' ) {
-cleanWs()
-}
+stage( 'clean workspace' ) {
+cleanWs()
+}
-stage( 'generate apidocs & translations' ) {
-echo "Will use Java $JAVA_JDK_11"
-echo "Will use Maven $MAVEN_3_LATEST"
-def gitVersion = version != 'master' ? "refs/tags/$version" :
'*/master'
+stage( 'generate apidocs & translations' ) {
+echo "Will use Java $JAVA_JDK_11"
+echo "Will use Maven $MAVEN_3_LATEST"
+def gitVersion = version != 'master' ? "refs/tags/$version" :
'*/master'
-dir( build ) {
-checkout( [
-scm: [
- $class: 'GitSCM',
- branches: [[ name: gitVersion ]],
- extensions: [[$class: 'CloneOption', shallow:
false, depth: 0, reference: '' ]],
- userRemoteConfigs: [[url: buildRepo ]]
- ]
-] )
-pom = readMavenPom file: 'pom.xml'
-docsVersion = version != 'master' ? version : pom.version
-writeFile file: 'target/classes/apidocs.txt', text: 'file
created in order to allow aggregated javadoc generation, target/classes is
needed for all modules'
-writeFile file:
'jspwiki-it-tests/target/classes/apidocs.txt', text: 'file created in order to
allow aggregated javadoc generation, target/classes is needed for all modules'
-withEnv( [ "Path+JDK=$JAVA_JDK_11/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
-sh 'mvn package javadoc:aggregate-no-fork -DskipTests
-pl !jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15 -T 1C'
-sh 'java -cp jspwiki-main/target/classes
org.apache.wiki.TranslationsCheck site'
-}
+dir( build ) {
+checkout( [
+scm: [
+$class: 'GitSCM',
+branches: [[ name: gitVersion ]],
+extensions: [[$class: 'CloneOption', shallow: false,
depth: 0, reference: '' ]],
+userRemoteConfigs: [[url: buildRepo ]]
+]
+] )
+pom = readMavenPom file: 'pom.xml'
+docsVersion = version != 'master' ? version : pom.version
+writeFile file: 'target/classes/apidocs.txt', text: 'file
created in order to allow aggregated javadoc generation, target/classes is
needed for all modules'
+writeFile file: 'jspwiki-it-tests/target/classes/apidocs.txt',
text: 'file created in order to allow aggregated javadoc generation,
target/classes is needed for all modules'
+withEnv( [ "Path+JDK=$JAVA_JDK_11/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
+sh 'mvn package javadoc:aggregate-no-fork -DskipTests -pl
!jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15 -T 1C'
+sh 'java -cp jspwiki-main/target/classes
org.apache.wiki.TranslationsCheck site'
}
}
+}
-stage( 'build website' ) {
-echo "Will use Java $JAVA_JDK_11"
-echo "Will use Maven $MAVEN_3_LATEST"
-withEnv( [ "Path+JDK=$JA
[jspwiki-site] branch jbake updated (37b7defb8f -> a77b064e53)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git from 37b7defb8f update parent to 29 new cfabef0ccb ansiColor seems to have been removed from builds.a.o new a77b064e53 update freemarker to 2.3.32, enforcer to 3.2.1 and resources to 3.3.1 The 2 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: Jenkinsfile | 146 ++-- pom.xml | 6 +-- 2 files changed, 75 insertions(+), 77 deletions(-)
[jspwiki] 02/02: fix PR link
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 78dd01566c862fee41f9335fe5d1a1ce81364ea1 Author: Juan Pablo Santos Rodríguez AuthorDate: Fri Mar 24 20:42:43 2023 +0100 fix PR link --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 3d738db5d..2c44c1a7f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -74,7 +74,7 @@ downloading them, set the `jspwiki.attachment.forceDownload` property to empty o * 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! +* Add missing licenses PR [#220](https://github.com/apache/jspwiki/pull/220) provided by [Arturo Bernal](https://github.com/arturobernalg), thanks! * Dependency updates * commons-text to 1.10.0
[jspwiki] branch master updated (7ae1b1d49 -> 78dd01566)
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 7ae1b1d49 Avoid use File Stream. The FileInputStream and FileOutputStream classes contains a finalizer method which will cause garbage collection pauses. new 864e5970e Prefer java.lang.String.getBytes(java.nio.charset.Charset) new 78dd01566 fix PR link The 2 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| 2 +- .../src/main/java/org/apache/wiki/util/CommentedProperties.java | 2 +- jspwiki-util/src/test/java/org/apache/wiki/util/CryptoUtilTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[jspwiki] 01/02: Prefer java.lang.String.getBytes(java.nio.charset.Charset)
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 864e5970e7ab3cfa13b79856945c8f71edda78b4
Author: Juan Pablo Santos Rodríguez
AuthorDate: Fri Mar 24 20:42:19 2023 +0100
Prefer java.lang.String.getBytes(java.nio.charset.Charset)
detected by modernizer-maven-plugin
(https://github.com/gaul/modernizer-maven-plugin/)
no version bump
---
.../src/main/java/org/apache/wiki/util/CommentedProperties.java | 2 +-
jspwiki-util/src/test/java/org/apache/wiki/util/CryptoUtilTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/CommentedProperties.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/CommentedProperties.java
index 9d4b131f6..a04486fd3 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/CommentedProperties.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/CommentedProperties.java
@@ -102,7 +102,7 @@ public class CommentedProperties extends Properties
@Override
public synchronized void store(final OutputStream out, final String
comments ) throws IOException
{
-final byte[] bytes =
m_propertyString.getBytes(StandardCharsets.ISO_8859_1.name());
+final byte[] bytes = m_propertyString.getBytes(
StandardCharsets.ISO_8859_1 );
FileUtil.copyContents( new ByteArrayInputStream( bytes ), out );
out.flush();
}
diff --git
a/jspwiki-util/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
b/jspwiki-util/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
index 7aea5eb48..58d7ce70d 100644
--- a/jspwiki-util/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
+++ b/jspwiki-util/src/test/java/org/apache/wiki/util/CryptoUtilTest.java
@@ -142,7 +142,7 @@ public class CryptoUtilTest {
@Test
public void verifySaltedPassword() throws Exception {
// Verify with a known digest
-byte[] password = "testing123".getBytes( StandardCharsets.UTF_8.name()
);
+byte[] password = "testing123".getBytes( StandardCharsets.UTF_8 );
Assertions.assertTrue( CryptoUtil.verifySaltedPassword( password,
"{SSHA}yfT8SRT/WoOuNuA6KbJeF10OznZmb28=" ) );
// Verify with two more known digests
[jspwiki] branch master updated: Avoid use File Stream. The FileInputStream and FileOutputStream classes contains a finalizer method which will cause garbage collection pauses.
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
The following commit(s) were added to refs/heads/master by this push:
new 7ae1b1d49 Avoid use File Stream. The FileInputStream and
FileOutputStream classes contains a finalizer method which will cause garbage
collection pauses.
7ae1b1d49 is described below
commit 7ae1b1d49056c157a90ef06663ad8cd3918393c4
Author: Arturo Bernal
AuthorDate: Mon Oct 17 21:41:17 2022 +0200
Avoid use File Stream. The FileInputStream and FileOutputStream classes
contains a finalizer method which will cause garbage collection pauses.
---
jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
index b2466ef19..3d1b27d9a 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.Logger;
import javax.servlet.ServletContext;
import java.io.*;
+import java.nio.file.Paths;
import java.util.*;
import java.util.stream.Collectors;
import java.nio.file.Files;
@@ -256,7 +257,7 @@ public final class PropertyReader {
break;
}
-try( final InputStream propertyStream = new FileInputStream(
propertyFile ) ) {
+try( final InputStream propertyStream =
Files.newInputStream(Paths.get(( propertyFile ) ))) {
LOG.info( " Reading additional properties from " +
propertyFile + " and merge to cascade." );
final Properties additionalProps = new Properties();
additionalProps.load( propertyStream );
[jspwiki] branch master updated: Use isEmpty(). Expresses the intent more clearly
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
The following commit(s) were added to refs/heads/master by this push:
new 85071331c Use isEmpty(). Expresses the intent more clearly
85071331c is described below
commit 85071331ca22fc61a10c51045ab698f338eefe92
Author: Arturo Bernal
AuthorDate: Thu Oct 6 22:39:08 2022 +0200
Use isEmpty(). Expresses the intent more clearly
---
jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java | 2 +-
.../src/main/java/org/apache/wiki/search/DefaultSearchManager.java | 2 +-
.../main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
index 7e86180c8..048fc7631 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
@@ -446,7 +446,7 @@ public class DefaultUserManager implements UserManager {
@Override
public void service( final HttpServletRequest req, final
HttpServletResponse resp, final String actionName, final List params)
throws ServletException, IOException {
try {
- if( params.size() < 1 ) {
+ if( params.isEmpty() ) {
return;
}
final String uid = params.get(0);
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
index c5da24ece..e22bd142f 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
@@ -106,7 +106,7 @@ public class DefaultSearchManager extends BasePageFilter
implements SearchManage
final List< String > params ) throws IOException {
String result = "";
if( StringUtils.isNotBlank( actionName ) ) {
-if( params.size() < 1 ) {
+if( params.isEmpty() ) {
return;
}
final String itemId = params.get( 0 );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
index be14611f1..4a7566ae5 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/ui/progress/DefaultProgressManager.java
@@ -135,7 +135,7 @@ public class DefaultProgressManager implements
ProgressManager {
final String actionName,
final List< String > params ) throws IOException {
LOG.debug( "ProgressManager.doGet() START" );
- if( params.size() < 1 ) {
+ if( params.isEmpty() ) {
return;
}
final String progressId = params.get(0);
[jspwiki] branch master updated (402375b9c -> a9cd10929)
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 402375b9c 2.12.0-git-03 add 87b379c54 fix css used by Install.jsp add 8ded0082e fix typo add 0e5ef51b4 .html, .htm and .js attachments are now forcibly downloaded by default add 033e1bb2d rephrase property desc + fix typo add 416855bf5 Attempt to make the auto-generated github emails more easily readable in email clients add b4eef964a ReferenceManager implement via jspwiki.refation can be setManager property[-custom].proper on your jspwikities file add 32756d77d * Dependency updates add 3c0fe8d2b update portable build binaries add a9cd10929 2.12.0-git-04 No new revisions were added by this update. Summary of changes: .asf.yaml | 21 +- ChangeLog.md | 28 LICENSE| 80 ++--- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../main/java/org/apache/wiki/api/core/Engine.java | 3 + .../src/main/java/org/apache/wiki/WikiEngine.java | 4 +- .../wiki/references/DefaultReferenceManager.java | 2 +- .../src/main/resources/ini/jspwiki.properties | 14 +++- jspwiki-portable/pom.xml | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 35074 -> 35213 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49000 -> 48971 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3674840 -> 3682537 bytes jspwiki-war/src/main/webapp/Install.jsp| 6 +- pom.xml| 44 ++-- 14 files changed, 134 insertions(+), 72 deletions(-)
[jspwiki-asf-docs] branch master updated: [DRAFT] 2023 Board report
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new d15a770 [DRAFT] 2023 Board report d15a770 is described below commit d15a7703cb45c468d08f0425e04542342a543c59 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 11 13:56:51 2023 +0100 [DRAFT] 2023 Board report --- board-reports/2023-01.txt | 32 1 file changed, 32 insertions(+) diff --git a/board-reports/2023-01.txt b/board-reports/2023-01.txt new file mode 100644 index 000..d2946ea --- /dev/null +++ b/board-reports/2023-01.txt @@ -0,0 +1,32 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Issues: +There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (9 years ago) +There are currently 14 committers and 8 PMC members in this project. +The Committer-to-PMC ratio is 7:4. + +Community changes, past quarter: +- No new PMC members. Last addition was Dave Koelmeyer on 2016-04-06. +- No new committers. Last addition was Dave Koelmeyer on 2016-04-06. + +## Project Activity: +Again, quiet period, as noted on the previous report, we have switched +to 2.12.0, which requires JDK-11, upgraded some libraries, and we have +fixed several XSS vulnerabilities present on some JSPWiki plugins, +which will warrant a CVE. + +We got another vulnerability report, which was rejected. + +Last release was 2.11.3 on 2022-08-02. + +## Community Health: +Traffic on both MLs had an increase compared with last quarter, most +due to last quarter being an almost no activity quarter. + +There is enough people to provide project oversight.
[jspwiki] 01/06: Update portable build jars
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 f407090942aa7a68b51aa382ef81d42af03ac1b5 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 12:58:31 2023 +0100 Update portable build jars --- .../launchers/tomcat/woas.app/Contents/Info.plist | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 34701 -> 35074 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49002 -> 49000 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3665488 -> 3674840 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist index 0a9a284c0..14ddf6bff 100644 --- a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist +++ b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString -2.11.0 +2.12.0 CFBundleVersion 1.0 CFBundleSignature 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 af85ac7f8..6b6d990ee 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 e39305ee0..5fc2236ca 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 980d953dc..8eda83933 100644 Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
[jspwiki] 04/06: Ensure EhCache is clean on first test execution
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 9bc32a67c81b8f9c2980e7fb92bb7d9fbe156019
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jan 4 12:59:58 2023 +0100
Ensure EhCache is clean on first test execution
---
.../test/java/org/apache/wiki/providers/CachingProviderTest.java | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
index 227539658..3ef6aabae 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
@@ -19,6 +19,7 @@
package org.apache.wiki.providers;
+import net.sf.ehcache.CacheManager;
import org.apache.wiki.TestEngine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.cache.CachingManager;
@@ -27,6 +28,7 @@ import org.apache.wiki.util.FileUtil;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.io.File;
@@ -39,6 +41,11 @@ class CachingProviderTest {
TestEngine engine;
+@BeforeAll
+static void ensureEhCacheFreshStart() {
+CacheManager.getInstance().shutdown();
+}
+
@AfterEach
void tearDown() {
engine.stop();
[jspwiki] 05/06: Update dependencies
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 a5c0aacc8dd77fde2612285f4373da00d1ae4352 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 13:03:32 2023 +0100 Update dependencies * Apache parent to 29 * javadoc doclet to 2.1.0 * lucene to 9.4.2 * mockito to 4.11.0 * selenide to 6.11.0 * tika to 2.6.0 * tomcat to 9.0.70 * maven plugins: m-dependency-p to 3.4.0, m-install-p to 3.1.0, m-release-p to 3.0.0-M7 --- pom.xml | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 57f82d8ca..33e49fcea 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache apache -27 +29 org.apache.jspwiki @@ -34,14 +34,14 @@ Apache JSPWiki is a leading open source WikiWiki engine, feature-rich and built around standard JEE components (Java, servlets, JSP). 2001 - http://jspwiki.apache.org/ + https://jspwiki.apache.org/ UTF-8 UTF-8 2022-07-30T11:42:48Z 11 -2.0.19 +2.1.0 3.5 1.02 @@ -54,7 +54,7 @@ 3.12.0 1.10.0 2.10.9.2 -0.64.0 +0.64.0 0.60 2.9.1 2.7.0 @@ -69,16 +69,16 @@ 0.4.2 5.9.1 2.19.0 -9.4.0 -4.8.1 +9.4.2 +4.11.0 2.1.2 2.0.8 0.5 -6.9.0 +6.11.0 1.7.36 1.7.0-async-beta -2.5.0 -9.0.68 +2.6.0 +9.0.70 1.10.1 2.0.1 @@ -86,14 +86,14 @@ 3.4.2 3.2.0 3.10.1 -3.3.0 +3.4.0 3.1.0 -3.0.1 +3.1.0 3.3.0 3.4.1 3.3.0 3.4.1 -3.0.0-M6 +3.0.0-M7 3.0.0 3.3.0 3.2.1
[jspwiki] 02/06: remove oudated info
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 b67f90af9d36d55dd62c7f853fd534bd5719485b Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 12:58:50 2023 +0100 remove oudated info --- mvn_cheat-sheet.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mvn_cheat-sheet.md b/mvn_cheat-sheet.md index 4b9928bcf..d4693a12a 100644 --- a/mvn_cheat-sheet.md +++ b/mvn_cheat-sheet.md @@ -52,6 +52,5 @@ under the License. |-|-| | mvn apache-rat:check| creates an Apache RAT report. See: http://creadur.apache.org/rat/apache-rat-plugin/plugin-info.html | | mvn cobertura:cobertura | generates a cobertura maven report. See: http://mojo.codehaus.org/cobertura-maven-plugin/usage.html | -| mvn javadoc:javadoc | creates javadocs adding some UML class/package level diagrams (requires JDK<= 8) | -| mvn javadoc:javadoc -Djdk.javadoc.doclet.version=2.0.18 | same as above, but with JDK >= 9 | +| mvn javadoc:javadoc | creates javadocs adding some UML class/package level diagrams | | mvn sonar:sonar | generates a Sonar report. Expects a Sonar server running at http://localhost:9000/ |
[jspwiki] 06/06: 2.12.0-git-03
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 402375b9cc0a5bddac483a557e2d7253d0fc1b5d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jan 4 13:18:37 2023 +0100
2.12.0-git-03
---
ChangeLog.md | 19 +--
.../src/main/java/org/apache/wiki/api/Release.java| 2 +-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 1030671f9..f9aa509d9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,14 +17,29 @@ specific language governing permissions and limitations
under the License.
-->
+**2023-01-04 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.0-git-03_
+
+* Fix flaky caching test, add some colouring to Jenkins console builds
+
+* Dependency updates
+* Apache parent to 29
+* Javadoc umldoclet to 2.1.0
+* Lucene to 9.4.2
+* Mockito to 4.11.0
+* Selenide to 6.11.0
+* Tika to 2.6.0
+* Tomcat to 9.0.70
+* Maven plugins: dependency to 3.4.0, install to 3.1.0, release to 3.0.0-M7
+
**2022-11-24 Dirk Frederickx (brushed AT apache DOT org)**
* _2.12.0-git-02_
-* Fixing a number of XSS vulnerabilities reported by Eugene Lim and Sng Jay
Kai.
+* Fixing a number of XSS vulnerabilities reported by Eugene Lim and Sng Jay
Kai, from Government Technology Agency of Singapore.
(sanitizing various plugin parameters)
-
**2022-10-19 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.0-git-01_
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 16fea414c..8ce311909 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "02";
+public static final String BUILD = "03";
/**
* This is the generic version string you should use when printing out
the version. It is of
[jspwiki] 03/06: Add some colors to jenkins' console builds
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 50752e8c2e99808a312e00aa622e69b59543a6fb
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jan 4 12:59:06 2023 +0100
Add some colors to jenkins' console builds
---
Jenkinsfile | 64 +++--
1 file changed, 33 insertions(+), 31 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b7c76a1e1..edf10f6f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,43 +24,45 @@ buildJdk19 = 'jdk_19_latest'
buildMvn = 'maven_3_latest'
errMsg = ''
-try {
+ansiColor( 'xterm' ) {
+try {
-stage( "build source" ) {
-parallel jdk11Build: {
-buildAndSonarWith( buildJdk11 )
-},
-jdk17Build: {
-buildWith( buildJdk17 )
-},
-jdk19Build: {
-// don't fail build if jdk-19 build doesn't succeed
-catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-buildWith( buildJdk19 )
+stage( 'build source' ) {
+parallel jdk11Build: {
+buildAndSonarWith( buildJdk11 )
+},
+jdk17Build: {
+buildWith( buildJdk17 )
+},
+jdk19Build: {
+// don't fail build if jdk-19 build doesn't succeed
+catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+buildWith( buildJdk19 )
+}
}
}
-}
-if( env.BRANCH_NAME == 'master' ) {
-build wait: false, job: 'JSPWiki/site', parameters: [ text( name:
'version', value: 'master' ) ]
-}
+if( env.BRANCH_NAME == 'master' ) {
+build wait: false, job: 'JSPWiki/site', parameters: [ text( name:
'version', value: 'master' ) ]
+}
-currentBuild.result = 'SUCCESS'
+currentBuild.result = 'SUCCESS'
-} catch( Exception err ) {
-currentBuild.result = 'FAILURE'
-echo err.message
-errMsg = '- ' + err.message
-} finally {
-node( 'ubuntu' ) {
-if( currentBuild.result == null ) {
-currentBuild.result = 'ABORTED'
-}
-if( env.BRANCH_NAME == 'master' ) {
-emailext body: "See ${env.BUILD_URL} $errMsg",
- replyTo: 'd...@jspwiki.apache.org',
- to: 'commits@jspwiki.apache.org',
- subject: "[${env.JOB_NAME}] build
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
+} catch( Exception err ) {
+currentBuild.result = 'FAILURE'
+echo err.message
+errMsg = '- ' + err.message
+} finally {
+node( 'ubuntu' ) {
+if( currentBuild.result == null ) {
+currentBuild.result = 'ABORTED'
+}
+if( env.BRANCH_NAME == 'master' ) {
+emailext body: "See ${env.BUILD_URL} $errMsg",
+ replyTo: 'd...@jspwiki.apache.org',
+ to: 'commits@jspwiki.apache.org',
+ subject: "[${env.JOB_NAME}] build
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}"
+}
}
}
}
[jspwiki] branch master updated (2ce696aeb -> 402375b9c)
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 2ce696aeb XSS vulnerability reported by Eugene Lim and Sng Jay Kai. new f40709094 Update portable build jars new b67f90af9 remove oudated info new 50752e8c2 Add some colors to jenkins' console builds new 9bc32a67c Ensure EhCache is clean on first test execution new a5c0aacc8 Update dependencies new 402375b9c 2.12.0-git-03 The 6 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 | 19 +- Jenkinsfile| 64 +++-- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../apache/wiki/providers/CachingProviderTest.java | 7 +++ .../launchers/tomcat/woas.app/Contents/Info.plist | 2 +- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 34701 -> 35074 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49002 -> 49000 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3665488 -> 3674840 bytes mvn_cheat-sheet.md | 3 +- pom.xml| 24 10 files changed, 72 insertions(+), 49 deletions(-)
[jspwiki-site] 05/06: Note markdown support next to JSPWiki syntax markup
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git commit 3af8131e168fb09bb3cfee7fadfde50dce4475fa Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 12:57:42 2023 +0100 Note markdown support next to JSPWiki syntax markup --- src/main/jbake/content/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/jbake/content/index.md b/src/main/jbake/content/index.md index a0b89f2fe6..2c0c800d6c 100755 --- a/src/main/jbake/content/index.md +++ b/src/main/jbake/content/index.md @@ -8,7 +8,7 @@ status=published Some of its [features](https://jspwiki-wiki.apache.org/Wiki.jsp?page=JSPWikiFeatures) include: - * [WikiMarkup](https://jspwiki-wiki.apache.org/Wiki.jsp?page=TextFormattingRules) / Structured Text + * Two wiki syntaxes: [JSPWiki](https://jspwiki-wiki.apache.org/Wiki.jsp?page=TextFormattingRules) and [Markdown](https://jspwiki-wiki.apache.org/Wiki.jsp?page=Markdown%20Support), with the capability to create and plug in new ones * File attachments * Templates support * Data storage through your choice of two [WikiPage Providers][], with the capability to create and plug in new ones
[jspwiki-site] 01/06: increase dependencies, require jdk-11 to build site
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 8c5eca1af825f9ed6cafca46758e80abd97329db
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jan 4 12:55:06 2023 +0100
increase dependencies, require jdk-11 to build site
---
pom.xml | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce96a69374..cc1aec3fa2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,16 +39,15 @@
${project.build.directory}/content
3.1.0
3.3.0
-0.15.7
-2.11.4-SNAPSHOT
+0.17.1
+2.12.0-SNAPSHOT
2.11.0
0.3.4
UTF-8
UTF-8
-0.62.2
+0.64.0
2.3.31
-2.5.1
-1.8
+11
3.5.0
[jspwiki-site] branch jbake updated (8100724d32 -> 37b7defb8f)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git from 8100724d32 Update plugins new 8c5eca1af8 increase dependencies, require jdk-11 to build site new a3ef65388b copyright 2023 new e47ab93d06 JSPWiki version set to 2.12.0 new bf467b2dec Add some colors to jenkins' console builds new 3af8131e16 Note markdown support next to JSPWiki syntax markup new 37b7defb8f update parent to 29 The 6 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: Jenkinsfile | 146 +++--- pom.xml | 11 ++- src/main/jbake/content/index.md | 2 +- src/main/jbake/jbake.properties | 2 +- src/main/jbake/templates/page.ftl | 2 +- 5 files changed, 82 insertions(+), 81 deletions(-)
[jspwiki-site] 03/06: JSPWiki version set to 2.12.0
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git commit e47ab93d0688296460fd8d2471e15e85cb9ae516 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 12:55:48 2023 +0100 JSPWiki version set to 2.12.0 --- src/main/jbake/jbake.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/jbake/jbake.properties b/src/main/jbake/jbake.properties index bb92d688a2..57be549c7a 100755 --- a/src/main/jbake/jbake.properties +++ b/src/main/jbake/jbake.properties @@ -1,7 +1,7 @@ #site.host=http://localhost:8080 site.host=https://jspwiki.apache.org wiki.site.host=https://jspwiki-wiki.apache.org -jspwiki.version=2.11.3 +jspwiki.version=2.12.0 render.index=false render.archive=false render.feed=false
[jspwiki-site] 06/06: update parent to 29
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git commit 37b7defb8f6f2dd9632ddf5a30a15836261b6a19 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 13:32:57 2023 +0100 update parent to 29 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc1aec3fa2..73e1998ffe 100755 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache apache -21 +29 org.apache.jspwiki
[jspwiki-site] 02/06: copyright 2023
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git commit a3ef65388bfb18e53bc592ad061822cdfdbdd665 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jan 4 12:55:25 2023 +0100 copyright 2023 --- src/main/jbake/templates/page.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/jbake/templates/page.ftl b/src/main/jbake/templates/page.ftl index 51a7c8338a..b15278befe 100755 --- a/src/main/jbake/templates/page.ftl +++ b/src/main/jbake/templates/page.ftl @@ -298,7 +298,7 @@ } - Copyright 2022 The Apache Software Foundation, + Copyright 2023 The Apache Software Foundation, Licensed under the http://www.apache.org/licenses/LICENSE-2.0;>Apache License, Version 2.0. Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
[jspwiki-site] 04/06: Add some colors to jenkins' console builds
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit bf467b2dec6ea4dab0597e25c834b793f89a8bdd
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jan 4 12:56:35 2023 +0100
Add some colors to jenkins' console builds
---
Jenkinsfile | 146 ++--
1 file changed, 74 insertions(+), 72 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 669a4599ae..e9bce0711f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,95 +25,97 @@ build = 'build'
jbake = 'jbake'
errMsg = ''
-try {
+ansiColor( 'xterm' ) {
+try {
-def pom
-def docsVersion
+def pom
+def docsVersion
-node( 'ubuntu' ) {
-def JAVA_JDK_11=tool name: 'jdk_11_latest', type: 'hudson.model.JDK'
-def MAVEN_3_LATEST=tool name: 'maven_3_latest', type:
'hudson.tasks.Maven$MavenInstallation'
-def version = params?.version ?: 'master'
+node( 'ubuntu' ) {
+def JAVA_JDK_11=tool name: 'jdk_11_latest', type:
'hudson.model.JDK'
+def MAVEN_3_LATEST=tool name: 'maven_3_latest', type:
'hudson.tasks.Maven$MavenInstallation'
+def version = params?.version ?: 'master'
-stage( 'clean workspace' ) {
-cleanWs()
-}
+stage( 'clean workspace' ) {
+cleanWs()
+}
-stage( 'generate apidocs & translations' ) {
-echo "Will use Java $JAVA_JDK_11"
-echo "Will use Maven $MAVEN_3_LATEST"
-def gitVersion = version != 'master' ? "refs/tags/$version" :
'*/master'
+stage( 'generate apidocs & translations' ) {
+echo "Will use Java $JAVA_JDK_11"
+echo "Will use Maven $MAVEN_3_LATEST"
+def gitVersion = version != 'master' ? "refs/tags/$version" :
'*/master'
-dir( build ) {
-checkout( [
-scm: [
- $class: 'GitSCM',
- branches: [[ name: gitVersion ]],
- extensions: [[$class: 'CloneOption', shallow:
false, depth: 0, reference: '' ]],
- userRemoteConfigs: [[url: buildRepo ]]
- ]
-] )
-pom = readMavenPom file: 'pom.xml'
-docsVersion = version != 'master' ? version : pom.version
-writeFile file: 'target/classes/apidocs.txt', text: 'file
created in order to allow aggregated javadoc generation, target/classes is
needed for all modules'
-writeFile file: 'jspwiki-it-tests/target/classes/apidocs.txt',
text: 'file created in order to allow aggregated javadoc generation,
target/classes is needed for all modules'
-withEnv( [ "Path+JDK=$JAVA_JDK_11/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
-sh 'mvn package javadoc:aggregate-no-fork -DskipTests -pl
!jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15 -T 1C'
-sh 'java -cp jspwiki-main/target/classes
org.apache.wiki.TranslationsCheck site'
+dir( build ) {
+checkout( [
+scm: [
+ $class: 'GitSCM',
+ branches: [[ name: gitVersion ]],
+ extensions: [[$class: 'CloneOption', shallow:
false, depth: 0, reference: '' ]],
+ userRemoteConfigs: [[url: buildRepo ]]
+ ]
+] )
+pom = readMavenPom file: 'pom.xml'
+docsVersion = version != 'master' ? version : pom.version
+writeFile file: 'target/classes/apidocs.txt', text: 'file
created in order to allow aggregated javadoc generation, target/classes is
needed for all modules'
+writeFile file:
'jspwiki-it-tests/target/classes/apidocs.txt', text: 'file created in order to
allow aggregated javadoc generation, target/classes is needed for all modules'
+withEnv( [ "Path+JDK=$JAVA_JDK_11/bin",
"Path+MAVEN=$MAVEN_3_LATEST/bin", "JAVA_HOME=$JAVA_JDK_11" ] ) {
+sh 'mvn package javadoc:aggregate-no-fork -DskipTests
-pl !jspwiki-portable -Djdk.javadoc.doclet.version=2.0.15 -T 1C'
+sh 'java -cp jspwiki-main/target/classes
org.apache.wiki.TranslationsCheck site'
+}
}
}
-}
-stage( 'build website' ) {
-echo "Will use Java $JAVA_JDK_11"
-echo "Will use Maven $MAVEN_3_LATEST"
-withEnv( [ "Path+JDK=$J
[jspwiki] branch master updated: Build on Dockerfile using JDK-11
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 The following commit(s) were added to refs/heads/master by this push: new 663347128 Build on Dockerfile using JDK-11 663347128 is described below commit 663347128a3a51be088233d10dc17b7b4fc662fc Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Oct 20 10:54:35 2022 +0200 Build on Dockerfile using JDK-11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddf61c3eb..361c682f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -FROM maven:3.8-jdk-8 as package +FROM maven:3.8-jdk-11 as package WORKDIR /tmp
[jspwiki] branch master updated: fix sublist indenting
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 The following commit(s) were added to refs/heads/master by this push: new fabcbd750 fix sublist indenting fabcbd750 is described below commit fabcbd750cac95746dd4076801dc1a4f761a1864 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Oct 19 23:49:43 2022 +0200 fix sublist indenting --- ChangeLog.md | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index b3b24791d..6fe9da630 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -26,18 +26,18 @@ under the License. * 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 - * 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 - * 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 +* 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 +* 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 +* 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)**
[jspwiki] branch master updated (191d4bfa6 -> 3f25506f4)
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 191d4bfa6 Update Mockito to 4.8.1 - closes #225 add 3f25506f4 Add missing licences. No new revisions were added by this update. Summary of changes: docker-files/tomcat-users.xml | 18 ++ jspwiki-api/src/test/resources/ini/jspwiki.properties | 17 + .../src/test/resources/ini/jspwiki.properties | 17 + .../apache/wiki/http/filter/CsrfProtectionFilter.java | 18 ++ .../org/apache/wiki/its/WithIntegrationTestSetup.java | 18 ++ .../src/test/resources/log4j.properties| 17 + .../java/org/apache/wiki/modules/ModuleManager.java| 18 ++ .../apache/wiki/tasks/auth/SaveUserProfileTask.java| 18 ++ .../test/java/org/apache/wiki/pages/PageLockTest.java | 18 ++ .../java/org/apache/wiki/plugin/WeblogPluginTest.java | 18 ++ .../LocalFootnoteLinkNodePostProcessorState.java | 18 ++ jspwiki-war/src/main/webapp/favicons/browserconfig.xml | 18 ++ jspwiki-war/src/main/webapp/favicons/site.webmanifest | 18 ++ pom.xml| 8 14 files changed, 239 insertions(+)
[jspwiki] 04/07: Update Lucene to 9.4.0
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
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 @@
org.apache.lucene
- lucene-analyzers-common
+ lucene-analysis-common
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 @@
0.4.2
5.9.1
2.19.0
-8.11.2
+9.4.0
4.6.1
2.1.2
2.0.8
@@ -298,7 +298,7 @@
org.apache.lucene
-lucene-analyzers-common
+lucene-analysis-common
${lucene.version}
[jspwiki] 01/07: set build version to 2.12.0-SNAPSHOT
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 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 @@ -31,7 +31,7 @@ pom -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 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 @@ org.apache.jspwiki jspwiki-builder -2.11.4-SNAPSHOT +2.12.0-SNAPSHOT 4.0.0 diff --git a/jspwiki-http/pom.xml b/jspwiki-http/pom.xml index 6096f2cca
[jspwiki] 02/07: require JDK-11, drop JDK-8 build, tentatively build with jdk-19
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
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 @@
-
+
@@ -159,7 +159,7 @@
${basedir}/target/unpack/tomcat/${jspwiki.tomcat.distribution}/bin/tomcat-juli.jar
-
+
UTF-8
UTF-8
2022-07-30T11:42:48Z
-1.8
-1.1.4
+11
+2.0.19
3.5
1.02
[jspwiki] 03/07: Update dependencies
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
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 @@
3.1
2.11.0
3.12.0
-1.9
+1.10.0
2.10.9.2
-0.62.2
+0.64.0
0.60
-2.9.0
+2.9.1
2.7.0
0.3.3
1.2.0
@@ -67,19 +67,19 @@
2.0.6
9.4.48.v20220622
0.4.2
-5.9.0
-2.18.0
-8.11.2
+5.9.1
+2.19.0
+8.11.2
4.6.1
-2.0.2
+2.1.2
2.0.8
0.5
-6.6.6
+6.9.0
1.7.36
1.7.0-async-beta
-2.4.1
-9.0.65
-1.8.0
+2.5.0
+9.0.68
+1.10.1
2.0.1
3.1.0
@@ -89,10 +89,10 @@
3.3.0
3.1.0
3.0.1
-3.2.2
-3.4.0
-3.2.0
-
3.4.0
+3.3.0
+3.4.1
+3.3.0
+
3.4.1
3.0.0-M6
3.0.0
3.3.0
@@ -716,11 +716,11 @@
${project.build.directory}/generated-sources/wro/scripts
ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory
-
+
- org.mockito
- mockito-core
- ${mockito.version}
+ org.webjars.npm
+ glob
+ 7.2.0
[jspwiki] 07/07: Update Mockito to 4.8.1 - closes #225
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 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 @@ 5.9.1 2.19.0 9.4.0 -4.6.1 +4.8.1 2.1.2 2.0.8 0.5
[jspwiki] 06/07: 2.12.0-git-01
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
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 {
*
* If the POSTFIX is empty, it is not added to the version string.
*/
-private static final StringPOSTFIX = "";
+private static final StringPOSTFIX = "-git-";
/** The JSPWiki major version. */
public static final intVERSION = 2;
/** The JSPWiki revision. */
-public static final intREVISION = 11;
+public static final intREVISION = 12;
/** The minor revision. */
-public static final intMINORREVISION = 3;
+public static final intMINORREVISION = 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 {
*
* 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] 05/07: Update portable build binaries
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 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
[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-asf-docs] branch master updated: Add last release date, rework community health section and note Murray's work on the his ReferenceMaanger implementation
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new 5999ad1 Add last release date, rework community health section and note Murray's work on the his ReferenceMaanger implementation 5999ad1 is described below commit 5999ad1a4e971c172ec25f591a1c92a3c59eeaea Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Oct 12 19:42:54 2022 +0200 Add last release date, rework community health section and note Murray's work on the his ReferenceMaanger implementation --- board-reports/2022-10.txt | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/board-reports/2022-10.txt b/board-reports/2022-10.txt index 30027ba..c6b9fba 100755 --- a/board-reports/2022-10.txt +++ b/board-reports/2022-10.txt @@ -7,7 +7,7 @@ JEE components (Java, servlets, JSP). There are no issues requiring board attention. ## Membership Data: -Apache JSPWiki was founded 2013-07-17 (8 years ago) +Apache JSPWiki was founded 2013-07-17 (9 years ago) There are currently 14 committers and 8 PMC members in this project. The Committer-to-PMC ratio is 7:4. @@ -25,11 +25,16 @@ We got one vulnerability report, done directly through github, which was rejected. Still pending to reach the issuer so next reports do get submitted through the appropiate channels. +Last release was 2.11.3 on 2022-08-02. + ## Community Health: Traffic on both MLs had a decrease compared with last quarter, most -probably due to being a quiet quarter. We got one plugin submitted -through dev@j.a.o, which should at least get uploaded to -jspwiki-wiki.a.o +probably due to being a quiet-code quarter. + +Community wise, we got one plugin submitted through dev@j.a.o, which +should at least get uploaded to jspwiki-wiki.a.o. Also, an emeritus +PMC member is working on a new ReferenceManager implementation, based +on JGraphT. We have a handful of PRs awaiting to be merged.
[jspwiki-asf-docs] branch master updated: [DRAFT] Board report for 2022/10
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new f8f0202 [DRAFT] Board report for 2022/10 f8f0202 is described below commit f8f0202699121e95d3499c580d4613ef9c5d6a91 Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Oct 11 00:12:55 2022 +0200 [DRAFT] Board report for 2022/10 --- board-reports/2022-10.txt | 36 1 file changed, 36 insertions(+) diff --git a/board-reports/2022-10.txt b/board-reports/2022-10.txt new file mode 100755 index 000..30027ba --- /dev/null +++ b/board-reports/2022-10.txt @@ -0,0 +1,36 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Issues: +There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (8 years ago) +There are currently 14 committers and 8 PMC members in this project. +The Committer-to-PMC ratio is 7:4. + +Community changes, past quarter: +- No new PMC members. Last addition was Dave Koelmeyer on 2016-04-06. +- No new committers. Last addition was Dave Koelmeyer on 2016-04-06. + +## Project Activity: +Quiet two-month quarter, with no code merged into master. It was +discussed the need of upgrading JDK, so next release will be 2.12.0, +which will require JDK-11. This change should get into master by +the time of the Board meeting. + +We got one vulnerability report, done directly through github, which +was rejected. Still pending to reach the issuer so next reports do +get submitted through the appropiate channels. + +## Community Health: +Traffic on both MLs had a decrease compared with last quarter, most +probably due to being a quiet quarter. We got one plugin submitted +through dev@j.a.o, which should at least get uploaded to +jspwiki-wiki.a.o + +We have a handful of PRs awaiting to be merged. + +There is enough people to provide project oversight.
[jspwiki-asf-docs] branch master updated: [DRAFT] 2022-08 Board report
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-asf-docs.git The following commit(s) were added to refs/heads/master by this push: new 4ad107b [DRAFT] 2022-08 Board report 4ad107b is described below commit 4ad107ba7bbb56632a7ac9f7d224efde612af95e Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Aug 9 14:40:12 2022 +0200 [DRAFT] 2022-08 Board report --- board-reports/2022-08.txt | 41 + 1 file changed, 41 insertions(+) diff --git a/board-reports/2022-08.txt b/board-reports/2022-08.txt new file mode 100644 index 000..ba4a58e --- /dev/null +++ b/board-reports/2022-08.txt @@ -0,0 +1,41 @@ +## Description: +The mission of JSPWiki is the creation and maintenance of software related to +Leading open source WikiWiki engine, feature-rich and built around standard +JEE components (Java, servlets, JSP). + +## Issues: +There are no issues requiring board attention. + +## Membership Data: +Apache JSPWiki was founded 2013-07-17 (8 years ago) +There are currently 14 committers and 8 PMC members in this project. +The Committer-to-PMC ratio is 7:4. + +Community changes, past quarter: +- No new PMC members. Last addition was Dave Koelmeyer on 2016-04-06. +- No new committers. Last addition was Dave Koelmeyer on 2016-04-06. + +## Project Activity: +JSPWiki 2.11.3 was released on Aug, 2nd, featuring complete wiki +syntax pluggability, allowing full Markdown support (except for +some pending quirks) and Engine Extensions, which allow easier +integration of 3rd party libraries. Also, 2.11.3 contained fixes +For 5 CVEs. Work on 2.11.3 has had a slow pace of development, +but nothing unexpected. + +Finally, we got looked into another vulnerability report, which +was rejected. + +## Community Health: +Traffic on both MLs had an increase compared with last quarter, +most probable due to 2.11.3 release, and an emeritus pmc member +coming back to dev@j.a.o + +We merged a handful of PRs from a contributor which contained +code improvements. + +2.11.3 release vote showed a couple of community votes, which +is rather unusual, so we'll keep an eye for future committer/PMC +members. + +There is enough people to provide project oversight.
[jspwiki-site] branch jbake updated (ecd4d4cba8 -> 8100724d32)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to branch jbake in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git from ecd4d4cba8 copyright 2022 + add privacy link and rearrange links new 24923338d8 Update site with 2.11.3 release new 8100724d32 Update plugins The 2 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: pom.xml | 32 ++--- src/main/jbake/assets/apidocs/index.html| 6 +++--- src/main/jbake/assets/japicmp/index.html| 6 +++--- src/main/jbake/content/general/downloads.md | 9 +--- src/main/jbake/content/general/news.md | 7 +-- src/main/jbake/content/index.md | 22 src/main/jbake/jbake.properties | 2 +- 7 files changed, 60 insertions(+), 24 deletions(-)
[jspwiki-site] 02/02: Update plugins
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/jspwiki-site.git
commit 8100724d32e2faee0d95ed508a5fb1fd0d4e9c9d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Aug 3 22:27:56 2022 +0200
Update plugins
---
pom.xml | 30 --
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 276786f760..ce96a69374 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
${project.build.directory}/content
-3.0.0
-3.2.0
+3.1.0
+3.3.0
0.15.7
2.11.4-SNAPSHOT
2.11.0
@@ -322,6 +322,32 @@
+
+ cmp-jspwiki-http
+ generate-resources
+ cmp
+
+
+ Binary compatibility between jspwiki-http
${plugin.japicmp.jspwiki-new} and ${plugin.japicmp.jspwiki-old}
+
+
+
+${project.groupId}
+jspwiki-http
+${plugin.japicmp.jspwiki-old}
+jar
+
+
+
+
+${project.groupId}
+jspwiki-http
+${plugin.japicmp.jspwiki-new}
+jar
+
+
+
+
cmp-jspwiki-kendra-searchprovider
generate-resources
[jspwiki] annotated tag 2.11.3 updated (515dff39c -> bff48e82b)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to annotated tag 2.11.3 in repository https://gitbox.apache.org/repos/asf/jspwiki.git *** WARNING: tag 2.11.3 was modified! *** from 515dff39c (commit) to bff48e82b (tag) tagging 89e9bf2179776f25d6617c1d5bbbc2223e99c5b4 (tag) length 205 bytes by Juan Pablo Santos Rodríguez on Wed Aug 3 18:44:08 2022 +0200 - Log - 2.11.3 --- No new revisions were added by this update. Summary of changes:
svn commit: r56073 [2/2] - in /release/jspwiki: 2.11.2/ 2.11.3/ 2.11.3/binaries/ 2.11.3/binaries/portable/ 2.11.3/binaries/webapp/ 2.11.3/source/ 2.11.3/wikipages/
Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 == --- release/jspwiki/2.11.3/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 (added) +++ release/jspwiki/2.11.3/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 Tue Aug 2 21:24:47 2022 @@ -0,0 +1 @@ +54f04cb02626889994b81397cd7d5de80fa3d47196a6eb14f24674feafcfb0e111ad3a11dcf5c7b5920d48eb580c11c764683c06b3e0d8f157e73cb9f0593c95 \ No newline at end of file Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 -- svn:executable = * Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar == Binary file - no diff available. Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar -- svn:executable = * Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar -- svn:mime-type = application/zip Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.asc == Binary file - no diff available. Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.asc -- svn:executable = * Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 == --- release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 (added) +++ release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 Tue Aug 2 21:24:47 2022 @@ -0,0 +1 @@ +c76a28dee7675db49044d1116390285db219c9a35f806344b85d61cd86158eca9c8346ad7574090cef6af51c41c7992581e0c341246effa86eef500caafa238f \ No newline at end of file Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 -- svn:executable = * Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar == Binary file - no diff available. Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar -- svn:executable = * Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar -- svn:mime-type = application/zip Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.asc == Binary file - no diff available. Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.asc -- svn:executable = * Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.asc -- svn:mime-type = application/pgp-signature Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 == --- release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 (added) +++ release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 Tue Aug 2 21:24:47 2022 @@ -0,0 +1 @@ +86920291b80c30ad502b4d118f731e3ab31b3d7e65540a549dd238c112e0d9961f4757b7ee41cf452332b9f0dc256a6d6d9d9174af92f7adf31c9dbf1d685a44 \ No newline at end of file Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 -- svn:executable = * Added: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3.jar == Binary file - no diff available. Propchange: release/jspwiki/2.11.3/binaries/webapp/jspwiki-markdown-2.11.3.jar -- svn:executable = * Propchange:
svn commit: r56073 [1/2] - in /release/jspwiki: 2.11.2/ 2.11.3/ 2.11.3/binaries/ 2.11.3/binaries/portable/ 2.11.3/binaries/webapp/ 2.11.3/source/ 2.11.3/wikipages/
Author: juanpablo Date: Tue Aug 2 21:24:47 2022 New Revision: 56073 Log: 2.11.3 release Added: release/jspwiki/2.11.3/ release/jspwiki/2.11.3/binaries/ release/jspwiki/2.11.3/binaries/portable/ release/jspwiki/2.11.3/binaries/portable/jspwiki-portable-2.11.3-woas.tar.gz (with props) release/jspwiki/2.11.3/binaries/portable/jspwiki-portable-2.11.3-woas.tar.gz.asc (with props) release/jspwiki/2.11.3/binaries/portable/jspwiki-portable-2.11.3-woas.tar.gz.sha512 (with props) release/jspwiki/2.11.3/binaries/portable/jspwiki-portable-2.11.3-woas.zip (with props) release/jspwiki/2.11.3/binaries/portable/jspwiki-portable-2.11.3-woas.zip.asc (with props) release/jspwiki/2.11.3/binaries/portable/jspwiki-portable-2.11.3-woas.zip.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/ release/jspwiki/2.11.3/binaries/webapp/JSPWiki-sources.jar (with props) release/jspwiki/2.11.3/binaries/webapp/JSPWiki-sources.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/JSPWiki-sources.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/JSPWiki.war (with props) release/jspwiki/2.11.3/binaries/webapp/JSPWiki.war.asc (with props) release/jspwiki/2.11.3/binaries/webapp/JSPWiki.war.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3-javadoc.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3-javadoc.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3-javadoc.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3-sources.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3-sources.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3-sources.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-adapters-2.11.3.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-sources.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-sources.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-sources.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-tests.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-tests.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-tests.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-210-test-adaptees-2.11.3.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3-javadoc.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3-javadoc.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3-javadoc.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3-sources.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3-sources.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3-sources.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-api-2.11.3.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3-javadoc.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3-javadoc.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3-javadoc.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3-sources.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3-sources.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3-sources.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3.jar (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3.jar.asc (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-bootstrap-2.11.3.jar.sha512 (with props) release/jspwiki/2.11.3/binaries/webapp/jspwiki-cache-2.11.3-javadoc.jar (with props) release/jspwiki/2.11.3
svn commit: r56046 [1/2] - in /dev/jspwiki/2.11.3-RC1: ./ binaries/ binaries/portable/ binaries/webapp/ source/ wikipages/
Author: juanpablo Date: Sat Jul 30 12:30:12 2022 New Revision: 56046 Log: 2.11.3 RC1 Added: dev/jspwiki/2.11.3-RC1/ dev/jspwiki/2.11.3-RC1/binaries/ dev/jspwiki/2.11.3-RC1/binaries/portable/ dev/jspwiki/2.11.3-RC1/binaries/portable/jspwiki-portable-2.11.3-woas.tar.gz (with props) dev/jspwiki/2.11.3-RC1/binaries/portable/jspwiki-portable-2.11.3-woas.tar.gz.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/portable/jspwiki-portable-2.11.3-woas.tar.gz.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/portable/jspwiki-portable-2.11.3-woas.zip (with props) dev/jspwiki/2.11.3-RC1/binaries/portable/jspwiki-portable-2.11.3-woas.zip.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/portable/jspwiki-portable-2.11.3-woas.zip.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/ dev/jspwiki/2.11.3-RC1/binaries/webapp/JSPWiki-sources.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/JSPWiki-sources.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/JSPWiki-sources.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/JSPWiki.war (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/JSPWiki.war.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/JSPWiki.war.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3-javadoc.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3-javadoc.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3-javadoc.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3-sources.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3-sources.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3-sources.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-adapters-2.11.3.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-sources.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-sources.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-sources.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-tests.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-tests.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3-tests.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-210-test-adaptees-2.11.3.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3-javadoc.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3-javadoc.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3-javadoc.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3-sources.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3-sources.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3-sources.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-api-2.11.3.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3-javadoc.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3-javadoc.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3-javadoc.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3-sources.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3-sources.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3-sources.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3.jar (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3.jar.asc (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-bootstrap-2.11.3.jar.sha512 (with props) dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-cache-2.11.3-javadoc.jar (with props) dev/jspwiki/2.11.3-RC1/binaries
svn commit: r56046 [2/2] - in /dev/jspwiki/2.11.3-RC1: ./ binaries/ binaries/portable/ binaries/webapp/ source/ wikipages/
Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 == --- dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 (added) +++ dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 Sat Jul 30 12:30:12 2022 @@ -0,0 +1 @@ +54f04cb02626889994b81397cd7d5de80fa3d47196a6eb14f24674feafcfb0e111ad3a11dcf5c7b5920d48eb580c11c764683c06b3e0d8f157e73cb9f0593c95 \ No newline at end of file Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-main-2.11.3.jar.sha512 -- svn:executable = * Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar == Binary file - no diff available. Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar -- svn:executable = * Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar -- svn:mime-type = application/zip Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.asc == Binary file - no diff available. Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.asc -- svn:executable = * Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 == --- dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 (added) +++ dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 Sat Jul 30 12:30:12 2022 @@ -0,0 +1 @@ +c76a28dee7675db49044d1116390285db219c9a35f806344b85d61cd86158eca9c8346ad7574090cef6af51c41c7992581e0c341246effa86eef500caafa238f \ No newline at end of file Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-javadoc.jar.sha512 -- svn:executable = * Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar == Binary file - no diff available. Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar -- svn:executable = * Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar -- svn:mime-type = application/zip Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.asc == Binary file - no diff available. Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.asc -- svn:executable = * Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.asc -- svn:mime-type = application/pgp-signature Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 == --- dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 (added) +++ dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 Sat Jul 30 12:30:12 2022 @@ -0,0 +1 @@ +86920291b80c30ad502b4d118f731e3ab31b3d7e65540a549dd238c112e0d9961f4757b7ee41cf452332b9f0dc256a6d6d9d9174af92f7adf31c9dbf1d685a44 \ No newline at end of file Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3-sources.jar.sha512 -- svn:executable = * Added: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3.jar == Binary file - no diff available. Propchange: dev/jspwiki/2.11.3-RC1/binaries/webapp/jspwiki-markdown-2.11.3.jar -- svn:executable = * Propchange:
[jspwiki] branch master updated (515dff39c -> 4b196bfb7)
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 515dff39c [maven-release-plugin] prepare release 2.11.3-RC1 add 4b196bfb7 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: 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 | 6 +++--- 35 files changed, 38 insertions(+), 38 deletions(-)
[jspwiki] annotated tag 2.11.3-RC1 updated (515dff39c -> 89e9bf217)
This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a change to annotated tag 2.11.3-RC1 in repository https://gitbox.apache.org/repos/asf/jspwiki.git *** WARNING: tag 2.11.3-RC1 was modified! *** from 515dff39c (commit) to 89e9bf217 (tag) tagging 515dff39c66c43318056fa76a20117662d2a0e8d (commit) replaces 2.11.2 by Juan Pablo Santos Rodríguez on Sat Jul 30 13:42:47 2022 +0200 - Log - [maven-release-plugin] copy for tag 2.11.3-RC1 --- No new revisions were added by this update. Summary of changes:
[jspwiki] branch master updated (f6f255834 -> 515dff39c)
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 f6f255834 prepare for 2.11.3 add 515dff39c [maven-release-plugin] prepare release 2.11.3-RC1 No new revisions were added by this update. Summary of changes: 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 | 10 +- 35 files changed, 40 insertions(+), 40 deletions(-)
[jspwiki] branch master updated: prepare for 2.11.3
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
The following commit(s) were added to refs/heads/master by this push:
new f6f255834 prepare for 2.11.3
f6f255834 is described below
commit f6f255834e1d27923fd4002c6a438ebe4efdba71
Author: Juan Pablo Santos Rodríguez
AuthorDate: Sat Jul 30 13:37:38 2022 +0200
prepare for 2.11.3
---
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 ed521138d..13e31e9e1 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 {
*
* If the POSTFIX is empty, it is not added to the version string.
*/
-private static final StringPOSTFIX = "-git-";
+private static final StringPOSTFIX = "";
/** The JSPWiki major version. */
public static final intVERSION = 2;
@@ -69,7 +69,7 @@ public final class Release {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "12";
+public static final String BUILD = "";
/**
* This is the generic version string you should use when printing out
the version. It is of
[jspwiki] branch master updated: Update JUnit to 5.9.0, HSQLDB to 2.7.0 - closes #217, closes #218, thanks to dependabot
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 The following commit(s) were added to refs/heads/master by this push: new 8b891d5a6 Update JUnit to 5.9.0, HSQLDB to 2.7.0 - closes #217, closes #218, thanks to dependabot 8b891d5a6 is described below commit 8b891d5a6971a3c4f0967aa921b8383ec1dfdaf4 Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Jul 28 23:03:58 2022 +0200 Update JUnit to 5.9.0, HSQLDB to 2.7.0 - closes #217, closes #218, thanks to dependabot no version bump as they're test dependencies --- ChangeLog.md | 2 ++ LICENSE | 6 +++--- pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 3b7a10932..7c9bfa3f8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -22,6 +22,8 @@ under the License. * _2.11.3-git-12_ * Dependency updates +* JUnit to 5.9.0 (closes [#218](https://github.com/apache/jspwiki/pull/218)), thanks to dependabot +* HSQLDB to 2.7.0 (closes [#217](https://github.com/apache/jspwiki/pull/217)), thanks to dependabot * Tomcat to 9.0.65 (closes [#210](https://github.com/apache/jspwiki/pull/210)), thanks to dependabot * Maven plugins: install to 3.0.1 (closes [#214](https://github.com/apache/jspwiki/pull/214)), assembly to 3.4.2 (closes [#215](https://github.com/apache/jspwiki/pull/215)), surefire junit5 tree reporter to 1.1.0 (closes [#216](https://github.com/apache/jspwiki/pull/216)), thanks to dependabot diff --git a/LICENSE b/LICENSE index 8f1536e6b..ea0e456b2 100644 --- a/LICENSE +++ b/LICENSE @@ -283,10 +283,10 @@ TEST LIBRARYLICENSE FILE awaitility-4.2.0.jarLICENSE commons-el-1.0.jar LICENSE custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl -hsqldb-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb -sqltool-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb +hsqldb-2.7.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb +sqltool-2.7.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb jetty-all-9.4.48.v20220622.jar LICENSE -junit-5.8.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl +junit-5.9.0 ./jspwiki-war/src/main/config/doc/LICENSE.cpl mockito-core-4.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit selenide-6.6.6.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit stripes-1.7.0-async.jar LICENSE diff --git a/pom.xml b/pom.xml index 6d0b22f52..abc769f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 0.62.2 0.60 2.9.0 -2.6.1 +2.7.0 0.3.3 1.2.0 1.2 @@ -67,7 +67,7 @@ 2.0.6 9.4.48.v20220622 0.4.2 -5.8.2 +5.9.0 2.18.0 8.11.2 4.6.1
[jspwiki] branch master updated (6dac6a3fb -> 94d658571)
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 6dac6a3fb Update ChangeLog new 5f66a7abd Update portable launcher binaries and update launch4j download urls new b636b50f0 Update dependencies new 94d658571 2.11.3-git-12 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 | 8 LICENSE| 2 +- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- jspwiki-portable/build.xml | 4 ++-- .../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 34699 -> 34700 bytes .../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46898 -> 47050 bytes .../src/overlay/launchers/tomcat/woas.exe | Bin 3669432 -> 3670538 bytes pom.xml| 19 +++ 8 files changed, 23 insertions(+), 12 deletions(-)
[jspwiki] 02/03: Update dependencies
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 b636b50f0601e34363abffcfd85fef4cd84665ad
Author: Juan Pablo Santos Rodríguez
AuthorDate: Mon Jul 25 23:34:39 2022 +0200
Update dependencies
* Tomcat to 9.0.65 - closes #210
* maven install plugin to 3.0.1 - closes #214
* maven assembly plugin to 3.4.2 - closes #215
* surefire junit5 tree reporter to 1.1.0 - closes #216
* fix maven remote resources plugin to 3.0.0
* update maven resources plugin to 3.3.0
---
LICENSE | 2 +-
pom.xml | 19 +++
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/LICENSE b/LICENSE
index 7a12a38a9..8f1536e6b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -304,7 +304,7 @@ SlimBox
./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=
-Apache Tomcat 9.0.64LICENSE
+Apache Tomcat 9.0.65LICENSE
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/pom.xml b/pom.xml
index b96b844a6..6d0b22f52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,26 +78,27 @@
1.7.36
1.7.0-async-beta
2.4.1
-9.0.64
+9.0.65
1.8.0
2.0.1
3.1.0
-3.4.1
+3.4.2
3.2.0
3.10.1
3.3.0
3.1.0
-2.5.2
+3.0.1
3.2.2
3.4.0
3.2.0
3.4.0
3.0.0-M6
-3.2.0
+3.0.0
+3.3.0
3.2.1
3.0.0-M7
-
1.0.1
+
1.1.0
3.3.2
1.4.3
3.2.0
@@ -535,9 +536,6 @@
maven-install-plugin
${plugin.install.version}
-
-true
-
@@ -595,6 +593,11 @@
${plugin.release.version}
+
+ maven-remote-resources-plugin
+ ${plugin.remote-resources.version}
+
+
maven-resources-plugin
${plugin.resources.version}
[jspwiki] 01/03: Update portable launcher binaries and update launch4j download urls
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 5f66a7abdef674a12a0d7bc073474058810bf211
Author: Juan Pablo Santos Rodríguez
AuthorDate: Mon Jul 25 23:31:37 2022 +0200
Update portable launcher binaries and update launch4j download urls
---
jspwiki-portable/build.xml | 4 ++--
.../tomcat/woas.app/Contents/Java/bootstrap.jar| Bin 34699 -> 34700 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 46898 -> 47050 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3669432 -> 3670538
bytes
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index 93e417b95..06031ff52 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -225,7 +225,7 @@
-https://deac-ams.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-win32.zip;
dest="${jspwiki.launch4j.install.dir}"/>
+https://netix.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-win32.zip;
dest="${jspwiki.launch4j.install.dir}"/>
@@ -233,7 +233,7 @@
-https://deac-ams.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-macosx-x86.tgz;
dest="${jspwiki.launch4j.install.dir}"/>
+https://netix.dl.sourceforge.net/project/launch4j/launch4j-3/3.14/launch4j-3.14-macosx-x86.tgz;
dest="${jspwiki.launch4j.install.dir}"/>
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 674f7efc4..863127b08 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 9b39f6184..301ecf3d2 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 41789bfd6..41dbdb4e6 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and
b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
[jspwiki] 03/03: 2.11.3-git-12
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 94d658571b9b2efbdb51e7ea19e406302a05b7eb
Author: Juan Pablo Santos Rodríguez
AuthorDate: Mon Jul 25 23:35:10 2022 +0200
2.11.3-git-12
---
ChangeLog.md | 8
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 40dc2ed99..3b7a10932 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,14 @@ specific language governing permissions and limitations
under the License.
-->
+**2022-07-25 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.3-git-12_
+
+* Dependency updates
+* Tomcat to 9.0.65 (closes
[#210](https://github.com/apache/jspwiki/pull/210)), thanks to dependabot
+* Maven plugins: install to 3.0.1 (closes
[#214](https://github.com/apache/jspwiki/pull/214)), assembly to 3.4.2 (closes
[#215](https://github.com/apache/jspwiki/pull/215)), surefire junit5 tree
reporter to 1.1.0 (closes [#216](https://github.com/apache/jspwiki/pull/216)),
thanks to dependabot
+
**2022-07-20 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.3-git-11_
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 f2e455365..ed521138d 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "11";
+public static final String BUILD = "12";
/**
* This is the generic version string you should use when printing out
the version. It is of
[jspwiki] branch master updated: Update ChangeLog
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 The following commit(s) were added to refs/heads/master by this push: new 6dac6a3fb Update ChangeLog 6dac6a3fb is described below commit 6dac6a3fb5395f9684f411b31acff677b50a2b3f Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jul 20 20:29:23 2022 +0200 Update ChangeLog --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index bd7e7a71c..40dc2ed99 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -23,7 +23,7 @@ under the License. * Bring explicit CSRF protection to user management JSPs -* Merged PRs with several code improvements [#202](https://github.com/apache/jspwiki/pull/202), [#203](https://github.com/apache/jspwiki/pull/203) and [#204](https://github.com/apache/jspwiki/pull/204), provided by [Arturo Bernal](https://github.com/arturobernalg), thanks! +* Merged PRs with several code improvements [#202](https://github.com/apache/jspwiki/pull/202), [#203](https://github.com/apache/jspwiki/pull/203), [#204](https://github.com/apache/jspwiki/pull/204), [#205](https://github.com/apache/jspwiki/pull/205) and [#206](https://github.com/apache/jspwiki/pull/206) provided by [Arturo Bernal](https://github.com/arturobernalg), thanks! * Dependency updates * Maven plugins: project-info-reports to 3.4.0 (closes [#208](https://github.com/apache/jspwiki/pull/208), thanks to dependabot)
[jspwiki] branch master updated: Declare 'private static final long' 'serialVersionUID' field.
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
The following commit(s) were added to refs/heads/master by this push:
new 72b38fe29 Declare 'private static final long' 'serialVersionUID' field.
72b38fe29 is described below
commit 72b38fe29754f8b85001a4a1eabc6d074532b8c8
Author: Arturo Bernal
AuthorDate: Fri Jul 15 23:08:21 2022 +0200
Declare 'private static final long' 'serialVersionUID' field.
---
jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
index 3ae26b553..afdfa7b40 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
@@ -49,7 +49,7 @@ import java.util.Map;
*/
public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
- static final long serialVersionUID = 0L;
+private static final long serialVersionUID = 0L;
private static final Logger LOG = LogManager.getLogger( LinkTag.class );
private String m_version;
[jspwiki] branch master updated: Missing @override.
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 The following commit(s) were added to refs/heads/master by this push: new 1f1a47440 Missing @override. 1f1a47440 is described below commit 1f1a47440f9a3080ea1cebccbb257ef858a5f0c9 Author: Arturo Bernal AuthorDate: Fri Jul 15 23:06:35 2022 +0200 Missing @override. --- .../apache/wiki/api/filters/BasicPageFilter.java | 15 - .../engine/EngineLifecycleExtensionTestImpl.java | 9 +--- .../org/apache/wiki/event/WikiPageRenameEvent.java | 2 ++ .../main/java/org/apache/wiki/LinkCollector.java | 3 ++- .../src/main/java/org/apache/wiki/WikiContext.java | 2 ++ .../src/main/java/org/apache/wiki/WikiPage.java| 4 +++- .../org/apache/wiki/attachment/Attachment.java | 9 ++-- .../java/org/apache/wiki/auth/GroupPrincipal.java | 1 + .../org/apache/wiki/auth/acl/AclEntryImpl.java | 14 .../apache/wiki/auth/acl/UnresolvedPrincipal.java | 1 + .../java/org/apache/wiki/auth/authorize/Role.java | 1 + .../wiki/auth/login/AbstractLoginModule.java | 7 +- .../wiki/auth/login/AnonymousLoginModule.java | 1 + .../auth/login/CookieAssertionLoginModule.java | 1 + .../apache/wiki/auth/login/PrincipalWrapper.java | 1 + .../wiki/auth/login/UserDatabaseLoginModule.java | 1 + .../wiki/auth/login/WebContainerLoginModule.java | 1 + .../wiki/auth/permissions/AllPermission.java | 5 - .../auth/permissions/AllPermissionCollection.java | 5 - .../wiki/auth/permissions/GroupPermission.java | 2 ++ .../wiki/auth/permissions/PagePermission.java | 4 +++- .../wiki/auth/permissions/WikiPermission.java | 3 +++ .../org/apache/wiki/pages/PageTimeComparator.java | 3 ++- .../org/apache/wiki/render/CleanTextRenderer.java | 1 + .../org/apache/wiki/render/CreoleRenderer.java | 1 + .../wiki/render/CustomXMLOutputProcessor.java | 3 ++- .../apache/wiki/render/WysiwygEditingRenderer.java | 1 + .../java/org/apache/wiki/render/XHTMLRenderer.java | 1 + .../java/org/apache/wiki/search/SearchResult.java | 1 + .../apache/wiki/search/SearchResultComparator.java | 3 ++- .../main/java/org/apache/wiki/tags/CookieTag.java | 2 ++ .../org/apache/wiki/tags/EditorIteratorInfo.java | 1 + .../org/apache/wiki/tags/HistoryIteratorInfo.java | 3 ++- .../org/apache/wiki/tags/IfNoSearchResultsTag.java | 1 + .../org/apache/wiki/tags/IncludeResourcesTag.java | 2 ++ .../java/org/apache/wiki/tags/LinkToParentTag.java | 1 + .../java/org/apache/wiki/tags/NextVersionTag.java | 1 + .../java/org/apache/wiki/tags/PageDateTag.java | 2 ++ .../java/org/apache/wiki/tags/PageExistsTag.java | 1 + .../java/org/apache/wiki/tags/PageTypeTag.java | 2 ++ .../java/org/apache/wiki/tags/PageVersionTag.java | 1 + .../apache/wiki/tags/SearchResultIteratorInfo.java | 3 ++- .../org/apache/wiki/tags/SearchResultsSizeTag.java | 1 + .../org/apache/wiki/tags/SearchResultsTag.java | 1 + .../org/apache/wiki/tags/SetPaginationTag.java | 2 ++ .../src/main/java/org/apache/wiki/tags/TabTag.java | 3 +++ .../java/org/apache/wiki/tags/TemplateDirTag.java | 1 + .../java/org/apache/wiki/tags/WikiBodyTag.java | 5 - .../java/org/apache/wiki/tags/WikiLinkTag.java | 4 +++- .../java/org/apache/wiki/tags/WikiTagBase.java | 2 ++ .../java/org/apache/wiki/ui/AbstractCommand.java | 9 +++- .../main/java/org/apache/wiki/ui/GroupCommand.java | 5 - .../main/java/org/apache/wiki/ui/PageCommand.java | 5 - .../java/org/apache/wiki/ui/RedirectCommand.java | 5 - .../wiki/ui/progress/DefaultProgressManager.java | 9 ++-- .../org/apache/wiki/workflow/AbstractStep.java | 25 +- .../java/org/apache/wiki/workflow/Decision.java| 4 +++- .../apache/wiki/workflow/SimpleNotification.java | 1 + .../org/apache/wiki/workflow/SystemPrincipal.java | 1 + .../main/java/org/apache/wiki/workflow/Task.java | 1 + jspwiki-main/src/test/java/SamplePlugin2.java | 3 ++- .../org/apache/wiki/auth/SecurityEventTrap.java| 1 + .../java/org/apache/wiki/plugin/SamplePlugin3.java | 3 ++- .../java/org/apache/wiki/web/TestContainer.java| 1 + .../java/org/apache/wiki/workflow/TaskTest.java| 6 -- .../main/java/org/apache/wiki/util/MailUtil.java | 1 + .../java/org/apache/wiki/util/PriorityList.java| 3 +++ .../wiki/util/comparators/CollatorComparator.java | 1 + .../wiki/util/comparators/HumanComparator.java | 1 + .../util/comparators/JavaNaturalComparator.java| 1 + 70 files changed, 188 insertions(+), 43 deletions(-) diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java index dc44e28d2
[jspwiki] branch master updated: add missing csrf params
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
The following commit(s) were added to refs/heads/master by this push:
new 55b117915 add missing csrf params
55b117915 is described below
commit 55b117915b2bf3245f0babf4afe54fa4df01e8c5
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jul 20 17:09:28 2022 +0200
add missing csrf params
---
jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js | 2 +-
jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js
b/jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js
index 43f4d6b66..0a5dfbcad 100644
--- a/jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js
+++ b/jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js
@@ -473,7 +473,7 @@ Wiki.Snips = {
new Request({
url: Wiki.XHRPreview,
-data: { page: Wiki.PageName, wikimarkup: "[{Groups}]" },
+data: { page: Wiki.PageName, wikimarkup: "[{Groups}]",
'X-XSRF-TOKEN': wiki.CsrfProtection },
onSuccess: function(responseText){
var body = "Anonymous|Asserted|Authenticated|All";
diff --git a/jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js
b/jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js
index 6a9f757d3..32bc5ce11 100644
--- a/jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js
+++ b/jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js
@@ -473,7 +473,7 @@ Wiki.Snips = {
new Request({
url: Wiki.XHRPreview,
-data: { page: Wiki.PageName, wikimarkup: "[{Groups}]()" },
+data: { page: Wiki.PageName, wikimarkup: "[{Groups}]()",
'X-XSRF-TOKEN': wiki.CsrfProtection },
onSuccess: function(responseText){
var body = "Anonymous|Asserted|Authenticated|All";
[jspwiki] 01/03: update maven-project-info-reports-plugin to 3.4.0 - closes #208
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 f1f582dd7055219e8b5fe2470757d5385d007df6 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jul 20 16:46:15 2022 +0200 update maven-project-info-reports-plugin to 3.4.0 - closes #208 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41619809f..b96b844a6 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ 3.2.2 3.4.0 3.2.0 - 3.3.0 + 3.4.0 3.0.0-M6 3.2.0 3.2.1
[jspwiki] 03/03: 2.11.3-git-11
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 300d6027303cbc3dae05ea3762f24a5c912ba771
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jul 20 16:47:26 2022 +0200
2.11.3-git-11
---
ChangeLog.md| 17 ++---
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 478bcaa1c..bd7e7a71c 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,15 +17,26 @@ specific language governing permissions and limitations
under the License.
-->
+**2022-07-20 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.3-git-11_
+
+* Bring explicit CSRF protection to user management JSPs
+
+* Merged PRs with several code improvements
[#202](https://github.com/apache/jspwiki/pull/202),
[#203](https://github.com/apache/jspwiki/pull/203) and
[#204](https://github.com/apache/jspwiki/pull/204), provided by [Arturo
Bernal](https://github.com/arturobernalg), thanks!
+
+* Dependency updates
+* Maven plugins: project-info-reports to 3.4.0 (closes
[#208](https://github.com/apache/jspwiki/pull/208), thanks to dependabot)
+
**2022-07-14 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.3-git-10_
-* Bring CSRF protection to group management JSPs
+* Bring explicit CSRF protection to group management JSPs
* Add default application name on `` elements to templates' templates,
and `Main` as default frontpage is none is defined on default template
-[`org.apache.wiki.markdown.migration.WikiSyntaxConverter`](https://github.com/apache/jspwiki/blob/master/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java)
now also brings pages' attachments when converting to markdown
+*
[`org.apache.wiki.markdown.migration.WikiSyntaxConverter`](https://github.com/apache/jspwiki/blob/master/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java)
now also brings pages' attachments when converting to markdown
* Dependency updates
* Parent to Apache Parent 27
@@ -51,7 +62,7 @@ under the License.
* Upgrade to cargo-maven3 broke the launch configuration
* Latest Selenide upgrades broke SearchIT, which wasn't hovering on search
form
-* Merged PRs [#192](https://github.com/apache/jspwiki/pull/192),
[#193](https://github.com/apache/jspwiki/pull/193),
[#195](https://github.com/apache/jspwiki/pull/195) and
[#196](https://github.com/apache/jspwiki/pull/196), provided by [Arturo
Bernal](https://github.com/arturobernalg), thanks!
+* Merged PRs with several code improvements
[#192](https://github.com/apache/jspwiki/pull/192),
[#193](https://github.com/apache/jspwiki/pull/193),
[#195](https://github.com/apache/jspwiki/pull/195) and
[#196](https://github.com/apache/jspwiki/pull/196), provided by [Arturo
Bernal](https://github.com/arturobernalg), thanks!
* Dependency updates
* Log4J to 2.18.0
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 d2b8a9245..f2e455365 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "10";
+public static final String BUILD = "11";
/**
* This is the generic version string you should use when printing out
the version. It is of
[jspwiki] 02/03: Bring explicit CSRF protection to user management JSPs
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 70eeaba88fec0c4fc325ff9bc8efcc09b850c13d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Wed Jul 20 16:47:01 2022 +0200
Bring explicit CSRF protection to user management JSPs
---
jspwiki-war/src/main/webapp/Login.jsp | 8 +++-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 12 +++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/Login.jsp
b/jspwiki-war/src/main/webapp/Login.jsp
index 02c55e8af..001651149 100644
--- a/jspwiki-war/src/main/webapp/Login.jsp
+++ b/jspwiki-war/src/main/webapp/Login.jsp
@@ -28,6 +28,7 @@
<%@ page import="org.apache.wiki.auth.login.CookieAuthenticationLoginModule" %>
<%@ page import="org.apache.wiki.auth.user.DuplicateUserException" %>
<%@ page import="org.apache.wiki.auth.user.UserProfile" %>
+<%@ page import="org.apache.wiki.http.filter.CsrfProtectionFilter" %>
<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
@@ -53,7 +54,12 @@
}
// Are we saving the profile?
-if( "saveProfile".equals(request.getParameter("action")) ) {
+if( "saveProfile".equals( request.getParameter( "action" ) ) ) {
+if( !CsrfProtectionFilter.isCsrfProtectedPost( request ) ) {
+response.sendRedirect( "/error/Forbidden.html" );
+return;
+}
+
UserManager userMgr = wiki.getManager( UserManager.class );
UserProfile profile = userMgr.parseProfile( wikiContext );
diff --git a/jspwiki-war/src/main/webapp/UserPreferences.jsp
b/jspwiki-war/src/main/webapp/UserPreferences.jsp
index b4e0fe224..20347ee3e 100644
--- a/jspwiki-war/src/main/webapp/UserPreferences.jsp
+++ b/jspwiki-war/src/main/webapp/UserPreferences.jsp
@@ -30,6 +30,7 @@
<%@ page import="org.apache.wiki.auth.login.CookieAssertionLoginModule" %>
<%@ page import="org.apache.wiki.auth.user.DuplicateUserException" %>
<%@ page import="org.apache.wiki.auth.user.UserProfile" %>
+<%@ page import="org.apache.wiki.http.filter.CsrfProtectionFilter" %>
<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
<%@ page import="org.apache.wiki.pages.PageManager" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
@@ -65,6 +66,10 @@
// Are we saving the profile?
if( "saveProfile".equals( request.getParameter( "action" ) ) ) {
+if( !CsrfProtectionFilter.isCsrfProtectedPost( request ) ) {
+response.sendRedirect( "/error/Forbidden.html" );
+return;
+}
UserProfile profile = userMgr.parseProfile( wikiContext );
// Validate the profile
@@ -110,8 +115,7 @@
CookieAssertionLoginModule.setUserCookie( response, assertedName );
String redirectPage = request.getParameter( "redirect" );
-if( !wiki.getManager( PageManager.class ).wikiPageExists( redirectPage
) )
-{
+if( !wiki.getManager( PageManager.class ).wikiPageExists( redirectPage
) ) {
redirectPage = wiki.getFrontPage();
}
String viewUrl = ( "UserPreferences".equals( redirectPage ) ) ?
"Wiki.jsp" : wikiContext.getViewURL( redirectPage );
@@ -126,8 +130,7 @@
Preferences.reloadPreferences( pageContext );
String redirectPage = request.getParameter( "redirect" );
-if( !wiki.getManager( PageManager.class ).wikiPageExists( redirectPage
) )
-{
+if( !wiki.getManager( PageManager.class ).wikiPageExists( redirectPage
) ) {
redirectPage = wiki.getFrontPage();
}
String viewUrl = ( "UserPreferences".equals( redirectPage ) ) ?
"Wiki.jsp" : wikiContext.getViewURL( redirectPage );
@@ -139,4 +142,3 @@
response.setContentType( "text/html; charset=" + wiki.getContentEncoding()
);
String contentPage = wiki.getManager( TemplateManager.class ).findJSP(
pageContext, wikiContext.getTemplate(), "ViewTemplate.jsp" );
%>
-
[jspwiki] branch master updated (da2ab2a5d -> 300d60273)
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 da2ab2a5d Use uppercase LOG class constant. new f1f582dd7 update maven-project-info-reports-plugin to 3.4.0 - closes #208 new 70eeaba88 Bring explicit CSRF protection to user management JSPs new 300d60273 2.11.3-git-11 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| 17 ++--- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- jspwiki-war/src/main/webapp/Login.jsp | 8 +++- jspwiki-war/src/main/webapp/UserPreferences.jsp | 12 +++- pom.xml | 2 +- 5 files changed, 30 insertions(+), 11 deletions(-)
[jspwiki] branch master updated (9d45ae972 -> 0619de2fc)
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 9d45ae972 Remove unnecessary/redundant import statements. add 0619de2fc Simplify arithmetic expressions. No new revisions were added by this update. Summary of changes: jspwiki-util/src/main/java/org/apache/wiki/util/CryptoUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[jspwiki] branch master updated (5b63ca278 -> 9d45ae972)
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 5b63ca278 Update ChangeLog add 9d45ae972 Remove unnecessary/redundant import statements. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/wiki/util/CommentedProperties.java | 1 - jspwiki-util/src/main/java/org/apache/wiki/util/PropertyReader.java | 4 2 files changed, 5 deletions(-)
[jspwiki] 01/02: WikiSyntaxConverter.java now also brings pages' attachments when converting to markdown
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 a55edaea6c9dac63126eca7b65af104565d2683e
Author: Juan Pablo Santos Rodríguez
AuthorDate: Fri Jul 15 22:47:15 2022 +0200
WikiSyntaxConverter.java now also brings pages' attachments when converting
to markdown
As this utility is run as a unit test, there's no version bump
---
.../org/apache/wiki/markdown/migration/WikiSyntaxConverter.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
b/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
index ce3856fdd..7e26ea68a 100644
---
a/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
+++
b/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java
@@ -19,11 +19,13 @@
package org.apache.wiki.markdown.migration;
import org.apache.wiki.TestEngine;
+import org.apache.wiki.api.core.Attachment;
import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.ContextEnum;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.spi.Wiki;
+import org.apache.wiki.attachment.AttachmentManager;
import org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator;
import org.apache.wiki.markdown.migration.parser.JSPWikiToMarkdownMarkupParser;
import org.apache.wiki.pages.PageManager;
@@ -31,7 +33,9 @@ import org.apache.wiki.plugin.PluginManager;
import org.apache.wiki.render.RenderingManager;
import org.junit.jupiter.api.Test;
+import java.io.InputStream;
import java.util.Collection;
+import java.util.List;
import static org.apache.wiki.TestEngine.with;
@@ -54,6 +58,11 @@ public class WikiSyntaxConverter {
final String syntax = new HtmlStringToWikiTranslator( md
).translate( html );
final Context contextMD = Wiki.context().create( md, p );
md.getManager( PageManager.class ).saveText( contextMD, clean(
syntax ) );
+final List< Attachment > attachments = jspw.getManager(
AttachmentManager.class ).listAttachments( p );
+for( final Attachment attachment : attachments ) {
+final InputStream bytes = jspw.getManager(
AttachmentManager.class ).getAttachmentStream( context, attachment );
+md.getManager( AttachmentManager.class ).storeAttachment(
attachment, bytes );
+}
}
}
[jspwiki] branch master updated (431e44333 -> 5b63ca278)
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 431e44333 fix list indentation new a55edaea6 WikiSyntaxConverter.java now also brings pages' attachments when converting to markdown new 5b63ca278 Update ChangeLog The 2 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 | 6 -- .../org/apache/wiki/markdown/migration/WikiSyntaxConverter.java | 9 + 2 files changed, 13 insertions(+), 2 deletions(-)
[jspwiki] 02/02: Update ChangeLog
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 5b63ca27842bf5208c4d40d9bf411d5514afbe5d Author: Juan Pablo Santos Rodríguez AuthorDate: Fri Jul 15 22:47:32 2022 +0200 Update ChangeLog --- ChangeLog.md | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 3512828ed..478bcaa1c 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -25,10 +25,12 @@ under the License. * Add default application name on `` elements to templates' templates, and `Main` as default frontpage is none is defined on default template +[`org.apache.wiki.markdown.migration.WikiSyntaxConverter`](https://github.com/apache/jspwiki/blob/master/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java) now also brings pages' attachments when converting to markdown + * Dependency updates * Parent to Apache Parent 27 -* Jetty to 9.4.48.v20220622 - closes [#199](https://github.com/apache/jspwiki/pull/199) -* Mockito to 4.6.1 - closes [#198](https://github.com/apache/jspwiki/pull/198) +* Jetty to 9.4.48.v20220622 - closes [#199](https://github.com/apache/jspwiki/pull/199), thanks to dependabot +* Mockito to 4.6.1 - closes [#198](https://github.com/apache/jspwiki/pull/198), thanks to dependabot * Maven plugins: release to 3.0.0-M6 (closes [#201](https://github.com/apache/jspwiki/pull/201), thanks to dependabot), junit5-tree-reporter to 1.0.1 (closes [#200](https://github.com/apache/jspwiki/pull/200), thanks to dependabot) **2022-07-12 Juan Pablo Santos (juanpablo AT apache DOT org)**
[jspwiki] branch master updated: fix list indentation
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 The following commit(s) were added to refs/heads/master by this push: new 431e44333 fix list indentation 431e44333 is described below commit 431e443337ddb33e9dc96001c7b3cdd2a4c1d59b Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Jul 14 20:56:13 2022 +0200 fix list indentation --- ChangeLog.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9835a5665..3512828ed 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -26,10 +26,10 @@ under the License. * Add default application name on `` elements to templates' templates, and `Main` as default frontpage is none is defined on default template * Dependency updates - * Parent to Apache Parent 27 - * Jetty to 9.4.48.v20220622 - closes [#199](https://github.com/apache/jspwiki/pull/199) - * Mockito to 4.6.1 - closes [#198](https://github.com/apache/jspwiki/pull/198) - * Maven plugins: release to 3.0.0-M6 (closes [#201](https://github.com/apache/jspwiki/pull/201), thanks to dependabot), junit5-tree-reporter to 1.0.1 (closes [#200](https://github.com/apache/jspwiki/pull/200), thanks to dependabot) +* Parent to Apache Parent 27 +* Jetty to 9.4.48.v20220622 - closes [#199](https://github.com/apache/jspwiki/pull/199) +* Mockito to 4.6.1 - closes [#198](https://github.com/apache/jspwiki/pull/198) +* Maven plugins: release to 3.0.0-M6 (closes [#201](https://github.com/apache/jspwiki/pull/201), thanks to dependabot), junit5-tree-reporter to 1.0.1 (closes [#200](https://github.com/apache/jspwiki/pull/200), thanks to dependabot) **2022-07-12 Juan Pablo Santos (juanpablo AT apache DOT org)**
[jspwiki] branch master updated: move csrf check to save action
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
The following commit(s) were added to refs/heads/master by this push:
new aad6dcb7a move csrf check to save action
aad6dcb7a is described below
commit aad6dcb7a9f8ca5f8630fb17959ef2bb6167493c
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Jul 14 20:03:46 2022 +0200
move csrf check to save action
---
jspwiki-war/src/main/webapp/NewGroup.jsp | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/NewGroup.jsp
b/jspwiki-war/src/main/webapp/NewGroup.jsp
index 5f098f78f..04c137f18 100644
--- a/jspwiki-war/src/main/webapp/NewGroup.jsp
+++ b/jspwiki-war/src/main/webapp/NewGroup.jsp
@@ -38,10 +38,6 @@
%>
<%
-if( !CsrfProtectionFilter.isCsrfProtectedPost( request ) ) {
-response.sendRedirect( "/error/Forbidden.html" );
-return;
-}
Engine wiki = Wiki.engine().find( getServletConfig() );
// Create wiki context and check for authorization
Context wikiContext = Wiki.context().create( wiki, request,
ContextEnum.WIKI_CREATE_GROUP.getRequestContext() );
@@ -62,6 +58,10 @@
// Are we saving the group?
if( "save".equals( request.getParameter( "action" ) ) ) {
+if( !CsrfProtectionFilter.isCsrfProtectedPost( request ) ) {
+response.sendRedirect( "/error/Forbidden.html" );
+return;
+}
// Validate the group
groupMgr.validateGroup( wikiContext, group );
[jspwiki] 02/07: use log placeholders
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 0f0054d3e8ca567b65ae7024d7f98e3ddf5e880d
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Jul 14 19:37:58 2022 +0200
use log placeholders
---
.../wiki/auth/DefaultAuthorizationManager.java | 35 +++---
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
index 5737b5444..09b0bc296 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
@@ -77,7 +77,7 @@ import java.util.WeakHashMap;
*/
public class DefaultAuthorizationManager implements AuthorizationManager {
-private static final Logger log = LogManager.getLogger(
DefaultAuthorizationManager.class );
+private static final Logger LOG = LogManager.getLogger(
DefaultAuthorizationManager.class );
private Authorizer m_authorizer;
@@ -139,10 +139,10 @@ public class DefaultAuthorizationManager implements
AuthorizationManager {
// any of these, the action is allowed.
final Principal[] aclPrincipals = acl.findPrincipals( permission );
-log.debug( "Checking ACL entries..." );
-log.debug( "Acl for this page is: " + acl );
-log.debug( "Checking for principal: " + Arrays.toString( aclPrincipals
) );
-log.debug( "Permission: " + permission );
+LOG.debug( "Checking ACL entries..." );
+LOG.debug( "Acl for this page is: {}", acl );
+LOG.debug( "Checking for principal: {}", Arrays.toString(
aclPrincipals ) );
+LOG.debug( "Permission: {}", permission );
for( Principal aclPrincipal : aclPrincipals ) {
// If the ACL principal we're looking at is unresolved, try to
resolve it here & correct the Acl
@@ -202,7 +202,6 @@ public class DefaultAuthorizationManager implements
AuthorizationManager {
@Override
public boolean hasAccess( final Context context, final HttpServletResponse
response, final boolean redirect ) throws IOException {
final boolean allowed = checkPermission( context.getWikiSession(),
context.requiredPermission() );
-final ResourceBundle rb = Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE );
// Stash the wiki context
if ( context.getHttpRequest() != null &&
context.getHttpRequest().getAttribute( Context.ATTR_CONTEXT ) == null ) {
@@ -211,15 +210,15 @@ public class DefaultAuthorizationManager implements
AuthorizationManager {
// If access not allowed, redirect
if( !allowed && redirect ) {
+final ResourceBundle rb = Preferences.getBundle( context,
InternationalizationManager.CORE_BUNDLE );
final Principal currentUser =
context.getWikiSession().getUserPrincipal();
final String pageurl = context.getPage().getName();
if( context.getWikiSession().isAuthenticated() ) {
-log.info( "User " + currentUser.getName() + " has no access -
forbidden (permission=" + context.requiredPermission() + ")" );
-context.getWikiSession().addMessage( MessageFormat.format(
rb.getString( "security.error.noaccess.logged" ),
- context.getName()) );
+LOG.info( "User {} has no access - forbidden (permission={})",
currentUser.getName(), context.requiredPermission() );
+context.getWikiSession().addMessage( MessageFormat.format(
rb.getString( "security.error.noaccess.logged" ), context.getName()) );
} else {
-log.info( "User " + currentUser.getName() + " has no access -
redirecting (permission=" + context.requiredPermission() + ")" );
-context.getWikiSession().addMessage( MessageFormat.format(
rb.getString("security.error.noaccess"), context.getName() ) );
+LOG.info( "User {} has no access - redirecting
(permission={})", currentUser.getName(), context.requiredPermission() );
+context.getWikiSession().addMessage( MessageFormat.format(
rb.getString( "security.error.noaccess" ), context.getName() ) );
}
response.sendRedirect( m_engine.getURL(
ContextEnum.WIKI_LOGIN.getRequestContext(), pageurl, null ) );
}
@@ -246,31 +245,31 @@ public class DefaultAuthorizationManager implements
AuthorizationManager {
if (policyURL != null
[jspwiki] 04/07: Update LICENSE's versions
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 c9b544b9d6592f6a500fc37e5c1d65ce51a68cbd Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Jul 14 19:41:26 2022 +0200 Update LICENSE's versions --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 3c8831631..7a12a38a9 100644 --- a/LICENSE +++ b/LICENSE @@ -285,9 +285,9 @@ commons-el-1.0.jar LICENSE custom_rhino-0.4.3.jar ./jspwiki-war/src/main/config/doc/LICENSE.mpl hsqldb-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb sqltool-2.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb -jetty-all-9.4.46.v20220331.jar LICENSE +jetty-all-9.4.48.v20220622.jar LICENSE junit-5.8.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl -mockito-core-4.5.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit +mockito-core-4.6.1.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit selenide-6.6.6.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
[jspwiki] 05/07: add default application name on element to templates' templates
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 fb705250c96ac2129d431b059242821ccd646b6a Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Jul 14 19:46:46 2022 +0200 add default application name on element to templates' templates --- jspwiki-war/src/main/webapp/Captcha.jsp | 2 +- jspwiki-war/src/main/webapp/Error.jsp| 2 +- jspwiki-war/src/main/webapp/admin/Admin.jsp | 2 +- jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/UploadTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/210/ViewTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/default/EditTemplate.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/default/UploadTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/default/ViewTemplate.jsp | 2 +- jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp| 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jspwiki-war/src/main/webapp/Captcha.jsp b/jspwiki-war/src/main/webapp/Captcha.jsp index ed33fdf10..a594f8007 100644 --- a/jspwiki-war/src/main/webapp/Captcha.jsp +++ b/jspwiki-war/src/main/webapp/Captcha.jsp @@ -75,7 +75,7 @@ - : + : <%-- --%>
[jspwiki] 06/07: Main as default frontpage if none is defined
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 9dbca5af0af384f7bef54038a7653c5ebedeead7 Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Jul 14 19:58:17 2022 +0200 Main as default frontpage if none is defined --- jspwiki-war/src/main/webapp/templates/default/Header.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jspwiki-war/src/main/webapp/templates/default/Header.jsp b/jspwiki-war/src/main/webapp/templates/default/Header.jsp index e261e00ec..bf5f006a0 100644 --- a/jspwiki-war/src/main/webapp/templates/default/Header.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/Header.jsp @@ -24,7 +24,7 @@ <%@ page import="org.apache.wiki.api.core.*" %> - +
[jspwiki] 03/07: Dependency updates
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 c25bf3f8196a483a17a68ea1aec58e502cb17e43 Author: Juan Pablo Santos Rodríguez AuthorDate: Thu Jul 14 19:40:24 2022 +0200 Dependency updates * parent to apache parent 27 * jetty to 9.4.48.v20220622 * mockito to 4.6.1 * maven plugins: release to 3.0.0-M6, junit5-tree-reporter to 1.0.1 closes #198, closes #199, closes #200 and closes #201, thanks to dependabot --- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 3dc46b703..41619809f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache apache -26 +27 org.apache.jspwiki @@ -65,12 +65,12 @@ 2.3.3 3.1.0 2.0.6 -9.4.46.v20220331 +9.4.48.v20220622 0.4.2 5.8.2 2.18.0 8.11.2 -4.5.1 +4.6.1 2.0.2 2.0.8 0.5 @@ -93,11 +93,11 @@ 3.4.0 3.2.0 3.3.0 -3.0.0-M5 +3.0.0-M6 3.2.0 3.2.1 3.0.0-M7 - 0.1.0 + 1.0.1 3.3.2 1.4.3 3.2.0
[jspwiki] 07/07: 2.11.3-git-10
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 7d60979947040bfcc800a422ee0f4ed117b31f6a
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Jul 14 19:58:40 2022 +0200
2.11.3-git-10
---
ChangeLog.md | 14 ++
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index d5f8252c6..9835a5665 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,20 @@ specific language governing permissions and limitations
under the License.
-->
+**2022-07-14 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.3-git-10_
+
+* Bring CSRF protection to group management JSPs
+
+* Add default application name on `` elements to templates' templates,
and `Main` as default frontpage is none is defined on default template
+
+* Dependency updates
+ * Parent to Apache Parent 27
+ * Jetty to 9.4.48.v20220622 - closes
[#199](https://github.com/apache/jspwiki/pull/199)
+ * Mockito to 4.6.1 - closes
[#198](https://github.com/apache/jspwiki/pull/198)
+ * Maven plugins: release to 3.0.0-M6 (closes
[#201](https://github.com/apache/jspwiki/pull/201), thanks to dependabot),
junit5-tree-reporter to 1.0.1 (closes
[#200](https://github.com/apache/jspwiki/pull/200), thanks to dependabot)
+
**2022-07-12 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.11.3-git-09_
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 9ef68f1fa..d2b8a9245 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 {
*
* If the build identifier is empty, it is not added.
*/
-public static final String BUILD = "09";
+public static final String BUILD = "10";
/**
* This is the generic version string you should use when printing out
the version. It is of
[jspwiki] branch master updated (52274290c -> 7d6097994)
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 52274290c forgot to add -y on apt upgrade new 1d9c4410d Bring CSRF protection to group management JSPs new 0f0054d3e use log placeholders new c25bf3f81 Dependency updates new c9b544b9d Update LICENSE's versions new fb705250c add default application name on element to templates' templates new 9dbca5af0 Main as default frontpage if none is defined new 7d6097994 2.11.3-git-10 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 | 14 + LICENSE| 4 +-- .../src/main/java/org/apache/wiki/api/Release.java | 2 +- .../wiki/http/filter/CsrfProtectionFilter.java | 31 --- .../wiki/auth/DefaultAuthorizationManager.java | 35 +++--- jspwiki-war/src/main/webapp/Captcha.jsp| 2 +- jspwiki-war/src/main/webapp/DeleteGroup.jsp| 6 jspwiki-war/src/main/webapp/EditGroup.jsp | 15 +- jspwiki-war/src/main/webapp/Error.jsp | 2 +- jspwiki-war/src/main/webapp/NewGroup.jsp | 5 jspwiki-war/src/main/webapp/admin/Admin.jsp| 2 +- .../src/main/webapp/admin/SecurityConfig.jsp | 4 +-- .../src/main/webapp/templates/210/EditTemplate.jsp | 4 +-- .../main/webapp/templates/210/UploadTemplate.jsp | 2 +- .../src/main/webapp/templates/210/ViewTemplate.jsp | 2 +- .../main/webapp/templates/default/EditTemplate.jsp | 4 +-- .../src/main/webapp/templates/default/Header.jsp | 2 +- .../webapp/templates/default/UploadTemplate.jsp| 2 +- .../main/webapp/templates/default/ViewTemplate.jsp | 2 +- .../main/webapp/templates/reader/ViewTemplate.jsp | 2 +- pom.xml| 10 +++ 21 files changed, 94 insertions(+), 58 deletions(-)
[jspwiki] 01/07: Bring CSRF protection to group management JSPs
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 1d9c4410d0c747b15e791b8b765284dfcfb66ed4
Author: Juan Pablo Santos Rodríguez
AuthorDate: Thu Jul 14 19:37:27 2022 +0200
Bring CSRF protection to group management JSPs
---
.../wiki/http/filter/CsrfProtectionFilter.java | 31 +++---
jspwiki-war/src/main/webapp/DeleteGroup.jsp| 6 +
jspwiki-war/src/main/webapp/EditGroup.jsp | 15 ++-
jspwiki-war/src/main/webapp/NewGroup.jsp | 5
4 files changed, 40 insertions(+), 17 deletions(-)
diff --git
a/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
b/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
index aed2ca8e4..808c3517c 100644
---
a/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
+++
b/jspwiki-http/src/main/java/org/apache/wiki/http/filter/CsrfProtectionFilter.java
@@ -13,8 +13,8 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.io.PrintWriter;
/**
@@ -36,25 +36,36 @@ public class CsrfProtectionFilter implements Filter {
/** {@inheritDoc} */
@Override
public void doFilter( final ServletRequest request, final ServletResponse
response, final FilterChain chain ) throws IOException, ServletException {
-if( "POST".equalsIgnoreCase( ( ( HttpServletRequest ) request
).getMethod() ) ) {
+if( isPost( ( HttpServletRequest ) request ) ) {
final Engine engine = Wiki.engine().find(
request.getServletContext(), null );
final Session session = Wiki.session().find( engine, (
HttpServletRequest ) request );
-if( !session.antiCsrfToken().equals( request.getParameter(
ANTICSRF_PARAM ) ) ) {
+if( !requestContainsValidCsrfToken( request, session ) ) {
LOG.error( "Incorrect {} param with value '{}' received for
{}",
ANTICSRF_PARAM, request.getParameter(
ANTICSRF_PARAM ), ( ( HttpServletRequest ) request ).getPathInfo() );
-final PrintWriter out = response.getWriter();
-out.print("Fatal
problem with JSPWiki");
-out.print("");
-out.print("CSRF injection detected");
-out.print("A CSRF injection has been detected, so the
request has been stopped");
-out.print("Please check your system logs to pinpoint the
request origin, someone's trying to mess with your installation.");
-out.print("");
+( ( HttpServletResponse ) response ).sendRedirect(
"/error/Forbidden.html" );
return;
}
}
chain.doFilter( request, response );
}
+public static boolean isCsrfProtectedPost( final HttpServletRequest
request ) {
+if( isPost( request ) ) {
+final Engine engine = Wiki.engine().find(
request.getServletContext(), null );
+final Session session = Wiki.session().find( engine, request );
+return requestContainsValidCsrfToken( request, session );
+}
+return false;
+}
+
+private static boolean requestContainsValidCsrfToken( final ServletRequest
request, final Session session ) {
+return session.antiCsrfToken().equals( request.getParameter(
ANTICSRF_PARAM ) );
+}
+
+static boolean isPost( final HttpServletRequest request ) {
+return "POST".equalsIgnoreCase( request.getMethod() );
+}
+
/** {@inheritDoc} */
@Override
public void destroy() {
diff --git a/jspwiki-war/src/main/webapp/DeleteGroup.jsp
b/jspwiki-war/src/main/webapp/DeleteGroup.jsp
index 17570bf38..275f6ccf5 100644
--- a/jspwiki-war/src/main/webapp/DeleteGroup.jsp
+++ b/jspwiki-war/src/main/webapp/DeleteGroup.jsp
@@ -25,6 +25,7 @@
<%@ page import="org.apache.wiki.auth.NoSuchPrincipalException" %>
<%@ page import="org.apache.wiki.auth.WikiSecurityException" %>
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
+<%@ page import="org.apache.wiki.http.filter.CsrfProtectionFilter" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags; prefix="wiki" %>
@@ -50,6 +51,11 @@
response.sendRedirect( "Group.jsp" );
}
+if( !CsrfProtectionFilter.isCsrfProtectedPost( request ) ) {
+response.sendRedirect( "/error/Forb
[jspwiki] branch master updated: forgot to add -y on apt upgrade
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 The following commit(s) were added to refs/heads/master by this push: new 52274290c forgot to add -y on apt upgrade 52274290c is described below commit 52274290ca66ff6bf41af84d9a4575bb4801f213 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jul 13 10:42:31 2022 +0200 forgot to add -y on apt upgrade --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 777e4a399..ddf61c3eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ ENV jspwiki_xmlGroupDatabaseFile /var/jspwiki/etc/groupdatabase.xml RUN set -x \ && export DEBIAN_FRONTEND=noninteractive \ && apt update \ - && apt upgrade \ + && apt upgrade -y \ && apt install --fix-missing --quiet --yes unzip #
[jspwiki] branch master updated: add apt update && apt upgrade before apt install
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 The following commit(s) were added to refs/heads/master by this push: new 3bc4853e9 add apt update && apt upgrade before apt install 3bc4853e9 is described below commit 3bc4853e960491663ec86b71a872c3251de5f291 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jul 13 10:39:28 2022 +0200 add apt update && apt upgrade before apt install in order to be able to locate unzip package and avoid build errors on hub.docker.com (this wasn't happening before, so maybe something has changed on base image? weird) --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index b6accc084..777e4a399 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,8 @@ ENV jspwiki_xmlGroupDatabaseFile /var/jspwiki/etc/groupdatabase.xml RUN set -x \ && export DEBIAN_FRONTEND=noninteractive \ + && apt update \ + && apt upgrade \ && apt install --fix-missing --quiet --yes unzip #
[jspwiki] branch master updated: add missing link to WikiSyntaxConverter
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 The following commit(s) were added to refs/heads/master by this push: new ef8b6e39b add missing link to WikiSyntaxConverter ef8b6e39b is described below commit ef8b6e39b111091badf9dbb8cc9cf0b47c881d92 Author: Juan Pablo Santos Rodríguez AuthorDate: Wed Jul 13 08:49:08 2022 +0200 add missing link to WikiSyntaxConverter --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index acda48412..d5f8252c6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -24,7 +24,7 @@ under the License. * New `CsrfProtectionFilter` to protect POST requests from CSRF attacks * `org.apache.wiki.api.core.Session` gains new `String antiCsrfToken()` method -* [`org.apache.wiki.markdown.migration.WikiSyntaxConverter`] to convert from JSPWiki syntax to markdown +* [`org.apache.wiki.markdown.migration.WikiSyntaxConverter`](https://github.com/apache/jspwiki/blob/master/jspwiki-markdown/src/test/java/org/apache/wiki/markdown/migration/WikiSyntaxConverter.java) to convert from JSPWiki syntax to markdown * does not keep pages' history nor attachments (yet), but it's enough to generate the basic set of wikipages from jspwiki-wikipages artifacts * Fixed logout modal dialog not showing up
[jspwiki] 21/25: Dependency updates
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 c4c5f411a734ffcfec65f9e2b81c0cba9d139e77 Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Jul 12 23:01:28 2022 +0200 Dependency updates * Log4J to 2.18.0 * Lucene to 8.11.2 * Selenide to 6.6.6 * Tika to 2.4.1 - closes #187 * Tomcat to 9.0.64 - closes #189 * Maven plugins: antrun to 3.1.0 (closes #190, thanks to dependabot), assembly to 3.4.1, enforcer to 3.1.0, surefire to 3.0.0-M7, cargo-maven3 to 1.9.13 (closes #197, thanks to dependabot) --- pom.xml | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index ba98114e2..3dc46b703 100644 --- a/pom.xml +++ b/pom.xml @@ -68,26 +68,26 @@ 9.4.46.v20220331 0.4.2 5.8.2 -2.17.2 -8.11.1 +2.18.0 +8.11.2 4.5.1 2.0.2 2.0.8 0.5 -6.4.0 +6.6.6 1.7.36 1.7.0-async-beta -2.4.0 -9.0.62 +2.4.1 +9.0.64 1.8.0 2.0.1 -3.0.0 -3.3.0 +3.1.0 +3.4.1 3.2.0 3.10.1 3.3.0 -3.0.0 +3.1.0 2.5.2 3.2.2 3.4.0 @@ -96,14 +96,14 @@ 3.0.0-M5 3.2.0 3.2.1 -3.0.0-M6 +3.0.0-M7 0.1.0 3.3.2 1.4.3 3.2.0 1.11 1.0.1 -1.9.10 +1.9.13 2.8 2.7 3.9.1.2184 @@ -128,6 +128,7 @@ jspwiki-api jspwiki-bootstrap jspwiki-cache +jspwiki-http jspwiki-wysiwyg jspwiki-main jspwiki-markdown
[jspwiki] 24/25: Update mvn cheat sheet
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 b7cf446d85a5563f0e68ce4d7863e44741bfec0b Author: Juan Pablo Santos Rodríguez AuthorDate: Tue Jul 12 23:02:31 2022 +0200 Update mvn cheat sheet --- mvn_cheat-sheet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvn_cheat-sheet.md b/mvn_cheat-sheet.md index a94e25f78..4b9928bcf 100644 --- a/mvn_cheat-sheet.md +++ b/mvn_cheat-sheet.md @@ -53,5 +53,5 @@ under the License. | mvn apache-rat:check| creates an Apache RAT report. See: http://creadur.apache.org/rat/apache-rat-plugin/plugin-info.html | | mvn cobertura:cobertura | generates a cobertura maven report. See: http://mojo.codehaus.org/cobertura-maven-plugin/usage.html | | mvn javadoc:javadoc | creates javadocs adding some UML class/package level diagrams (requires JDK<= 8) | -| mvn javadoc:javadoc -Djdk.javadoc.doclet.version=2.0.16 | same as above, but with JDK >= 9 | +| mvn javadoc:javadoc -Djdk.javadoc.doclet.version=2.0.18 | same as above, but with JDK >= 9 | | mvn sonar:sonar | generates a Sonar report. Expects a Sonar server running at http://localhost:9000/ |
[jspwiki] 04/25: Footnote links start with #ref-, instead of #
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 3d498669c097e884579f679d00ad9227bcdfaf85
Author: Juan Pablo Santos Rodríguez
AuthorDate: Tue May 3 23:00:49 2022 +0200
Footnote links start with #ref-, instead of #
there are other types of '# links' that can be generated, for instance,
'#section-' links
---
.../src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
index 0f6406eeb..4e395e395 100644
---
a/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
+++
b/jspwiki-wysiwyg/src/main/java/org/apache/wiki/htmltowiki/syntax/MarkupHelper.java
@@ -41,7 +41,7 @@ public class MarkupHelper {
* Checks if the link points to a footnote.
*/
public static boolean isFootnoteLink( final String ref ) {
-return ref.startsWith( "#" );
+return ref.startsWith( "#ref-" );
}
/**
