You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/09/30 10:55:55 UTC
[cxf] branch 3.5.x-fixes updated (51a69df3c6 -> d39f491f43)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 51a69df3c6 Recording .gitmergeinfo Changes
new 47cada2a6a cxf-rt-rs-security-oauth2: enable JCacheCodeDataProviderTest
new 2963365c4b Updating plexus utils to 3.3.1
new d39f491f43 Recording .gitmergeinfo Changes
The 3 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:
.gitmergeinfo | 3 +++
parent/pom.xml | 2 +-
.../rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java | 4 +---
3 files changed, 5 insertions(+), 4 deletions(-)
[cxf] 02/03: Updating plexus utils to 3.3.1
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2963365c4bb9f347cfdcedc91bd4659ef08b7d33
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Sep 30 10:38:34 2022 +0100
Updating plexus utils to 3.3.1
(cherry picked from commit b411e600a3c11b786cf6c489e2d0a3ee94528553)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5791cef780..9e7ee96733 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,7 +186,7 @@
<cxf.openwebbeans.version>2.0.26</cxf.openwebbeans.version>
<cxf.persistence-api.version>2.2.3</cxf.persistence-api.version>
<cxf.plexus-archiver.version>4.2.0</cxf.plexus-archiver.version>
- <cxf.plexus-utils.version>3.3.0</cxf.plexus-utils.version>
+ <cxf.plexus-utils.version>3.3.1</cxf.plexus-utils.version>
<cxf.reactivestreams.version>1.0.3</cxf.reactivestreams.version>
<cxf.reactor.version>3.4.23</cxf.reactor.version>
<cxf.rhino.version>1.7.13</cxf.rhino.version>
[cxf] 01/03: cxf-rt-rs-security-oauth2: enable JCacheCodeDataProviderTest
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 47cada2a6a4a1a5e2512d11637ad385e83dcf842
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue Apr 12 12:20:18 2022 +0300
cxf-rt-rs-security-oauth2: enable JCacheCodeDataProviderTest
(cherry picked from commit 30dd21512ddf0af616771b88db8615e1aa5b7ab6)
---
.../rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
index c573ea7b69..9921d78830 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/code/JCacheCodeDataProviderTest.java
@@ -26,7 +26,6 @@ import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -40,7 +39,6 @@ public class JCacheCodeDataProviderTest {
provider = new JCacheCodeDataProvider();
}
- @Ignore
@Test
public void testAddGetDeleteCodeGrants() {
Client c = addClient("111", "bob");
@@ -70,7 +68,6 @@ public class JCacheCodeDataProviderTest {
assertEquals(0, grants.size());
}
- @Ignore
@Test
public void testAddGetDeleteCodeGrants2() {
Client c = addClient("111", "bob");
@@ -99,6 +96,7 @@ public class JCacheCodeDataProviderTest {
provider.setClient(c);
return c;
}
+
@After
public void tearDown() throws Exception {
if (provider != null) {
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d39f491f43e549ce5c50c40d1008d0736fa472a7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Sep 30 10:50:02 2022 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f7f3ab423b..c659ff2fa6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,7 @@
origin/3.6.x-fixes
B 00bbab65e59b8f27366335aec19e50129b7759f0
+B 0fd59b2a26240e290fdc646decc4c5c467875f62
B 12a68910220a3af6fe2d0419a3556320b75c3523
B 14fde35cbb22f301217be8e1b56ef405eab70682
B 210cd832ef91c2f95569859b45b59c846d54ff97
@@ -28,10 +29,12 @@ B 7fd567e59b860dc59fcd221b8fb4aeeea95a3ef0
B 8252a18d68b994129a6adbcfe1330f67020eb4f0
B 8311c0ea9783697307e616bd4c3f669e8396eab3
B 83909463eb6b905b983208a6b084a97f2e91ab0f
+B 84b398442fa4e576423a8dce2a47ae766ca975d4
B 85b9b53c632feb023b522afd49192e95ab232a15
B 86c4b4960df71674490b3bc84fb3ffd72ba5bea5
B 8c3e3a003702fb9547519c0768806a7ce478dfa0
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
+B 9313c2a54131b44e8f9c4332671e881bfc35a01e
B 9723e32190d3a820e0eecf19177561155399c867
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
B ad496ed008ae0b0d2636bc307559749fc28287c1