Remove xmlBinding-4.0 non-RI impl warnings for Beta

OpenLiberty · Aug 5, 2022 · fe901b4 · fe901b4
1 parent d4260eb
commit fe901b4
Show file tree

Hide file tree

Showing 15 changed files with 178 additions and 836 deletions.
diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
@@ -2536,11 +2536,6 @@
       <artifactId>org.eclipse.persistence.core</artifactId>
       <version>3.0.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.core</artifactId>
-      <version>4.0.0-M3</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.jpa.jpql</artifactId>

diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven
@@ -503,7 +503,6 @@ org.eclipse.persistence:org.eclipse.persistence.antlr:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.asm:9.3.0
 org.eclipse.persistence:org.eclipse.persistence.core:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.core:3.0.2
-org.eclipse.persistence:org.eclipse.persistence.core:4.0.0-M3
 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.7.10
 org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:3.0.2
 org.eclipse.persistence:org.eclipse.persistence.jpa.modelgen.processor:2.7.10

diff --git a/dev/io.openliberty.jakarta.xmlBinding.4.0/.classpath b/dev/io.openliberty.jakarta.xmlBinding.4.0/.classpath
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<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>
diff --git a/dev/io.openliberty.jakarta.xmlBinding.4.0/bnd.bnd b/dev/io.openliberty.jakarta.xmlBinding.4.0/bnd.bnd
@@ -18,8 +18,7 @@ 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.*;thread-context=true;version="4.0", \
-  io.openliberty.jakarta.xmlBinding.*;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; \
@@ -39,11 +38,9 @@ DynamicImport-Package: \
   org.glassfish.jaxb.*
 
 Include-Resource:\
-  @${repo;jakarta.xml.bind:jakarta.xml.bind-api;4.0.0;EXACT}!/!(META-INF/maven/*|module-info.class), \
-  io/openliberty/jakarta=${bin}/io/openliberty/jakarta, \
-  jakarta/xml/bind=${bin}/jakarta/xml/bind
+  @${repo;jakarta.xml.bind:jakarta.xml.bind-api;4.0.0;EXACT}!/!(META-INF/maven/*|module-info.class)
 
-instrument.classesExcludes: jakarta/**/*.class
+instrument.disabled: true
 
 publish.wlp.jar.suffix: dev/api/spec
 

diff --git a/...mlBinding.4.0/resources/io/openliberty/jakarta/xmlbinding/resources/JAXBMessages.nlsprops b/...mlBinding.4.0/resources/io/openliberty/jakarta/xmlbinding/resources/JAXBMessages.nlsprops
diff --git a/...enliberty.jakarta.xmlBinding.4.0/src/io/openliberty/jakarta/xmlbinding/JaxbConstants.java b/...enliberty.jakarta.xmlBinding.4.0/src/io/openliberty/jakarta/xmlbinding/JaxbConstants.java
diff --git a/...enliberty.jakarta.xmlBinding.4.0/src/io/openliberty/jakarta/xmlbinding/JaxbToolsUtil.java b/...enliberty.jakarta.xmlBinding.4.0/src/io/openliberty/jakarta/xmlbinding/JaxbToolsUtil.java