Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream pull 2024 02 #1468

Closed
wants to merge 58 commits into from

Conversation

renat-nosto
Copy link

Pull Request Checklist

Helpful things

Fixes

Fixes #xxxx

Purpose

What does this PR do?

Background Context

Why did you take this approach?

References

Are there any relevant issues / PRs / mailing lists discussions?

renat-nosto and others added 30 commits February 7, 2019 20:32
* remove depedndency from playframework, so it is picked up from playcart
…top_play_master

# Conflicts:
#	framework/src/play/server/PlayHandler.java
HEALTH-198 Escape the localized message parameter values
HEALTH-198 Fix to the previous fix
…that are not compatible with the fork changes
…ison

Bugfix/fix 304 last modified comparison
Add support for adding weak prefix to etags
Update log4j version to 2.16.0
mridang and others added 27 commits December 16, 2021 13:45
Support for running tests without FirePhoque and Netty
-Subproject tests require all class enhancers to be active, so created a switch to enable them back for tests
-Added bunch of play restarts to developer tests because this fork does not support class reloading as well as the original
-Fixed logging configuration code to not throw exceptions and silence all logging by default
-Removed 2 selenium tests that didn't pass in autotest mode even in the upstream project, they passed when running them through chrome so seems like some environment issue
Enabled test suite to run successfully with 'ant test'
Update libraries based on security reports
# Conflicts:
#	framework/dependencies.yml
#	framework/lib/oval-1.90.jar
#	framework/lib/slf4j-api-1.7.24.jar
#	framework/pym/play/commands/base.py
#	framework/src/play/Logger.java
#	framework/src/play/data/validation/ValidationPlugin.java
#	framework/src/play/db/jpa/JPAPlugin.java
#	framework/src/play/server/PlayHandler.java
#	framework/src/play/templates/GroovyTemplate.java
#	framework/src/play/test/FunctionalTest.java
#	framework/test-src/play/LoggerTest.java
#	samples-and-tests/i-am-a-developer/tests.py
#	samples-and-tests/just-test-cases/test/errors.test.html
#	samples-and-tests/just-test-cases/test/routing.test.html
# Conflicts:
#	framework/dependencies.yml
#	framework/src/play/server/HttpServerPipelineFactory.java
#	framework/src/play/templates/GroovyTemplate.java
#	framework/src/play/test/TestEngine.java
#	framework/test-src/play/test/PlayJUnitRunnerTest.java
#	modules/testrunner/src/play/modules/testrunner/FirePhoque.java
…or_play.classloading.ApplicationClassloader#assignableClassesByName

use ConcurrentHashMap for play.classloading.ApplicationClassloader#as…
…junit.py

report java crash from junit.py
…foreClass

Fix xmlReportListener for beforeClass annotations
# Conflicts:
#	framework/dependencies.yml
#	framework/lib/mysql-connector-j-8.1.0.jar
#	framework/src/play/classloading/ApplicationClassloader.java
#	framework/src/play/test/PlayJUnitRunner.java
# Conflicts:
#	samples-and-tests/i-am-a-developer/tests.py
@renat-nosto renat-nosto deleted the upstream-pull-2024-02 branch February 27, 2024 09:42
@renat-nosto renat-nosto restored the upstream-pull-2024-02 branch February 27, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants