You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2026/08/04 10:14:25 UTC
(johnzon) branch master updated: OWB-437 upgrade to owb-4.1.1 and simplify test setup
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new d08f8cdf OWB-437 upgrade to owb-4.1.1 and simplify test setup
d08f8cdf is described below
commit d08f8cdfa71a5b519eaaab4d37c4fb7ce1f5927f
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Aug 4 12:14:00 2026 +0200
OWB-437 upgrade to owb-4.1.1 and simplify test setup
---
johnzon-jsonb/pom.xml | 2 +-
.../org/apache/johnzon/jsonb/CdiAdapterTest.java | 24 +++++++++-------------
johnzon-osgi/pom.xml | 2 +-
pom.xml | 2 +-
4 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml
index 468d51e9..923242b6 100644
--- a/johnzon-jsonb/pom.xml
+++ b/johnzon-jsonb/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>4.0.1</version>
+ <version>4.1.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
index cc733a15..5dc59aab 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/CdiAdapterTest.java
@@ -22,7 +22,6 @@ import org.apache.johnzon.jsonb.cdi.JohnzonCdiExtension;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.corespi.DefaultSingletonService;
-import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
import org.apache.webbeans.corespi.se.DefaultScannerService;
import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
import org.apache.webbeans.proxy.OwbNormalScopeProxy;
@@ -46,15 +45,15 @@ import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.adapter.JsonbAdapter;
import jakarta.json.bind.annotation.JsonbTypeAdapter;
import java.lang.annotation.Annotation;
-import java.net.MalformedURLException;
-import java.net.URI;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
-import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.junit.Assert.assertEquals;
@@ -68,18 +67,15 @@ public class CdiAdapterTest {
final Map<Class<?>, Object> services = new HashMap<>();
services.put(ScannerService.class, new DefaultScannerService() {
@Override
- protected void configure() {
- initFinder();
+ public Map<BeanArchiveService.BeanArchiveInformation, Set<Class<?>>> getBeanClassesPerBda() {
+ final Map<BeanArchiveService.BeanArchiveInformation, Set<Class<?>>> beanClassesPerBda = super.getBeanClassesPerBda();
+
final DefaultBeanArchiveInformation information = new DefaultBeanArchiveInformation("file://foo");
information.setBeanDiscoveryMode(BeanArchiveService.BeanDiscoveryMode.ALL);
- try {
- archive.classesByUrl().put(information.getBdaUrl(), new CdiArchive.FoundClasses(
- URI.create(information.getBdaUrl()).toURL(), asList(
- Service.class.getName(), ModelAdapter.class.getName()),
- information));
- } catch (final MalformedURLException e) {
- throw new IllegalStateException(e);
- }
+
+ beanClassesPerBda.put(information, new HashSet<>(Arrays.asList(Service.class, ModelAdapter.class)));
+
+ return beanClassesPerBda;
}
});
services.put(ResourceInjectionService.class, new ResourceInjectionService() {
diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml
index f99b4c45..439d6bd6 100644
--- a/johnzon-osgi/pom.xml
+++ b/johnzon-osgi/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>4.0.1</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
diff --git a/pom.xml b/pom.xml
index c9576c61..59ea04de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<!-- JVM values for surefire plugin -->
<surefire.jvm.params>-Xms1024m -Xmx2048m -Dfile.encoding=UTF-8</surefire.jvm.params>
<junit.version>5.14.4</junit.version>
- <owb.version>4.0.0</owb.version>
+ <owb.version>4.1.1</owb.version>
<arquillian.jvm.args />
</properties>