You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2021/06/26 18:52:46 UTC

[tomee] branch master updated (0ca8a96 -> ec25e97)

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

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


    from 0ca8a96  TOMEE-3764 - Regenerate BOMs
     new acd700c  Revert "Dont use EL for the realmName -> go for a constant as it is just for the test (as the comment says)"
     new ec25e97  TOMEE-3765 - Upgrades bountycastle to 1.69

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:
 boms/tomee-microprofile/pom.xml                                         | 2 +-
 boms/tomee-plume/pom.xml                                                | 2 +-
 boms/tomee-plus/pom.xml                                                 | 2 +-
 server/openejb-cxf/pom.xml                                              | 2 +-
 .../java/org/apache/tomee/security/servlet/BasicAuthServletTest.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

[tomee] 01/02: Revert "Dont use EL for the realmName -> go for a constant as it is just for the test (as the comment says)"

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit acd700cc89b719e155eabe9704e2fe91950595be
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Sat Jun 26 20:41:55 2021 +0200

    Revert "Dont use EL for the realmName -> go for a constant as it is just for the test (as the comment says)"
    
    This reverts commit 13b9e924 (does not fix the original test)
---
 .../java/org/apache/tomee/security/servlet/BasicAuthServletTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java
index 71caf50..34520c4 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java
@@ -93,7 +93,7 @@ public class BasicAuthServletTest extends AbstractTomEESecurityTest {
     @WebServlet(urlPatterns = "/basic")
     @ServletSecurity(@HttpConstraint(rolesAllowed = "tomcat"))
     @BasicAuthenticationMechanismDefinition(
-        realmName = "fun EL realm" // constant so we could avoid EL but it's just for the test
+        realmName = "${'fun EL realm'}" // constant so we could avoid EL but it's just for the test
     )
     public static class TestServlet extends HttpServlet {
         @Override

[tomee] 02/02: TOMEE-3765 - Upgrades bountycastle to 1.69

Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit ec25e97bdba28e57f6d55dd9eeb6ae5338c10e9f
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Sat Jun 26 20:52:24 2021 +0200

    TOMEE-3765 - Upgrades bountycastle to 1.69
---
 boms/tomee-microprofile/pom.xml | 2 +-
 boms/tomee-plume/pom.xml        | 2 +-
 boms/tomee-plus/pom.xml         | 2 +-
 server/openejb-cxf/pom.xml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 6b1ab61..a804f2a 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1676,7 +1676,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.67</version>
+      <version>1.69</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index d5d4ac9..49dc8c0 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -1731,7 +1731,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.67</version>
+      <version>1.69</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 6e2c2a4..5ed89bd 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -1797,7 +1797,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.67</version>
+      <version>1.69</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 3ad435d..dfde461 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.67</version>
+      <version>1.69</version>
     </dependency>
     <dependency>
       <groupId>org.apache.wss4j</groupId>