You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/01/17 15:01:12 UTC

(commons-bsf) branch master updated (354cc0a -> bbf5712)

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bsf.git


    from 354cc0a  Merge pull request #204 from apache/dependabot/github_actions/github/codeql-action-3.28.1
     new 744819b  Fix Javadoc errors on Java 17
     new bbf5712  Add security page and use common menu items

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:
 .../org/apache/bsf/engines/jexl/JEXLEngine.java    |  2 +-
 .../java/org/apache/bsf/util/BSFFunctions.java     |  2 +-
 src/main/java/org/apache/bsf/util/EngineUtils.java |  1 +
 src/main/java/org/apache/bsf/util/cf/CFDriver.java | 12 ++--
 src/site/site.xml                                  | 72 ++++++++++++----------
 src/site/xdoc/security.xml                         | 51 +++++++++++++++
 6 files changed, 102 insertions(+), 38 deletions(-)
 create mode 100644 src/site/xdoc/security.xml


(commons-bsf) 02/02: Add security page and use common menu items

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bsf.git

commit bbf5712a898b7023f5559a396b2f6226d9aca7a0
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Fri Jan 17 10:01:06 2025 -0500

    Add security page and use common menu items
---
 src/site/site.xml          | 72 +++++++++++++++++++++++++---------------------
 src/site/xdoc/security.xml | 51 ++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 32 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 0ae6d02..50bd460 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,44 +1,52 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    * 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.    
--->
-<project name="Apache Commons BSF&amp;trade;">
-
-    <bannerRight>
-        <name>Commons BSF</name>
-        <src>/images/bsf_logo.jpg</src>
-        <href>/index.html</href>
-    </bannerRight>
+  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
 
-  <publishDate format="dd MMM yyyy" />
+    https://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.
+-->
+<site xmlns="http://maven.apache.org/SITE/2.0.0" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
+  name="Apache Commons BCEL">
+  <bannerRight name="Commons BCEL" href="/index.html">
+    <image src="/images/logo.png"/>
+  </bannerRight>
   <body>
-
-    <menu name="BSF">
-      <item name="About" href="index.html"/>
+    <menu name="Commons BCEL">
+      <!-- Start: For all components. -->
+      <item name="About" href="index.html" />
+      <item name="Asking Questions" href="/mail-lists.html" />
+      <item name="Release History" href="/changes.html" />
+      <item name="Issue Tracking" href="/issue-management.html" />
+      <item name="Dependency Management" href="/dependency-info.html" />
+      <item name="Javadoc" href="apidocs/index.html" />
+      <item name="Javadoc Archive" href="https://javadoc.io/doc/org.apache.bcel/bcel/" />
+      <item name="Sources" href="/scm.html" />
+      <item name="Security" href="security.html" />
+      <item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
+      <item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
+      <item name="Download" href="https://commons.apache.org/proper/commons-bcel/download_bcel.cgi" />
+      <!-- End: For all components. -->
+      <!-- Specific to this component: -->
       <item name="News" href="bsfnews.html"/>
-      <item name="Download" href="download_bsf.cgi"/>
-      <item name="Documentation" href="manual.html"/>
+      <item name="Manual" href="manual.html"/>
       <item name="FAQ" href="faq.html"/>
       <item name="Related projects" href="projects.html"/>
       <item name="Resources" href="resources.html"/>
       <item name="Having a problem?" href="problems.html"/>
     </menu>
-
   </body>
-</project>
+</site>
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
new file mode 100644
index 0000000..34b02c7
--- /dev/null
+++ b/src/site/xdoc/security.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+ 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
+
+   https://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.
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>Apache Commons Security Reports</title>
+    <author email="dev@commons.apache.org">Apache Commons Team</author>
+  </properties>
+  <body>
+    <section name="About Security">
+      <p>
+        For information about reporting or asking questions about security, please see
+        <a href="https://commons.apache.org/security.html">Apache Commons Security</a>.
+      </p>
+      <p>This page lists all security vulnerabilities fixed in released versions of this component. 
+      </p>
+      <p>Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the component version
+        that you are using. 
+      </p>
+      <p>
+        If you need help on building this component or other help on following the instructions to mitigate the known vulnerabilities listed here, please send
+        your questions to the public
+        <a href="mail-lists.html">user mailing list</a>.
+      </p>
+      <p>If you have encountered an unlisted security vulnerability or other unexpected behavior that has security impact, or if the descriptions here are
+        incomplete, please report them privately to the Apache Security Team. Thank you. 
+      </p>
+    </section>
+    <section name="Security Vulnerabilities">
+      <p>None.</p>
+    </section>
+  </body>
+</document>
\ No newline at end of file


(commons-bsf) 01/02: Fix Javadoc errors on Java 17

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bsf.git

commit 744819b9641df5e50b0d5a281c342afdd4498ec6
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Fri Jan 17 10:00:43 2025 -0500

    Fix Javadoc errors on Java 17
---
 src/main/java/org/apache/bsf/engines/jexl/JEXLEngine.java |  2 +-
 src/main/java/org/apache/bsf/util/BSFFunctions.java       |  2 +-
 src/main/java/org/apache/bsf/util/EngineUtils.java        |  1 +
 src/main/java/org/apache/bsf/util/cf/CFDriver.java        | 12 ++++++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/bsf/engines/jexl/JEXLEngine.java b/src/main/java/org/apache/bsf/engines/jexl/JEXLEngine.java
index e5dff77..c9671db 100644
--- a/src/main/java/org/apache/bsf/engines/jexl/JEXLEngine.java
+++ b/src/main/java/org/apache/bsf/engines/jexl/JEXLEngine.java
@@ -22,10 +22,10 @@ import java.net.URL;
 import java.util.Vector;
 
 import org.apache.bsf.BSFDeclaredBean;
+import org.apache.bsf.BSFEngine;
 import org.apache.bsf.BSFException;
 import org.apache.bsf.BSFManager;
 import org.apache.bsf.util.BSFEngineImpl;
-
 import org.apache.commons.jexl.JexlContext;
 import org.apache.commons.jexl.JexlHelper;
 import org.apache.commons.jexl.Script;
diff --git a/src/main/java/org/apache/bsf/util/BSFFunctions.java b/src/main/java/org/apache/bsf/util/BSFFunctions.java
index 035e85a..5734f94 100644
--- a/src/main/java/org/apache/bsf/util/BSFFunctions.java
+++ b/src/main/java/org/apache/bsf/util/BSFFunctions.java
@@ -23,7 +23,7 @@ import org.apache.bsf.BSFManager;
 
 /**
  * This is a utility that engine implementors may use as the Java object they expose in the scripting language as "bsf". This has essentially a subset of the
- * methods in BSFManager plus some stuff from the utils. Currently used by Javascript (Rhino) & BML.
+ * methods in BSFManager plus some stuff from the utils. Currently used by Javascript (Rhino) and BML.
  */
 public class BSFFunctions {
     BSFManager mgr;
diff --git a/src/main/java/org/apache/bsf/util/EngineUtils.java b/src/main/java/org/apache/bsf/util/EngineUtils.java
index c0bdf38..be961a9 100644
--- a/src/main/java/org/apache/bsf/util/EngineUtils.java
+++ b/src/main/java/org/apache/bsf/util/EngineUtils.java
@@ -304,6 +304,7 @@ public class EngineUtils {
      * <li>settable class loader stored with BSFManager,
      * <li>BSFManager's defining class loader,
      * <li>BSF customized class loader (from the BSFManager's temporary directory).
+     * </ul>
      *
      * @param mgr  BSFManager who's classLoader and tempDir props are consulted
      * @param name name of the class to load
diff --git a/src/main/java/org/apache/bsf/util/cf/CFDriver.java b/src/main/java/org/apache/bsf/util/cf/CFDriver.java
index 463af0e..32673c6 100644
--- a/src/main/java/org/apache/bsf/util/cf/CFDriver.java
+++ b/src/main/java/org/apache/bsf/util/cf/CFDriver.java
@@ -46,18 +46,22 @@ public class CFDriver {
     /**
      * A driver for <code>CodeFormatter</code>.
      * <p>
-     * Usage: <code><pre>
+     * Usage:
+     * </p> 
+     * <pre>
      *  java org.apache.cf.CFDriver [args]
-     *<p>
+     *  </pre>
+     * <p>
      *    args:
-     *<p>
+     * </p>
+     * <pre>
      *      [-in      fileName]   default: &lt;STDIN&gt;
      *      [-out     fileName]   default: &lt;STDOUT&gt;
      *      [-maxLine   length]   default: 74
      *      [-step        size]   default: 2
      *      [-delim      group]   default: (+
      *      [-sdelim     group]   default: ,
-     *</pre></code>
+     * </pre>
      */
     public static void main(final String[] argv) {
         if (argv.length % 2 == 0) {