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.

Sign up for GitHub

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

Jump to bottom

Upstream pull 2024 02 #1468

Closed
wants to merge 58 commits into from
Closed

Upstream pull 2024 02 #1468

wants to merge 58 commits into from

Commits on Feb 7, 2019

  1. put nosto changes on top play master

    @renat-nosto
    renat-nosto committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    55c3292 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. * remove double content on chunk responses in test 

    * remove depedndency from playframework, so it is picked up from playcart
    @renat-nosto
    renat-nosto committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    ef89ac9 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2019

  1. Merge remote-tracking branch 'play/master' into put_nosto_changes_on_… 

    …top_play_master

# Conflicts:
#	framework/src/play/server/PlayHandler.java
    @renat-nosto
    renat-nosto committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    a487d64 View commit details
    Browse the repository at this point in the history

  2. sync branch

    @renat-nosto
    renat-nosto committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    231073b View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. Merge pull request #32 from Nosto/put_nosto_changes_on_top_play_master 

    put nosto changes on top play master
    @renat-nosto
    renat-nosto authored Aug 21, 2019
    Configuration menu
    Copy the full SHA
    19623d0 View commit details
    Browse the repository at this point in the history

  2. Escape the localized message parameter values

    @sergey-moshnikov
    sergey-moshnikov committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    dfb1738 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #33 from Nosto/HEALTH-198-localized-messages-xss 

    HEALTH-198 Escape the localized message parameter values
    @sergey-moshnikov
    sergey-moshnikov authored Aug 21, 2019
    Configuration menu
    Copy the full SHA
    7862050 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2019

  1. We only apply __safeFaster() to String arguments in __getMessage()

    @sergey-moshnikov
    sergey-moshnikov committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    68c88f6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #34 from Nosto/HEALTH-198-fix-the-fix 

    HEALTH-198 Fix to the previous fix
    @sergey-moshnikov
    sergey-moshnikov authored Aug 22, 2019
    Configuration menu
    Copy the full SHA
    c3dd3df View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Initial commit for support SameSite cookie encoding (#36)

    @mridang
    mridang authored Feb 11, 2020
    Configuration menu
    Copy the full SHA
    0ecc779 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Fix 'ant unittest' by adding missing dependencies and removing tests … 

    …that are not compatible with the fork changes
    @anttip
    anttip committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    3f196ac View commit details
    Browse the repository at this point in the history

  2. Fix bug with untruncated milliseconds from File.lastModified preventi… 

    …ng 304 response ever happening
    @anttip
    anttip committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    4f548bb View commit details
    Browse the repository at this point in the history

  3. Added test for the formatter to verify truncation happens in headers

    @anttip
    anttip committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    13f0030 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge pull request #37 from Nosto/bugfix/fix-304-last-modified-compar… 

    …ison

Bugfix/fix 304 last modified comparison
    @anttip
    anttip authored Apr 3, 2020
    Configuration menu
    Copy the full SHA
    f3b74a3 View commit details
    Browse the repository at this point in the history

  2. Add support for adding weak prefix to etags

    @anttip
    anttip committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    6e488dc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #38 from Nosto/improvement/support-weak-etag 

    Add support for adding weak prefix to etags
    @anttip
    anttip authored Apr 3, 2020
    Configuration menu
    Copy the full SHA
    8cc27df View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. ADS-2883 Upgrade to Oval 3.0 (#39)

    @gary-nosto
    gary-nosto authored Dec 29, 2020
    Configuration menu
    Copy the full SHA
    7811070 View commit details
    Browse the repository at this point in the history

  2. ADS-2883 Enable default profile in validation plugin (#40)

    @gary-nosto
    gary-nosto authored Dec 29, 2020
    Configuration menu
    Copy the full SHA
    1586162 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2020

  1. Initial commit for a standlone Junit runner

    Mridang Agarwalla committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    24a169d View commit details
    Browse the repository at this point in the history

  2. Added XMLoutputter

    Mridang Agarwalla committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    32bfa00 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2021

  1. Fixed the Junit command

    Mridang Agarwalla committed Jan 2, 2021
    Configuration menu
    Copy the full SHA
    e77edde View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2021

  1. Added support for test filtering via a plugin

    Mridang Agarwalla committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    60dae9b View commit details
    Browse the repository at this point in the history

  2. Reset changes to the autotest runner

    Mridang Agarwalla committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    903e1c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. ADS-2832 Upgrade to Oval 3.1.0 (#42)

    @gary-nosto
    gary-nosto authored Jan 4, 2021
    Configuration menu
    Copy the full SHA
    7c2ba1e View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. Fixed the NPE when looking up the next test class

    Mridang Agarwalla committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    38214d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into nosto/standalone-junit-runner

    Mridang Agarwalla committed Jan 8, 2021
    Configuration menu
    Copy the full SHA
    36c09ae View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2021

  1. Fixed the testnames in the XML output

    Mridang Agarwalla committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    f2f862b View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Added the log4j-web module and tore down the logger

    Mridang Agarwalla committed Jan 27, 2021
    Configuration menu
    Copy the full SHA
    1ae7a09 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Update log4j to version 2.16.0

    @anttip
    anttip committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    18daaa6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from Nosto/fix/update-log4j 

    Update log4j version to 2.16.0
    @anttip
    anttip authored Dec 15, 2021
    Configuration menu
    Copy the full SHA
    780ab9a View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Merge branch 'master' into nosto/standalone-junit-runner

    @mridang
    mridang authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    89630b1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41 from Nosto/nosto/standalone-junit-runner 

    Support for running tests without FirePhoque and Netty
    @mridang
    mridang authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    2b37034 View commit details
    Browse the repository at this point in the history

  3. Updated the missing log4j-web dependency

    Mridang Agarwalla committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    6583ab2 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2021

  1. Update to log4j 2.17.0

    @anttip
    anttip committed Dec 23, 2021
    Configuration menu
    Copy the full SHA
    5430edb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #44 from Nosto/fix/update-log4j-2.17.0 

    Update to log4j 2.17.0
    @anttip
    anttip authored Dec 23, 2021
    Configuration menu
    Copy the full SHA
    cf2adc5 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2021

  1. Enabled test suite to run successfully with 'ant test' 

    -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
    @anttip
    anttip committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    6a67a37 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #45 from Nosto/fix/enable-test-suite 

    Enabled test suite to run successfully with 'ant test'
    @anttip
    anttip authored Dec 28, 2021
    Configuration menu
    Copy the full SHA
    719e757 View commit details
    Browse the repository at this point in the history

  3. Update libraries based on security reports

    @anttip
    anttip committed Dec 28, 2021
    Configuration menu
    Copy the full SHA
    599e4fd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #46 from Nosto/fix/update-libraries 

    Update libraries based on security reports
    @anttip
    anttip authored Dec 28, 2021
    Configuration menu
    Copy the full SHA
    170a4de View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Merge remote-tracking branch 'play/master' into play1.7_update-take2 

    # 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
    @renat-nosto
    renat-nosto committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    a06fd5a View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. fix tests

    @renat-nosto
    renat-nosto committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    25da223 View commit details
    Browse the repository at this point in the history

  2. Reset changes to the JPAPlugin

    Mridang Agarwalla committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    d7e83ab View commit details
    Browse the repository at this point in the history

  3. Merge pull request #50 from Nosto/play1.7_update-take2 

    Play1.7 update
    @renat-nosto
    renat-nosto authored Apr 11, 2022
    Configuration menu
    Copy the full SHA
    8463acc View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. add bcutil dependency

    @renat-nosto
    renat-nosto committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    ace1920 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #52 from Nosto/fix_bcutils 

    add bcutil dependency
    @renat-nosto
    renat-nosto authored Apr 14, 2022
    Configuration menu
    Copy the full SHA
    f06b73a View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Merge remote-tracking branch 'play/master' into play_1.7.1 

    # 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
    @renat-nosto
    renat-nosto committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    400e648 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Merge pull request #54 from Nosto/play_1.7.1 

    Play 1.7.1
    @renat-nosto
    renat-nosto authored Oct 18, 2022
    Configuration menu
    Copy the full SHA
    fd4cff0 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. report java crash from junit.py

    @renat-nosto
    renat-nosto committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    0b89b7e View commit details
    Browse the repository at this point in the history

  2. use ConcurrentHashMap for play.classloading.ApplicationClassloader#as… 

    …signableClassesByName
    @renat-nosto
    renat-nosto committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    aa215a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. Merge pull request #57 from Nosto/improvement/use_ConcurrentHashMap_f… 

    …or_play.classloading.ApplicationClassloader#assignableClassesByName

use ConcurrentHashMap for play.classloading.ApplicationClassloader#as…
    @renat-nosto
    renat-nosto authored Nov 4, 2022
    Configuration menu
    Copy the full SHA
    20e7d2e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. Merge pull request #56 from Nosto/improvement/report_java_crash_from_… 

    …junit.py

report java crash from junit.py
    @renat-nosto
    renat-nosto authored Nov 7, 2022
    Configuration menu
    Copy the full SHA
    28a1b71 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. HEALTH-762 remove mysql from play (#59)

    @renat-nosto
    renat-nosto authored Feb 16, 2023
    Configuration menu
    Copy the full SHA
    42dda25 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Fix xmlReportListener for beforeClass annotations

    @anttip
    anttip committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    0905ca3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #61 from Nosto/bugfix/fix-junit-xmllistener-for-be… 

    …foreClass

Fix xmlReportListener for beforeClass annotations
    @anttip
    anttip authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    dd1a604 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Merge remote-tracking branch 'play/master' into upstream-pull-2024-02 

    # 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
    @renat-nosto
    renat-nosto committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    35c3a08 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. post-merge cleanup

    @renat-nosto
    renat-nosto committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    cd2b066 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'play/master' into upstream-pull-2024-02 

    # Conflicts:
#	samples-and-tests/i-am-a-developer/tests.py
    @renat-nosto
    renat-nosto committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    152a502 View commit details
    Browse the repository at this point in the history

  3. fix tests.py

    @renat-nosto
    renat-nosto committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    4c679fe View commit details
    Browse the repository at this point in the history