Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 22052 revert 21863 xml binding4 impl #22056

Merged
merged 2 commits into from
Aug 11, 2022
Merged

Revert 22052 revert 21863 xml binding4 impl #22056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cbc1dd
Revert "Revert "JAX-B: Add xmlBinding-4.0 Impl and tests""
neuwerk Aug 10, 2022
a4be438
Add EXACTs to xmlBinding-3.0 to prevent package resolution errors
neuwerk Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2566,6 +2566,11 @@
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.moxy</artifactId>
<version>4.0.0-M3</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
Expand Down Expand Up @@ -2646,36 +2651,71 @@
<artifactId>codemodel</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>codemodel</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-jxc</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>xsom</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>xsom</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions dev/cnf/oss_dependencies.maven
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.10
org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:3.0.2
org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10
org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.2
org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.0-M3
org.eclipse:yasson:2.0.1
org.eclipse:yasson:3.0.0
org.ehcache:ehcache:3.8.1
Expand All @@ -525,12 +526,19 @@ org.glassfish.hk2:hk2-utils:2.5.0-b42
org.glassfish.hk2:osgi-resource-locator:1.0.1
org.glassfish.hk2:osgi-resource-locator:1.0.3
org.glassfish.jaxb:codemodel:3.0.1
org.glassfish.jaxb:codemodel:4.0.0
org.glassfish.jaxb:jaxb-core:3.0.1
org.glassfish.jaxb:jaxb-core:4.0.0
org.glassfish.jaxb:jaxb-jxc:3.0.1
org.glassfish.jaxb:jaxb-jxc:4.0.0
org.glassfish.jaxb:jaxb-runtime:3.0.1
org.glassfish.jaxb:jaxb-runtime:4.0.0
org.glassfish.jaxb:jaxb-xjc:3.0.1
org.glassfish.jaxb:jaxb-xjc:4.0.0
org.glassfish.jaxb:txw2:3.0.1
org.glassfish.jaxb:txw2:4.0.0
org.glassfish.jaxb:xsom:3.0.1
org.glassfish.jaxb:xsom:4.0.0
org.glassfish.jersey.bundles.repackaged:jersey-guava:2.12
org.glassfish.jersey.containers:jersey-container-servlet-core:2.12
org.glassfish.jersey.containers:jersey-container-servlet:2.12
Expand Down
2 changes: 1 addition & 1 deletion ...appserver.features/visibility/public/xmlBinding-4.0/io.openliberty.xmlBinding-4.0.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Subsystem-Name: Jakarta XML Binding 4.0
com.ibm.websphere.appserver.eeCompatible-10.0, \
com.ibm.websphere.appserver.classloading-1.0
-bundles=\
io.openliberty.xmlBinding.3.0.internal.tools
io.openliberty.xmlBinding.4.0.internal.tools
-files=\
bin/xmlBinding/xjc.bat, \
bin/xmlBinding/tools/ws-schemagen.jar, \
Expand Down
5 changes: 3 additions & 2 deletions dev/com.ibm.ws.jaxb_fat/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ tested.features: \
jaxrs-2.0,\
jpa-2.1,\
ldapregistry-3.0,\
jaxb-2.3, \
servlet-5.0, \
xmlBinding-3.0
xmlBinding-3.0, \
servlet-6.0, \
xmlBinding-4.0

-buildpath: \
javax.activation:activation;version=1.1,\
Expand Down
4 changes: 3 additions & 1 deletion dev/com.ibm.ws.jaxb_fat/fat/src/com/ibm/ws/jaxb/fat/FATSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;

import componenttest.rules.repeater.JakartaEE10Action;
import componenttest.rules.repeater.JakartaEE9Action;
import componenttest.rules.repeater.RepeatTests;

Expand All @@ -28,5 +29,6 @@
public class FATSuite {
@ClassRule
public static RepeatTests r = RepeatTests.withoutModification()
.andWith(new JakartaEE9Action());
.andWith(new JakartaEE9Action())
.andWith(new JakartaEE10Action());
}
7 changes: 0 additions & 7 deletions dev/com.ibm.ws.jaxb_fat/fat/src/com/ibm/ws/jaxb/fat/LibertyJAXBTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
*******************************************************************************/
package com.ibm.ws.jaxb.fat;

import java.util.Arrays;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
Expand All @@ -21,7 +19,6 @@
import componenttest.annotation.Server;
import componenttest.annotation.TestServlet;
import componenttest.custom.junit.runner.FATRunner;
import componenttest.rules.repeater.JakartaEE9Action;
import componenttest.topology.impl.LibertyServer;
import componenttest.topology.utils.FATServletClient;
import jaxb.web.JAXBTestServlet;
Expand All @@ -39,10 +36,6 @@ public class LibertyJAXBTest extends FATServletClient {
public static void setUp() throws Exception {
ShrinkHelper.defaultDropinApp(server, APP_NAME, "jaxb.web");

if (JakartaEE9Action.isActive()) {
server.changeFeatures(Arrays.asList("xmlBinding-3.0", "servlet-5.0", "componenttest-2.0"));
}

server.startServer();
}

Expand Down
12 changes: 6 additions & 6 deletions dev/com.ibm.ws.jaxb_fat/test-applications/jaxbApp/src/jaxb/web/JAXBTestServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
public class JAXBTestServlet extends FATServlet {

@Test
@SkipForRepeat(SkipForRepeat.EE9_FEATURES)
@SkipForRepeat({ SkipForRepeat.EE9_FEATURES, SkipForRepeat.EE10_FEATURES })
public void testJaxbAPILoadedFromLiberty() throws Exception {
assertNull("System property 'javax.xml.bind.context.factory' effects the entire JVM and should not be set by the Liberty runtime!",
System.getProperty("javax.xml.bind.context.factory"));
Expand All @@ -45,7 +45,7 @@ public void testJaxbAPILoadedFromLiberty() throws Exception {
}

@Test
@SkipForRepeat({ SkipForRepeat.NO_MODIFICATION, "JAXRS" })
@SkipForRepeat(SkipForRepeat.NO_MODIFICATION)
public void testJakartaJaxbAPILoadedFromLiberty() throws Exception {
assertNull("System property 'jakarta.xml.bind.context.factory' effects the entire JVM and should not be set by the Liberty runtime!",
System.getProperty("jakarta.xml.bind.context.factory"));
Expand All @@ -56,13 +56,13 @@ public void testJakartaJaxbAPILoadedFromLiberty() throws Exception {
System.out.println("Got JAX-B API from loader= " + apiLoader);
System.out.println("Got JAX-B API from location=" + apiLocation);
assertTrue("Expected JAX-B API to come from Liberty bundle, but it came from: " + apiLoader,
apiLoader != null && apiLoader.toString().contains("io.openliberty.jakarta.xmlBinding.3."));
apiLoader != null && apiLoader.toString().contains("io.openliberty.jakarta.xmlBinding."));
assertTrue("Expected JAX-B API to come from Liberty, but it came from: " + apiLocation,
apiLocation != null && apiLocation.contains("io.openliberty.jakarta.xmlBinding.3."));
apiLocation != null && apiLocation.contains("io.openliberty.jakarta.xmlBinding."));
}

@Test
@SkipForRepeat({ SkipForRepeat.EE9_FEATURES })
@SkipForRepeat({ SkipForRepeat.EE9_FEATURES, SkipForRepeat.EE10_FEATURES })
public void testJaxbImplLoadedFromLiberty() throws Exception {
JAXBContext ctx = JAXBContext.newInstance("jaxb.web", ObjectFactory.class.getClassLoader());
ClassLoader implLoader = ctx.getClass().getClassLoader();
Expand Down Expand Up @@ -94,7 +94,7 @@ public void testXMLBindingImplLoadedFromLiberty() throws Exception {
}

@Test
@SkipForRepeat({ SkipForRepeat.EE9_FEATURES })
@SkipForRepeat({ SkipForRepeat.EE9_FEATURES, SkipForRepeat.EE10_FEATURES })
public void testActivationLoaded() throws Exception {
// Verify Activation API came from the JDK
ClassLoader apiLoader = javax.activation.DataHandler.class.getClassLoader();
Expand Down
6 changes: 5 additions & 1 deletion dev/io.openliberty.jakarta.xmlBinding.4.0/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
14 changes: 11 additions & 3 deletions dev/io.openliberty.jakarta.xmlBinding.4.0/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=11))"

Bundle-SymbolicName: io.openliberty.jakarta.xmlBinding.4.0; singleton:=true

Export-Package: jakarta.xml.bind.*;version="4.0"
Export-Package: jakarta.xml.bind.*;thread-context=true;version="4.0"

Service-Component: \
io.openliberty.jakarta.xmlBinding._4_0_${replace;${bVersion};\\.;_}.ResourceProvider; \
implementation:=com.ibm.wsspi.classloading.ResourceProvider; \
provide:=com.ibm.wsspi.classloading.ResourceProvider; \
configuration-policy:=ignore; \
properties:= "resources=${app-resources}"

Import-Package: \
jakarta.activation, \
Expand All @@ -38,5 +45,6 @@ instrument.disabled: true
publish.wlp.jar.suffix: dev/api/spec

-buildpath: \
jakarta.xml.bind:jakarta.xml.bind-api;strategy=exact;version=4.0.0,\
io.openliberty.org.glassfish.hk2.osgi-resource-locator
jakarta.xml.bind:jakarta.xml.bind-api;strategy=exact;version='4.0.0',\
io.openliberty.org.glassfish.hk2.osgi-resource-locator,\
com.ibm.ws.logging
44 changes: 22 additions & 22 deletions dev/io.openliberty.xmlBinding.3.0.internal.tools/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ Export-Package: \
org.glassfish.jaxb.*;version="3.0";thread-context=true

Include-Resource: \
@${repo;org.glassfish.jaxb:codemodel;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-core;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-jxc;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-runtime;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-xjc;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:txw2;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:xsom;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.xml.bind.external:relaxng-datatype;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.xml.bind.external:rngom;3.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.istack:istack-commons-runtime;4.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.istack:istack-commons-tools;4.0.1}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:codemodel;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-core;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-jxc;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-runtime;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:jaxb-xjc;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:txw2;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;org.glassfish.jaxb:xsom;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.xml.bind.external:relaxng-datatype;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.xml.bind.external:rngom;3.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.istack:istack-commons-runtime;4.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
@${repo;com.sun.istack:istack-commons-tools;4.0.1;EXACT}!/!(META-INF/maven/*|module-info.class), \
META-INF/services/jakarta.xml.bind.JAXBContext=resources/META-INF/services/jakarta.xml.bind.JAXBContext, \
META-INF/services/jakarta.xml.bind.JAXBContextFactory=resources/META-INF/services/jakarta.xml.bind.JAXBContextFactory

Expand All @@ -103,15 +103,15 @@ Multi-Release: true
instrument.disabled: true

-buildpath: \
io.openliberty.jakarta.xmlBinding.3.0;version=latest, \
org.glassfish.jaxb:codemodel;version=3.0.1, \
org.glassfish.jaxb:jaxb-core;version=3.0.1, \
org.glassfish.jaxb:jaxb-jxc;version=3.0.1, \
org.glassfish.jaxb:jaxb-runtime;version=3.0.1, \
org.glassfish.jaxb:jaxb-xjc;version=3.0.1, \
org.glassfish.jaxb:xsom;version=3.0.1, \
com.sun.xml.bind.external:relaxng-datatype;version=3.0.1, \
com.sun.xml.bind.external:rngom;version=3.0.1, \
com.sun.istack:istack-commons-runtime;version=4.0.1, \
com.sun.istack:istack-commons-tools;version=4.0.1, \
io.openliberty.jakarta.xmlBinding.3.0;strategy=exact;version=latest, \
org.glassfish.jaxb:codemodel;strategy=exact;version=3.0.1, \
org.glassfish.jaxb:jaxb-core;strategy=exact;version=3.0.1, \
org.glassfish.jaxb:jaxb-jxc;strategy=exact;version=3.0.1, \
org.glassfish.jaxb:jaxb-runtime;strategy=exact;version=3.0.1, \
org.glassfish.jaxb:jaxb-xjc;strategy=exact;version=3.0.1, \
org.glassfish.jaxb:xsom;strategy=exact;version=3.0.1, \
com.sun.xml.bind.external:relaxng-datatype;strategy=exact;version=3.0.1, \
com.sun.xml.bind.external:rngom;strategy=exact;version=3.0.1, \
com.sun.istack:istack-commons-runtime;strategy=exact;version=4.0.1, \
com.sun.istack:istack-commons-tools;strategy=exact;version=4.0.1, \
com.ibm.ws.org.apache.ant;strategy=exact;version=latest
10 changes: 10 additions & 0 deletions dev/io.openliberty.xmlBinding.4.0.internal.tools/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 2 additions & 0 deletions dev/io.openliberty.xmlBinding.4.0.internal.tools/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin/
/generated/
23 changes: 23 additions & 0 deletions dev/io.openliberty.xmlBinding.4.0.internal.tools/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>io.openliberty.xmlBinding.4.0.internal.tools</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions dev/io.openliberty.xmlBinding.4.0.internal.tools/.settings/bndtools.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
compileErrorAction=build
eclipse.preferences.version=1
4 changes: 4 additions & 0 deletions dev/io.openliberty.xmlBinding.4.0.internal.tools/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#Ant properties
#Automatically generated by the ant prepare.settings.files task
eclipse.preferences.version=1
encoding/<project>=UTF-8
Loading