fix gen of code from xsd in jdk 25

Signed-off-by: Stefan Bischof <[email protected]>

Author: stbischof

model.jakarta.xml.bind.xsd/pom.xml

@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jaxb2-maven-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>xsd-to-java</id>
@@ -56,6 +56,13 @@
             </goals>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <version>4.0.5</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <xsdPathWithinArtifact>META-INF/JAXB/xsd</xsdPathWithinArtifact>
           <laxSchemaValidation>true</laxSchemaValidation>

model.jakarta.xml.bind.xsd/src/main/xsd/XMLSchema.xsd

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XSD 1.1//EN" "../dtd/XMLSchema.dtd">
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:xml="http://www.w3.org/XML/1998/namespace"
   elementFormDefault="qualified" xml:lang="EN"
   targetNamespace="http://www.w3.org/2001/XMLSchema" version="1.0">
   <xs:annotation>
@@ -30,15 +31,15 @@
       The simpleType element and all of its members are defined
       towards the end of this schema document.</xs:documentation>
   </xs:annotation>
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-    schemaLocation="http://www.w3.org/2001/xml.xsd">
+  <!-- xml:lang attribute definition (inline to avoid network fetch of xml.xsd) -->
+  <xs:attribute name="lang" type="xs:language" form="qualified">
     <xs:annotation>
       <xs:documentation>
-        Get access to the xml: attribute groups for xml:lang
-        as declared on 'schema' and 'documentation' below
+        Denotes the natural language of the content.
+        Defined inline to avoid network dependency on xml.xsd.
       </xs:documentation>
     </xs:annotation>
-  </xs:import>
+  </xs:attribute>
   <xs:complexType name="openAttrs">
     <xs:annotation>
       <xs:documentation>
@@ -207,7 +208,7 @@
           <xs:attribute name="xpathDefaultNamespace"
             type="xs:xpathDefaultNamespace" default="##local" use="optional" />
           <xs:attribute name="id" type="xs:ID" />
-          <xs:attribute ref="xml:lang" />
+          <xs:attribute ref="xs:lang" />
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
@@ -1359,7 +1360,7 @@
         <xs:any processContents="lax" />
       </xs:sequence>
       <xs:attribute name="source" type="xs:anyURI" />
-      <xs:attribute ref="xml:lang" />
+      <xs:attribute ref="xs:lang" />
       <xs:anyAttribute namespace="##other" processContents="lax" />
     </xs:complexType>
   </xs:element>

pom.xml

@@ -30,12 +30,8 @@
   <properties>
     <revision>0.0.1-SNAPSHOT</revision>
     <scm.repo.detail>org.eclipse.daanse.xmla</scm.repo.detail>
-    <!--    <bnd.version>7.1.0-SNAPSHOT</bnd.version>-->
     <logback.classic.version>1.4.14</logback.classic.version>
     <aries.spifly.version>1.3.7</aries.spifly.version>
-    <bnd.version>7.0.0</bnd.version>
-    <junit-jupiter.version>5.9.2</junit-jupiter.version>
-    <junit-platform.version>1.9.2</junit-platform.version>
     <assertj.version>3.24.2</assertj.version>
     <mockito.version>4.9.0</mockito.version>
     <awaitility.version>4.2.0</awaitility.version>

server/adapter.soapmessage/pom.xml

@@ -40,7 +40,7 @@
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bnd.annotation</artifactId>
-      <version>${bnd.version}</version>
+      <version>7.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

server/jakarta.jws/pom.xml

@@ -54,7 +54,7 @@
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bnd.annotation</artifactId>
-      <version>${bnd.version}</version>
+      <version>7.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

server/jakarta.saaj/test.bndrun

@@ -14,17 +14,13 @@
 
 -tester: biz.aQute.tester.junit-platform
 
-
-
-
 -runtrace: true
 -runvm: ${def;argLine}
 
 -runproperties: \
 org.slf4j.simpleLogger.defaultLogLevel=debug,\
 	org.osgi.service.http.port=8090
 
-
 port                              :   17290
 -runproperties.local.agent        :   osgi.fx.agent.port=0.0.0.0:${port}
 
@@ -37,8 +33,6 @@ port                              :   17290
 	bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
 	bnd.identity;id='org.eclipse.daanse.xmla.server.tck'
 
-
-
 -runee: JavaSE-25
 #-runfw: org.apache.felix.framework
 -runfw: org.eclipse.osgi
@@ -59,21 +53,22 @@ port                              :   17290
 	jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\
 	javax.activation-api;version='[1.2.0,1.2.1)',\
 	jaxb-api;version='[2.3.1,2.3.2)',\
-	junit-jupiter-api;version='[5.9.2,5.9.3)',\
-	junit-jupiter-engine;version='[5.9.2,5.9.3)',\
-	junit-jupiter-params;version='[5.9.2,5.9.3)',\
-	junit-platform-commons;version='[1.9.2,1.9.3)',\
-	junit-platform-engine;version='[1.9.2,1.9.3)',\
-	junit-platform-launcher;version='[1.9.2,1.9.3)',\
-	net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\
+	junit-jupiter-api;version='[5.12.2,5.12.3)',\
+	junit-jupiter-engine;version='[5.12.2,5.12.3)',\
+	junit-jupiter-params;version='[5.12.2,5.12.3)',\
+	junit-platform-commons;version='[1.12.2,1.12.3)',\
+	junit-platform-engine;version='[1.12.2,1.12.3)',\
+	junit-platform-launcher;version='[1.12.2,1.12.3)',\
+	net.bytebuddy.byte-buddy;version='[1.17.5,1.17.6)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.17.5,1.17.6)',\
 	org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
 	org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
 	org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.jetty12.light;version='[1.0.2,1.0.3)',\
 	org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
 	org.apache.felix.scr;version='[2.2.10,2.2.11)',\
+	org.apache.tomcat-servlet-api;version='[9.0.80,9.0.81)',\
 	org.eclipse.daanse.jakarta.servlet.soap;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\
@@ -96,8 +91,14 @@ port                              :   17290
 	org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
 	org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
 	org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
+	org.objectweb.asm;version='[9.9.0,9.9.1)',\
+	org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\
+	org.objectweb.asm.tree;version='[9.9.0,9.9.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.9.0,9.9.1)',\
+	org.objectweb.asm.util;version='[9.9.0,9.9.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
-	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.opentest4j;version='[1.3.0,1.3.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
 	org.osgi.test.junit5;version='[1.3.0,1.3.1)',\

server/jakarta.xml.ws.provider.soapmessage/pom.xml

@@ -48,7 +48,7 @@
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bnd.annotation</artifactId>
-      <version>${bnd.version}</version>
+      <version>7.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>