Skip to content

Commit 63b44e8

Browse files
rzo1rzo1
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # pom.xml
2 parents 6594c16 + 0c76ceb commit 63b44e8

File tree

19 files changed

+241
-58
lines changed

19 files changed

+241
-58
lines changed

‎boms/tomee-microprofile/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.fasterxml.jackson.core</groupId>
5050
<artifactId>jackson-annotations</artifactId>
51-
<version>2.19.1</version>
51+
<version>2.19.2</version>
5252
<exclusions>
5353
<exclusion>
5454
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.fasterxml.jackson.core</groupId>
6161
<artifactId>jackson-core</artifactId>
62-
<version>2.19.1</version>
62+
<version>2.19.2</version>
6363
<exclusions>
6464
<exclusion>
6565
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>com.fasterxml.jackson.core</groupId>
7272
<artifactId>jackson-databind</artifactId>
73-
<version>2.19.1</version>
73+
<version>2.19.2</version>
7474
<exclusions>
7575
<exclusion>
7676
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>com.fasterxml.jackson.dataformat</groupId>
8383
<artifactId>jackson-dataformat-yaml</artifactId>
84-
<version>2.19.1</version>
84+
<version>2.19.2</version>
8585
<exclusions>
8686
<exclusion>
8787
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
488488
<dependency>
489489
<groupId>io.smallrye.common</groupId>
490490
<artifactId>smallrye-common-annotation</artifactId>
491-
<version>2.12.0</version>
491+
<version>2.13.7</version>
492492
<exclusions>
493493
<exclusion>
494494
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
499499
<dependency>
500500
<groupId>io.smallrye.common</groupId>
501501
<artifactId>smallrye-common-classloader</artifactId>
502-
<version>2.12.0</version>
502+
<version>2.13.7</version>
503503
<exclusions>
504504
<exclusion>
505505
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
510510
<dependency>
511511
<groupId>io.smallrye.common</groupId>
512512
<artifactId>smallrye-common-constraint</artifactId>
513-
<version>2.12.0</version>
513+
<version>2.13.7</version>
514514
<exclusions>
515515
<exclusion>
516516
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
521521
<dependency>
522522
<groupId>io.smallrye.common</groupId>
523523
<artifactId>smallrye-common-expression</artifactId>
524-
<version>2.12.0</version>
524+
<version>2.13.7</version>
525525
<exclusions>
526526
<exclusion>
527527
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
532532
<dependency>
533533
<groupId>io.smallrye.common</groupId>
534534
<artifactId>smallrye-common-function</artifactId>
535-
<version>2.12.0</version>
535+
<version>2.13.7</version>
536536
<exclusions>
537537
<exclusion>
538538
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
543543
<dependency>
544544
<groupId>io.smallrye.config</groupId>
545545
<artifactId>smallrye-config-common</artifactId>
546-
<version>3.13.2</version>
546+
<version>3.13.3</version>
547547
<exclusions>
548548
<exclusion>
549549
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
554554
<dependency>
555555
<groupId>io.smallrye.config</groupId>
556556
<artifactId>smallrye-config-core</artifactId>
557-
<version>3.13.2</version>
557+
<version>3.13.3</version>
558558
<exclusions>
559559
<exclusion>
560560
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
565565
<dependency>
566566
<groupId>io.smallrye.config</groupId>
567567
<artifactId>smallrye-config</artifactId>
568-
<version>3.13.2</version>
568+
<version>3.13.3</version>
569569
<exclusions>
570570
<exclusion>
571571
<artifactId>*</artifactId>

‎boms/tomee-plume/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.fasterxml.jackson.core</groupId>
5050
<artifactId>jackson-annotations</artifactId>
51-
<version>2.19.1</version>
51+
<version>2.19.2</version>
5252
<exclusions>
5353
<exclusion>
5454
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.fasterxml.jackson.core</groupId>
6161
<artifactId>jackson-core</artifactId>
62-
<version>2.19.1</version>
62+
<version>2.19.2</version>
6363
<exclusions>
6464
<exclusion>
6565
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>com.fasterxml.jackson.core</groupId>
7272
<artifactId>jackson-databind</artifactId>
73-
<version>2.19.1</version>
73+
<version>2.19.2</version>
7474
<exclusions>
7575
<exclusion>
7676
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>com.fasterxml.jackson.dataformat</groupId>
8383
<artifactId>jackson-dataformat-yaml</artifactId>
84-
<version>2.19.1</version>
84+
<version>2.19.2</version>
8585
<exclusions>
8686
<exclusion>
8787
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
488488
<dependency>
489489
<groupId>io.smallrye.common</groupId>
490490
<artifactId>smallrye-common-annotation</artifactId>
491-
<version>2.12.0</version>
491+
<version>2.13.7</version>
492492
<exclusions>
493493
<exclusion>
494494
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
499499
<dependency>
500500
<groupId>io.smallrye.common</groupId>
501501
<artifactId>smallrye-common-classloader</artifactId>
502-
<version>2.12.0</version>
502+
<version>2.13.7</version>
503503
<exclusions>
504504
<exclusion>
505505
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
510510
<dependency>
511511
<groupId>io.smallrye.common</groupId>
512512
<artifactId>smallrye-common-constraint</artifactId>
513-
<version>2.12.0</version>
513+
<version>2.13.7</version>
514514
<exclusions>
515515
<exclusion>
516516
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
521521
<dependency>
522522
<groupId>io.smallrye.common</groupId>
523523
<artifactId>smallrye-common-expression</artifactId>
524-
<version>2.12.0</version>
524+
<version>2.13.7</version>
525525
<exclusions>
526526
<exclusion>
527527
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
532532
<dependency>
533533
<groupId>io.smallrye.common</groupId>
534534
<artifactId>smallrye-common-function</artifactId>
535-
<version>2.12.0</version>
535+
<version>2.13.7</version>
536536
<exclusions>
537537
<exclusion>
538538
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
543543
<dependency>
544544
<groupId>io.smallrye.config</groupId>
545545
<artifactId>smallrye-config-common</artifactId>
546-
<version>3.13.2</version>
546+
<version>3.13.3</version>
547547
<exclusions>
548548
<exclusion>
549549
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
554554
<dependency>
555555
<groupId>io.smallrye.config</groupId>
556556
<artifactId>smallrye-config-core</artifactId>
557-
<version>3.13.2</version>
557+
<version>3.13.3</version>
558558
<exclusions>
559559
<exclusion>
560560
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
565565
<dependency>
566566
<groupId>io.smallrye.config</groupId>
567567
<artifactId>smallrye-config</artifactId>
568-
<version>3.13.2</version>
568+
<version>3.13.3</version>
569569
<exclusions>
570570
<exclusion>
571571
<artifactId>*</artifactId>

‎boms/tomee-plus/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<dependency>
4949
<groupId>com.fasterxml.jackson.core</groupId>
5050
<artifactId>jackson-annotations</artifactId>
51-
<version>2.19.1</version>
51+
<version>2.19.2</version>
5252
<exclusions>
5353
<exclusion>
5454
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>com.fasterxml.jackson.core</groupId>
6161
<artifactId>jackson-core</artifactId>
62-
<version>2.19.1</version>
62+
<version>2.19.2</version>
6363
<exclusions>
6464
<exclusion>
6565
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>com.fasterxml.jackson.core</groupId>
7272
<artifactId>jackson-databind</artifactId>
73-
<version>2.19.1</version>
73+
<version>2.19.2</version>
7474
<exclusions>
7575
<exclusion>
7676
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>com.fasterxml.jackson.dataformat</groupId>
8383
<artifactId>jackson-dataformat-yaml</artifactId>
84-
<version>2.19.1</version>
84+
<version>2.19.2</version>
8585
<exclusions>
8686
<exclusion>
8787
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
488488
<dependency>
489489
<groupId>io.smallrye.common</groupId>
490490
<artifactId>smallrye-common-annotation</artifactId>
491-
<version>2.12.0</version>
491+
<version>2.13.7</version>
492492
<exclusions>
493493
<exclusion>
494494
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
499499
<dependency>
500500
<groupId>io.smallrye.common</groupId>
501501
<artifactId>smallrye-common-classloader</artifactId>
502-
<version>2.12.0</version>
502+
<version>2.13.7</version>
503503
<exclusions>
504504
<exclusion>
505505
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
510510
<dependency>
511511
<groupId>io.smallrye.common</groupId>
512512
<artifactId>smallrye-common-constraint</artifactId>
513-
<version>2.12.0</version>
513+
<version>2.13.7</version>
514514
<exclusions>
515515
<exclusion>
516516
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
521521
<dependency>
522522
<groupId>io.smallrye.common</groupId>
523523
<artifactId>smallrye-common-expression</artifactId>
524-
<version>2.12.0</version>
524+
<version>2.13.7</version>
525525
<exclusions>
526526
<exclusion>
527527
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
532532
<dependency>
533533
<groupId>io.smallrye.common</groupId>
534534
<artifactId>smallrye-common-function</artifactId>
535-
<version>2.12.0</version>
535+
<version>2.13.7</version>
536536
<exclusions>
537537
<exclusion>
538538
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
543543
<dependency>
544544
<groupId>io.smallrye.config</groupId>
545545
<artifactId>smallrye-config-common</artifactId>
546-
<version>3.13.2</version>
546+
<version>3.13.3</version>
547547
<exclusions>
548548
<exclusion>
549549
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
554554
<dependency>
555555
<groupId>io.smallrye.config</groupId>
556556
<artifactId>smallrye-config-core</artifactId>
557-
<version>3.13.2</version>
557+
<version>3.13.3</version>
558558
<exclusions>
559559
<exclusion>
560560
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
565565
<dependency>
566566
<groupId>io.smallrye.config</groupId>
567567
<artifactId>smallrye-config</artifactId>
568-
<version>3.13.2</version>
568+
<version>3.13.3</version>
569569
<exclusions>
570570
<exclusion>
571571
<artifactId>*</artifactId>

‎container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedExecutorServiceImplFactory.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
*/
1717
package org.apache.openejb.resource.thread;
1818

19-
import jakarta.enterprise.concurrent.ManagedExecutorService;
2019
import jakarta.enterprise.concurrent.ManagedThreadFactory;
2120
import org.apache.openejb.loader.SystemInstance;
2221
import org.apache.openejb.spi.ContainerSystem;
22+
import org.apache.openejb.threads.impl.ContextServiceImpl;
2323
import org.apache.openejb.threads.impl.ContextServiceImplFactory;
2424
import org.apache.openejb.threads.impl.ManagedExecutorServiceImpl;
2525
import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
@@ -35,6 +35,7 @@
3535
import java.util.concurrent.BlockingQueue;
3636
import java.util.concurrent.ExecutorService;
3737
import java.util.concurrent.LinkedBlockingQueue;
38+
import java.util.concurrent.SynchronousQueue;
3839
import java.util.concurrent.ThreadPoolExecutor;
3940

4041
public class ManagedExecutorServiceImplFactory {
@@ -72,10 +73,16 @@ public ManagedExecutorServiceImpl create() {
7273
return new ManagedExecutorServiceImpl(createExecutorService(), ContextServiceImplFactory.lookupOrDefault(context));
7374
}
7475

76+
public ManagedExecutorServiceImpl create(final ContextServiceImpl contextService) {
77+
return new ManagedExecutorServiceImpl(createExecutorService(), contextService);
78+
}
79+
7580
private ExecutorService createExecutorService() {
7681
final BlockingQueue<Runnable> blockingQueue;
77-
if (queue <= 0) {
82+
if (queue < 0) {
7883
blockingQueue = new LinkedBlockingQueue<>();
84+
} else if (queue == 0) {
85+
blockingQueue = new SynchronousQueue<>();
7986
} else {
8087
blockingQueue = new ArrayBlockingQueue<>(queue);
8188
}

0 commit comments

Comments
 (0)