Commit Graph
417 Commits
Author SHA1 Message Date
Jacques Le Roux c2c609d8e4 Improved: Dependency verification (OFBIZ-12186)
I just read an ASF members thread about this article:
https://medium.com/@alex.birsan/dependency-confusion-4a5d60fec610

One member mentioned that the Groovy project is using the Gradle's dependency
verification feature[1] in the Apache Groovy build.

I suggest we do the same, even after the move from JCenter to MavenCentral where
things should be safer.

[1] https://docs.gradle.org/current/userguide/dependency_verification.html

This commit includes:
The  verification-metadata.xml and verification-keyring.gpg used by the
verification task
*.gpg as binary in .gitattrubtes for verification-keyring.gpg

The documentation about the verification in sy-dependency-verification.adoc
with a link and some unrelated changes in security.adoc about security for
OFBiz in production
An empty line removed in build.gradle
2021-02-27 13:53:33 +01:00
Jacques Le Roux 44922f0fba Improved: Update Freemarker to 2.3.31 2021-02-18 13:35:53 +01:00
Michael Brohl dbecce6396 Improved: Corrects max number of checkstyle errors allowed (OFBIZ-12169) 2021-02-15 17:48:09 +01:00
Michael Brohl 69c62f5f00 Merge changes for PR #267 due to conflicting changes in trunk (OFBIZ-12169) 2021-02-15 17:15:18 +01:00
Michael Brohl 8ea75c9e2e Fixed: Adds log4j dependencies to avoid classpath conflict while loading
log4j ReflectionUtil (OFBIZ-12171)
2021-02-13 17:08:53 +01:00
Michael Brohl 2b118ce643 Improved: Switch from jCenter to mavenCentral to handle the jCenter
shutdown (OFBIZ-12171)

See comments in build.gradle for details.
2021-02-13 17:08:53 +01:00
Wiebke Pätzold fab0783722 Improved: Used uppercase 'L' as suggested by checkstyle (OFBIZ-12169) 2021-02-10 12:44:44 +01:00
Wiebke Pätzold 39458d2897 Improved: Removed Conditional logic as shown by checkstyle (OFBIZ-12169) 2021-02-10 11:47:53 +01:00
Wiebke Pätzold 780e00866f Improved: Changed line break so line doesnt't start with ( (OFBIZ-12169) 2021-02-10 11:35:03 +01:00
Wiebke Pätzold 3cd7cf1cea Improved: Changed modifier order (OFBIZ-12169) 2021-02-10 11:31:12 +01:00
Wiebke Pätzold 783a987e5a Improved: Multiblock indentations as shown by checkstyle (OFBIZ-12169) 2021-02-10 11:23:53 +01:00
Wiebke Pätzold 51e82c6698 Improved: Removes nested blocks and closed OutputStream in finally
statment (OFBIZ-12169)
2021-02-10 10:18:07 +01:00
Wiebke Pätzold 74f224f88c Improved: Removed trailing spaces (OFBIZ-12169) 2021-02-09 14:16:08 +01:00
Wiebke Pätzold 384572401d Improved: Fixed indentation level (OFBIZ-12169) 2021-02-09 14:12:15 +01:00
Wiebke Pätzold 636c5e393e Improved: max line length is 150 characters (OFBIZ-12169) 2021-02-09 14:10:36 +01:00
Wiebke Pätzold 2e6399c20c Improved: Simplified expression (OFBIZ-12169) 2021-02-09 14:09:55 +01:00
Wiebke Pätzold 8f323d493d Improved: Each variable declaration in an own statement (OFBIZ-12169) 2021-02-09 13:33:15 +01:00
Wiebke Pätzold 03960053a8 Improved: Replaced '.*' import form (OFBIZ-12169) 2021-02-09 11:30:18 +01:00
Wiebke Pätzold 5d52bcf2e1 Improved: Replaced tab character (OFBIZ-12169) 2021-02-09 10:32:26 +01:00
Wiebke Pätzold c1c0813da2 Improved: Removes illegal character as shown by checkstyle (OFBIZ-12169) 2021-02-09 10:19:49 +01:00
Wiebke Pätzold b65be41fc7 Improved: if else construct must use parentheses (OFBIZ-12169) 2021-02-09 09:11:48 +01:00
Wiebke Pätzold 95d37d2189 Removes and adds whitespaces as suggested by checkstyle (OFBIZ-12169) 2021-02-09 08:46:20 +01:00
Michael Brohl badc59034b Improved: Updates the max checkstyle error count according to the latest
changes (OFBIZ-12169)
2021-02-08 17:27:07 +01:00
Wiebke Pätzold 2fe5e15a83 Improved: Adds newline at the end of file (OFBIZ-12169) 2021-02-08 16:31:13 +01:00
Michael Brohl 0dc7e562c9 Improved: Remove unused imports (OFBIZ-12169) 2021-02-05 18:14:51 +01:00
Jacques Le Roux a234f8e201 Improved: fixes a Java doc issue reported by checkstyle
Also removes unused ModelEntity::toXmlElement and ModelEntity::toGroupXmlElement

tasks.checkstyleMain.maxErrors from 278 to 277
2021-02-05 11:26:34 +01:00
Michael Brohl 91594dd259 Implemented: Upgrade Tomcat from 9.0.41 to 9.0.43 (OFBIZ-12165) 2021-02-03 17:22:17 +01:00
Daniel Watford da2ab82b11 Added a SourceSet for groovyScript files specifying the classpath that should be used for compilation.
(OFBIZ-12149)

This helps IDEs navigate to the scripts' dependencies, making it easier
to spot issues during development.

However we don't want gradle to attempt to compile groovyScripts,
therefore the compileGroovyScriptsGroovy task is disabled.
2021-01-24 15:44:11 +00:00
James Yong b679d36b49 Improved: Updated tasks.checkstyleMain.maxErrors to 278 2021-01-21 21:21:54 +08:00
Eugen Stan cc76b990cf Improved: Add extra classpath directories for ofbiz.tar/zip
(OFBIZ-12136)

Allows people to add configuration files and jars (database drivers) when
using the binary distribution.

Thanks: Eugen Stan for improvement
2021-01-15 11:54:43 +00:00
Jacques Le Roux 9acee84312 Improved: decreases tasks.checkstyleMain.maxErrors from 286 to 279
Thanks: Daniel
2021-01-13 22:46:10 +01:00
Jacques Le Roux 1cc035db22 Documented: why not upgrading org.jdom:jdom:1.1.3
Better comment
2020-12-25 15:54:33 +01:00
Jacques Le Roux 12bb7489e3 Documented: why not upgrading org.jdom:jdom:1.1.3 2020-12-20 17:10:07 +01:00
Jacques Le Roux a0d8eb86a0 Fixed: Update build.gradle to the latest dependencies (OFBIZ-12092)
Forget about upgrading org.jdom to v2 we need only JDOMException and it works
as is. So this reverts to  org.jdom to v1. We still need the updated entry in
build.gradle

This fixes integration tests with framework only
2020-12-20 13:52:28 +01:00
Jacques Le Roux 3355c64f4c Fixed: Update build.gradle to the latest dependencies (OFBIZ-12092)
After last changes jdom is missing when using framework only, certainly due to a
3rd party lib change that included it.

This fixes the issue, by not only adding last jdom lib ('org.jdom:jdom:2.0.2')
in build.gradle but also changing the import where used: they changed to jdom2!
2020-12-19 14:54:04 +01:00
Jacques Le Roux 393f80fadd Fixed: Update build.gradle to the latest dependencies (OFBIZ-12092)
Back to 1.4.1 because of w/ 1.7.0 an EntityCrypto exception when loading data
2020-12-18 16:29:52 +01:00
Jacques Le Roux 6c34142b60 Improved: Update build.gradle to the latest dependencies (OFBIZ-12092)
According to BuildBot after last changes jdom is missing, certainly due to a 3rd
party lib change.
I could not reproduce locally, I guess if I had cleared the cache it would.
Anyway here it is.
2020-12-18 14:24:02 +01:00
Jacques Le Roux f016e5da23 Improved: Update build.gradle to the latest dependencies (OFBIZ-12092)
Shiro could be updated to 1.7.0 this time (w/o code changes)
2020-12-17 18:44:29 +01:00
Jacques Le Roux 99a446c7b6 Improved: Gradle logging hygiene (OFBIZ-12085)
Some times ago, we were forced to stop and quickly restart the demos because of
the Gradle daemons logging taking all the place; though we don't use Gradle
daemons in demos. Weird isn't ?

The reason is that by default org.gradle.logging.level=lifecycle is verbose.
Anyway, all org.gradle.logging.level are verbose. I mean they also duplicate
OFBiz information, have a look into your own Gradle daemon dir!

And that even if you don't use daemons, as we do for demos. Because Gradle
always uses at least 1 daemon to run.

So I was looking for a solution to not uselessly clutter the VM disk demos and
stumbled upon <<Gradle logging hygiene - Issue #2688>> - gradle/gradle (github.com)

This uses Evgeny Naumenko's solution at
https://discuss.gradle.org/t/gradle-daemon-produces-a-lot-of-logs/9905

I backport because it's needed by demos
2020-12-11 17:58:54 +01:00
Jacques Le Roux ce6829aa72 Fixed: Secure the uploads (OFBIZ-12080)
org.apache.xmlgraphics:batik:1.13 does not include batik-svg-dom it's in
batik:batik-svg-dom:1.6-1.

It's also in org.eclipse.birt.runtime:viewservlets:4.5.0 that's why it worked
only with plugins
2020-12-02 09:53:23 +01:00
Jacques Le Roux 73fcf30493 Improved: update tasks.checkstyleMain.maxErrors from 280 to 286
Something else than OFBIZ-12080 changed in code and I have no time to check what
2020-12-01 10:26:47 +01:00
Jacques Le Roux e73616caf1 Fixed: Secure the uploads (OFBIZ-12080)
2020/08/10 the OFBiz security team received a security report by Harshit Shukla
<harshit.shukz@gmail.com>, roughly it was (quoting part of it to simplify):

<<I have identified a Remote Code Execution (RCE) Vulnerability. The reason
behind this RCE is lack of file extension check at
catalog/control/UploadCategoryImage?productCategoryId=CATALOG1_BEST_SELL&pload_file_type=category>>

Using this post-auth RCE in OFBiz demos, Harshit was able to get some AWS
credentials by uploading a webshell (based on [0]).
By security, it was then decided by the Infra and OFBiz security teams to shut
down the demos.

After discussing the elements reported with Mark J Cox (VP of ASF security team)
we in common decided that no CVE was necessary.
2020-12-01 10:16:04 +01:00
Jacques Le Roux 0e8802ae6e Updates tasks.checkstyleMain.maxErrors from 503 to 502 2020-11-01 18:35:03 +01:00
holivier 37c075b1f5 Documented: migration to help system using asciidoc files (OFBIZ-11587)
remove in plugin creation gradle task, files related to docbook help
2020-10-26 17:34:04 +01:00
holivier a10d932836 Improved: change asciidoc Image directory convention for plugins (OFBIZ-12035)
* modification in gradle generateOfbizDocumentation task to copy the
image/${components.name} subdirectory in the general
docs/asciidoc/images/ directory before generation
and remove it after.
* correction in generateAllPluginsDocumentation to put copy of OFBiz-Logo in doFirst to avoid it's run during gradle Configure project
2020-10-02 17:03:30 +02:00
holivier f2f43bc8d1 Improved: solve Error messages when generating HTML and PDF file from
AsciiDoc files (OFBIZ-11893)

* Add allow-uri-read when generated html and pdf to be able to allow
image from external uri, it's used for apache2.0 image;
Generalize usage of apache2.0 image for all main documents
* Put Trunk Version in gradle generation parameter and so remove in all
documents (to avoid Version unspecified)
2020-10-01 16:27:56 +02:00
Suraj Khurana 0f08ae5f03 Improved: Updated tasks.checkstyleMain.maxErrors to 503. ~(-42) 2020-09-26 14:21:34 +05:30
Jacques Le Roux ae8b2d89b0 Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)
Removes last remaining "Must have at least one statement" issues by using
Debug.logVerbose

Decreases tasks.checkstyleMain.maxErrors from 543 to 535

Thanks: Suraj for report
2020-09-16 10:30:37 +02:00
Jacques Le Roux 418f7d6242 Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)
Slightly decreases tasks.checkstyleMain.maxErrors from 545 to 543
2020-09-15 15:27:20 +02:00
Suraj Khurana fa57ea157e Improved: Updated tasks.checkstyleMain.maxErrors to 545. ~(-45) 2020-09-13 11:34:42 +05:30