You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/02/16 02:57:08 UTC
[cxf] branch 3.4.x-fixes updated (c7e4f42 -> 3725d33)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from c7e4f42 Recording .gitmergeinfo Changes
new 4081bed CXF-8407: Incorporate changes caused by JEP-396 integration into JDK-16+ (part 3)
new 2b03e6b Update to JUnit 4.13.2
new 3725d33 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 | 1 +
.../org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 12 +++++++++++-
parent/pom.xml | 4 ++--
3 files changed, 14 insertions(+), 3 deletions(-)
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3725d3379c214051b0d073b24b74dafb383d092c
Author: reta <dr...@gmail.com>
AuthorDate: Mon Feb 15 21:56:07 2021 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 908a0e2..a710106 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -48,5 +48,6 @@ M d6a299217dd943a3872da9b0afb7f966ab289cc0
M d88202133e39bebdb966b6ccfed57e1ff9d73638
M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5
M e775237e6dcb16b647d102bcbb3908d3e9fce1de
+M eb4bab9983a287bf9dc0574d22077cc783bc88ac
M efc5d35498f582335821cc6a2b750df935295f14
M fb7821164ec6d7fb98dc3f8caea67465db230a14
[cxf] 02/03: Update to JUnit 4.13.2
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2b03e6b82c90839f447f3531f0a573a08652e13b
Author: reta <dr...@gmail.com>
AuthorDate: Mon Feb 15 21:46:54 2021 -0500
Update to JUnit 4.13.2
(cherry picked from commit eb4bab9983a287bf9dc0574d22077cc783bc88ac)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a3716b..b31404b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
<cxf.json.api.version>1.1.6</cxf.json.api.version>
<cxf.json.bind-api.version>1.0.2</cxf.json.bind-api.version>
<cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
- <cxf.junit.version>4.13.1</cxf.junit.version>
+ <cxf.junit.version>4.13.2</cxf.junit.version>
<cxf.kerby.version>2.0.1</cxf.kerby.version>
<cxf.littleproxy.version>1.1.2</cxf.littleproxy.version>
<cxf.logback.classic.version>1.2.3</cxf.logback.classic.version>
[cxf] 01/03: CXF-8407: Incorporate changes caused by JEP-396
integration into JDK-16+ (part 3)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4081beda24e2ea35462a9a34f116e70fd550873f
Author: reta <dr...@gmail.com>
AuthorDate: Wed Feb 10 21:09:37 2021 -0500
CXF-8407: Incorporate changes caused by JEP-396 integration into JDK-16+ (part 3)
(cherry picked from commit 3f3764b5a08dffc6c58c0a69c20851e06ebc2b01)
---
.../org/apache/cxf/workqueue/AutomaticWorkQueueTest.java | 12 +++++++++++-
parent/pom.xml | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index f40f42c..79060ce 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -20,6 +20,7 @@
package org.apache.cxf.workqueue;
import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
@@ -32,6 +33,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeNoException;
public class AutomaticWorkQueueTest {
@@ -151,11 +153,19 @@ public class AutomaticWorkQueueTest {
}
@Test
public void testEnqueueImmediate() throws InterruptedException {
+ // Check if JDK internals could be accessed, see please:
+ // - https://issues.apache.org/jira/browse/CXF-8407
+ // - https://openjdk.java.net/jeps/396
+ try {
+ ThreadPoolExecutor.class.getDeclaredField("mainLock").setAccessible(true);
+ } catch (final Exception ex) {
+ assumeNoException("The module has no access to JDK internals", ex);
+ }
+
workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
DEFAULT_HIGH_WATER_MARK,
DEFAULT_LOW_WATER_MARK,
DEFAULT_DEQUEUE_TIMEOUT);
-
Thread.sleep(100L);
// We haven't enqueued anything yet, so should there shouldn't be
diff --git a/parent/pom.xml b/parent/pom.xml
index e7e0956..6a3716b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2381,7 +2381,7 @@
</activation>
<properties>
<!-- EasyMock stills uses JDK Internal APIs: see please https://bugs.openjdk.java.net/browse/JDK-8255363 -->
- <cxf.surefire.fork.vmargs>-ea --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</cxf.surefire.fork.vmargs>
+ <cxf.surefire.fork.vmargs>-ea --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</cxf.surefire.fork.vmargs>
</properties>
</profile>
</profiles>