You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@deltaspike.apache.org by ta...@apache.org on 2024/01/22 09:00:25 UTC

(deltaspike) branch master updated (e68e001bd -> 6d9364adf)

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

tandraschko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


    from e68e001bd Merge pull request #141 from shadogray/master
     add eabc8eb22 NPE in WeldContainerControl on missing default test-container config
     add 718c0ebe0 Merge branch 'apache:master' into master
     new 6d9364adf Merge pull request #142 from shadogray/master

The 1 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:
 .../java/org/apache/deltaspike/cdise/weld/WeldContainerControl.java  | 5 +++++
 .../org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java   | 4 +++-
 .../resources/META-INF/apache-deltaspike_test-container.properties}  | 2 --
 3 files changed, 8 insertions(+), 3 deletions(-)
 copy deltaspike/modules/test-control/impl/src/{test/resources/META-INF/test/dsTestContainerBootConfig.properties => main/resources/META-INF/apache-deltaspike_test-container.properties} (93%)

(deltaspike) 01/01: Merge pull request #142 from shadogray/master

Posted by ta...@apache.org.

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

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git

commit 6d9364adf3c8d22b28af1a4213aca6af8dd8defa
Merge: e68e001bd 718c0ebe0
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Jan 22 10:00:19 2024 +0100

    Merge pull request #142 from shadogray/master
    
    NPE in WeldContainerControl on missing default test-container config

 .../cdise/weld/WeldContainerControl.java           |  5 +++++
 .../testcontrol/api/junit/CdiTestRunner.java       |  4 +++-
 .../apache-deltaspike_test-container.properties    | 24 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)