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 e388202 JSPWIKI-1135 - Add dependabot config file and Fix JavaDoc
e388202 is described below
commit e3882028221a8801492ec2f125cd098911dadc8e
Author: Arturo Bernal <[email protected]>
AuthorDate: Sun Dec 6 10:13:26 2020 +0100
JSPWIKI-1135 - Add dependabot config file and Fix JavaDoc
---
.github/dependabot.yml | 31 ++++++++++++++++++++++
.../java/org/apache/wiki/auth/authorize/Group.java | 2 +-
.../wiki/auth/login/WikiCallbackHandler.java | 2 +-
.../wiki/auth/permissions/GroupPermission.java | 2 +-
.../org/apache/wiki/tags/SetPaginationTag.java | 1 -
.../org/apache/wiki/ui/admin/beans/ModuleBean.java | 2 +-
.../main/java/org/apache/wiki/workflow/Task.java | 2 +-
.../java/org/apache/wiki/workflow/Workflow.java | 2 +-
8 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..9ceb4ed
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ ignore:
+ - dependency-name: javax.servlet:javax.servlet-api
+ versions: [3.2.0,)
+ - dependency-name: javax.servlet.jsp:javax.servlet.jsp-api
+ versions: [2.4.0,)
+ - dependency-name: org.apache.tomcat:*
+ versions: [10.0.0,)
+ - dependency-name: org.slf4j:*
+ versions: [1.8.0-beta1,2.0.0)
+
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
index 50cdf24..ee2b4aa 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
@@ -81,7 +81,7 @@ public class Group {
* Protected constructor to prevent direct instantiation except by other
* package members. Callers should use
* {@link GroupManager#parseGroup(String, String, boolean)} or
- * {@link GroupManager#parseGroup(org.apache.wiki.WikiContext, boolean)}.
+ * {@link GroupManager#parseGroup(org.apache.wiki.api.core.Context,
boolean)}.
* instead.
* @param name the name of the group
* @param wiki the wiki the group belongs to
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
index 4938bce..f7a8915 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
@@ -32,7 +32,7 @@ import java.io.IOException;
/**
* Handles logins made from inside the wiki application, rather than via the
web container. This handler is instantiated in
- * {@link
org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.WikiSession,HttpServletRequest,
String, String)}.
+ * {@link
org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.api.core.Session,HttpServletRequest,
String, String)}.
* If container-managed authentication is used, the {@link
WebContainerCallbackHandler}is used instead. This callback handler is
* designed to be used with {@link UserDatabaseLoginModule}.
*
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
index 0f8be4d..82587b3 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
@@ -454,7 +454,7 @@ public final class GroupPermission extends Permission
implements Serializable
* </table>
* <p>
* Note that JSPWiki’s access control checks are made inside of
- * {@link
org.apache.wiki.auth.AuthorizationManager#checkPermission(org.apache.wiki.WikiSession,
Permission)},
+ * {@link
org.apache.wiki.auth.AuthorizationManager#checkPermission(org.apache.wiki.api.core.Session,
Permission)},
* which performs a <code>Subject.doAs()</code> call. Thus, this
* Permission functions exactly the way it should during normal
* operations.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
index 25eeac9..036068a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/SetPaginationTag.java
@@ -228,7 +228,6 @@ public class SetPaginationTag
*
* @param sb : stringbuilder to write output to
* @param page : start of page block
- * @param onclick : link text
*
**/
private void appendLink(final StringBuilder sb, final int page, final
String fmttextkey )
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
index 7a0ad84..d136bb1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
@@ -89,7 +89,7 @@ public abstract class ModuleBean extends SimpleAdminBean {
}
/**
- * Obtains the collection of modules which is going to be inspected at
{@link #doGet(WikiContext)}.
+ * Obtains the collection of modules which is going to be inspected at
{@link #doGet(Context)}.
*
* @return a collection of {@link WikiModuleInfo}
*/
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
index 49b5585..501cb79 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Task.java
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* AbstractStep subclass that executes instructions, uninterrupted, and
results in an Outcome. Concrete classes only need to implement
- * {@link Task#execute()}. When the execution step completes,
<code>execute</code> must return {@link Outcome#STEP_COMPLETE},
+ * {@link Task#execute(org.apache.wiki.api.core.Context)}. When the execution
step completes, <code>execute</code> must return {@link Outcome#STEP_COMPLETE},
* {@link Outcome#STEP_CONTINUE} or {@link Outcome#STEP_ABORT}. Subclasses can
add any errors by calling the helper method
* {@link AbstractStep#addError(String)}. The execute method should
<em>generally</em> capture and add errors to the error list instead of
* throwing a WikiException.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
index 5e7abe9..a325cd3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* IllegalStateException. Callers can place the Workflow into the WAITING
state by calling {@link #waitstate()}.</li>
* <li><strong>{@link #WAITING}</strong>: when the Workflow has temporarily
paused, for example because of a pending Decision. Once the
* responsible actor decides what to do, the caller can change the Workflow
back to the RUNNING state by calling the {@link #restart(Context)}
- * method (this is done automatically by the Decision class, for instance,
when the {@link Decision#decide(Outcome)} method is invoked)</li>
+ * method (this is done automatically by the Decision class, for instance,
when the {@link Decision#decide(Outcome, Context)} method is invoked)</li>
* <li><strong>{@link #COMPLETED}</strong>: after the Workflow has finished
processing all Steps, without errors.</li>
* <li><strong>{@link #ABORTED}</strong>: if a Step has elected to abort the
Workflow.</li>
* </ul>
