[ofbiz-framework] branch release18.12 updated (fc0f4e6 -> e2c8ca6)

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

jleroux pushed a change to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    from fc0f4e6  Fixed: Upgrade Apache PDFBox to 2.0.23 because of CVE-2021-27807 and CVE-2021-27906 (OFBIZ-12205)
     new 49faf1e  Improved: Add a framework method to get main webapp menu with the webapp name (OFBIZ-10601)
     new e2c8ca6  Improved: Update Freemaker to 2.3.31 in R17 and  R18 (OFBIZ-12196)

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:
 build.gradle                                                      | 2 +-
 framework/base/dtd/ofbiz-component.xsd                            | 8 ++++++++
 .../org/apache/ofbiz/base/util/template/FreeMarkerWorker.java     | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

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

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 49faf1e8f7c09c8b77cb3afd7408ca9f8a6255bd
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Mar 22 11:05:01 2021 +0100

    Improved: Add a framework method to get main webapp menu with the webapp name (OFBIZ-10601)
   
    app-shortcut-screen="component://product/widget/catalog/CatalogScreens.xml#ShortcutApp"
    was present in applications/product/ofbiz-component.xml
    but not in ofbiz-component.xsd
---
 framework/base/dtd/ofbiz-component.xsd | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/framework/base/dtd/ofbiz-component.xsd b/framework/base/dtd/ofbiz-component.xsd
index ff409ef..b6f7279 100644
--- a/framework/base/dtd/ofbiz-component.xsd
+++ b/framework/base/dtd/ofbiz-component.xsd
@@ -205,6 +205,14 @@ under the License.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="app-shortcut-screen" use="optional">
+            <xs:annotation>
+                <xs:documentation>
+                    This value determines the location of a screen to use as application main menu shortcut.
+                    This can be used to display sub-menu on application main menu hover.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="position"/>
         <xs:attribute type="xs:string" name="server" use="required"/>
         <xs:attribute type="xs:string" name="location" use="required"/>

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

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit e2c8ca6c4819c8d3fbaba56aef36a39b17838aaf
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Mar 22 11:06:32 2021 +0100

    Improved: Update Freemaker to 2.3.31 in R17 and  R18 (OFBIZ-12196)
   
    That's for (low) security reason. There are no bugs in R17 and R18 but after
    reading about FREEMARKER-124 at
    https://freemarker.apache.org/docs/versions_2_3_30.html
    I believe we should update update Freemaker to 2.3.31 in R17 and R18
---
 build.gradle                                                            | 2 +-
 .../main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 70ac47a..f5366e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -209,7 +209,7 @@ dependencies {
     compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
     compile 'org.codehaus.groovy:groovy-all:2.4.13' // Remember to change the version number in javadoc.options block
-    compile 'org.freemarker:freemarker:2.3.28' // Remember to change the version number in FreeMarkerWorker class when upgrading
+    compile 'org.freemarker:freemarker:2.3.31' // Remember to change the version number in FreeMarkerWorker class when upgrading
     compile 'org.hamcrest:hamcrest-all:1.3'
     compile 'org.owasp.esapi:esapi:2.1.0.1'
     compile 'org.springframework:spring-test:5.1.2.RELEASE'
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
index f377e05..931f8a81 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
@@ -71,7 +71,7 @@ public final class FreeMarkerWorker {
 
     public static final String module = FreeMarkerWorker.class.getName();
 
-    public static final Version version = Configuration.VERSION_2_3_28;
+    public static final Version version = Configuration.VERSION_2_3_31;
 
     private FreeMarkerWorker () {}