diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 9a78b373..b8c0f2d9 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -33,6 +33,42 @@ ${project.parent.reporting.outputDirectory} + + + + org.junit.vintage + junit-vintage-engine + test + + + + jakarta.json + jakarta.json-tck-tests + 2.1.1 + test + + + jakarta.json + jakarta.json-tck-tests-pluggability + 2.1.1 + test + + + + org.netbeans.tools + sigtest-maven-plugin + 1.7 + test + + + + org.netbeans.tools + ct-sym + + + + + @@ -46,31 +82,86 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + + + + copy + generate-test-resources + + copy + + + + + + jakarta.json + jakarta.json-api + ${jakarta-jsonp-api.version} + jar + true + ${project.build.directory}/signaturedirectory + jakarta.json-api.jar + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + + + tck-test + + + test + + + + jakarta.json:jakarta.json-tck-tests + + + + **/org/apache/johnzon/** + + + + ${project.build.directory}/jimage + ${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming + + + + + + tck-test-pluggability + + + test + + + + jakarta.json:jakarta.json-tck-tests-pluggability + + + + **/org/apache/johnzon/** + + + + ${project.build.outputDirectory}/nowhere + + + + - - diff --git a/johnzon-core/src/test/java/org/apache/johnzon/core/ManualTckTest.java b/johnzon-core/src/test/java/org/apache/johnzon/core/ManualTckTest.java deleted file mode 100644 index afb152d5..00000000 --- a/johnzon-core/src/test/java/org/apache/johnzon/core/ManualTckTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.johnzon.core; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - -import org.junit.Test; - -import static org.junit.Assert.assertNotNull; - -public class ManualTckTest { - - - @Test - public void jsonParser11Test() throws Exception { - Class parserClass = loadClass("com.sun.ts.tests.jsonp.api.jsonparsertests.Parser"); - if (parserClass == null) { - // no TCK available, so we skip the test - return; - } - - Constructor constructor = parserClass.getDeclaredConstructor(); - constructor.setAccessible(true); - Object parserTest = constructor.newInstance(); - assertNotNull(parserTest); - - Method testMethod = parserClass.getDeclaredMethod("test"); - testMethod.setAccessible(true); - final Object result = testMethod.invoke(parserTest); - - Class testResultClass = loadClass("com.sun.ts.tests.jsonp.api.common.TestResult"); - Method evalMethod = testResultClass.getDeclaredMethod("eval"); - evalMethod.invoke(result); - } - - private Class loadClass(String className) { - try { - return Class.forName(className); - } catch (ClassNotFoundException cnfe) { - return null; - } - } -} diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 19dcb23b..1e8c18a4 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -43,6 +43,11 @@ ${project.version} + + org.junit.vintage + junit-vintage-engine + test + org.apache.cxf cxf-rt-rs-client diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 5317536b..0ed50320 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -34,6 +34,12 @@ + + org.junit.vintage + junit-vintage-engine + test + + jakarta.json.bind jakarta.json.bind-api diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 1c89b42b..4a9ca916 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -67,6 +67,12 @@ ${project.version} + + org.junit.vintage + junit-vintage-engine + test + + org.apache.cxf cxf-rt-rs-client @@ -107,6 +113,27 @@ org.apache.openwebbeans openwebbeans-spi ${owb.version} + test + + + org.apache.openwebbeans + openwebbeans-se + ${owb.version} + test + + + + jakarta.json.bind + jakarta.json.bind-tck + 3.0.0 + test + + + + org.netbeans.tools + ct-sym + + @@ -136,6 +163,88 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy + generate-test-resources + + copy + + + + + + jakarta.json + jakarta.json-api + ${jakarta-jsonp-api.version} + jar + true + ${project.build.directory}/signaturedirectory + jakarta.json-api.jar + + + + jakarta.json.bind + jakarta.json.bind-api + ${jakarta-jsonb-api.version} + jar + true + ${project.build.directory}/signaturedirectory + jakarta.json.bind-api.jar + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.plugin.version} + + + + tck-test + + + test + + + + jakarta.json.bind:jakarta.json.bind-tck + + + + **/org/apache/johnzon/** + + + **/SerializersCustomizationCDITest + + + **/AnnotationTypeInfoTest + + + + ${project.build.directory}/jimage + ${project.build.directory}/signaturedirectory/jakarta.json.bind-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming + + + false + false + + + COMPAT + + + + + diff --git a/tck/jsonb/src/test/java/org/apache/johnzon/jsonb/tck/JohnzonOwbCDIProvider.java b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/tck/JohnzonOwbCDIProvider.java similarity index 100% rename from tck/jsonb/src/test/java/org/apache/johnzon/jsonb/tck/JohnzonOwbCDIProvider.java rename to johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/tck/JohnzonOwbCDIProvider.java diff --git a/tck/jsonb/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.CDIProvider b/johnzon-jsonb/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.CDIProvider similarity index 100% rename from tck/jsonb/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.CDIProvider rename to johnzon-jsonb/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.CDIProvider diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index dd4f6607..38094ee9 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -30,6 +30,11 @@ bundle + + org.junit.vintage + junit-vintage-engine + test + org.apache.johnzon johnzon-core diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index f8b5fb7a..ee9d8523 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -44,6 +44,11 @@ true + + org.junit.vintage + junit-vintage-engine + test + org.apache.johnzon johnzon-core diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index 4bb20cea..00557a29 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -35,6 +35,11 @@ ${project.version} + + org.junit.vintage + junit-vintage-engine + test + jakarta.persistence jakarta.persistence-api diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 5e5039ce..60252fcd 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -99,6 +99,12 @@ maven-plugin-annotations ${maven.version} + + + org.junit.vintage + junit-vintage-engine + test + diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index c0d41394..850fbef6 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -82,9 +82,9 @@ - org.jboss.arquillian.junit - arquillian-junit-container - 1.1.11.Final + org.jboss.arquillian.junit5 + arquillian-junit5-container + 1.8.0.Final test diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java index ee5f7864..af9ef0d6 100644 --- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java +++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java @@ -28,13 +28,13 @@ import org.apache.johnzon.websocket.jsr.JsrObjectDecoder; import org.apache.johnzon.websocket.jsr.JsrObjectEncoder; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.net.URI; import java.net.URL; @@ -45,10 +45,10 @@ import jakarta.websocket.Session; import jakarta.websocket.WebSocketContainer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class JsrCodecTest { @Deployment(testable = false) public static WebArchive war() { diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java index fb97cc7a..789fee51 100644 --- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java +++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java @@ -30,13 +30,13 @@ import org.apache.johnzon.websocket.mapper.JohnzonTextEncoder; import org.apache.openejb.arquillian.common.IO; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.net.URI; import java.net.URL; @@ -45,10 +45,10 @@ import jakarta.websocket.Session; import jakarta.websocket.WebSocketContainer; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class MapperCodecTest { @Deployment(testable = false) public static WebArchive war() { diff --git a/pom.xml b/pom.xml index e6f15465..65a7014e 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,7 @@ https://svn.apache.org/repos/asf/johnzon/site/publish/ scm:svn:${johnzon.site.url} ${project.build.directory}/site + 3.2.5 5.1.9 [$(version;==;$(@)),$(version;+;$(@))) 6.1.0 @@ -56,6 +57,7 @@ 3.0.0 -Xms1024m -Xmx2048m -Dfile.encoding=UTF-8 + 5.10.2 4.0.0 @@ -88,10 +90,17 @@ ${jakarta-jsonb-api.version} provided + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + - junit - junit - 4.13.2 + org.junit.vintage + junit-vintage-engine + ${junit.version} test @@ -105,8 +114,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api test @@ -137,12 +146,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + ${surefire.plugin.version} org.apache.maven.plugins maven-surefire-report-plugin - 3.1.2 + ${surefire.plugin.version} org.apache.maven.plugins @@ -804,13 +813,6 @@ - - tck - - tck - - - jdk9+ diff --git a/tck/jsonb/pom.xml b/tck/jsonb/pom.xml deleted file mode 100644 index 33802f96..00000000 --- a/tck/jsonb/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - tck - org.apache.johnzon - 2.0.2-SNAPSHOT - - 4.0.0 - - jsonb - Johnzon :: TCK :: JSON-B - jar - - - - jakarta.json.bind - jakarta.json.bind-api - - - jakarta.enterprise - jakarta.enterprise.cdi-api - 4.0.1 - - - org.apache.johnzon - johnzon-jsonb - ${project.version} - - - - jakarta.json.bind - jakarta.json.bind-tck - 3.0.0 - test - - - - org.apache.openwebbeans - openwebbeans-se - ${owb.version} - - - org.apache.openwebbeans - openwebbeans-impl - ${owb.version} - - - org.apache.openwebbeans - openwebbeans-spi - ${owb.version} - - - - org.netbeans.tools - sigtest-maven-plugin - 1.6 - test - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - false - 1 - - jakarta.json.bind:jakarta.json.bind-tck - - - - - **/SerializersCustomizationCDITest - - - **/AnnotationTypeInfoTest - - - - ${project.build.directory}/jimage - ${project.build.directory}/signaturedirectory/jakarta.json.bind-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming - - - false - false - - - COMPAT - - -Duser.language=en -Duser.region=US - - - - - diff --git a/tck/jsonp/pom.xml b/tck/jsonp/pom.xml deleted file mode 100644 index 879c9e12..00000000 --- a/tck/jsonp/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - tck - org.apache.johnzon - 2.0.2-SNAPSHOT - - 4.0.0 - - jsonp - Johnzon :: TCK :: JSON-P - jar - - - - jakarta.json - jakarta.json-api - - - - jakarta.json - jakarta.json-tck-tests - 2.1.1 - test - - - jakarta.json - jakarta.json-tck-tests-pluggability - 2.1.1 - test - - - - org.apache.johnzon - johnzon-core - ${project.version} - - - - org.apache.openwebbeans - openwebbeans-se - ${owb.version} - - - org.apache.openwebbeans - openwebbeans-impl - ${owb.version} - - - org.apache.openwebbeans - openwebbeans-spi - ${owb.version} - - - - org.netbeans.tools - sigtest-maven-plugin - 1.6 - test - - - - - - - src/test/resources - true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - false - 1 - - - - - - tck-pluggability - - - test - - - - jakarta.json:jakarta.json-tck-tests-pluggability - - - jakarta.json:jakarta.json-tck-tests - - - - - - tck - - - test - - - - jakarta.json:jakarta.json-tck-tests - - - ${project.build.directory}/jimage - ${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming - - - - jakarta.json:jakarta.json-tck-tests-pluggability - - - - - - - - - - diff --git a/tck/pom.xml b/tck/pom.xml deleted file mode 100644 index 46442eda..00000000 --- a/tck/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - johnzon - org.apache.johnzon - 2.0.2-SNAPSHOT - - 4.0.0 - - tck - Johnzon :: TCK - pom - - - jsonb - jsonp - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - copy - generate-test-resources - - copy - - - - - - jakarta.json - jakarta.json-api - ${jakarta-jsonp-api.version} - jar - true - ${project.build.directory}/signaturedirectory - jakarta.json-api.jar - - - - jakarta.json.bind - jakarta.json.bind-api - ${jakarta-jsonb-api.version} - jar - true - ${project.build.directory}/signaturedirectory - jakarta.json.bind-api.jar - - - - - - - - - - -