This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge pull request #1152 from zhengjl/metro-437

JAXB implementation is a separate set of JAR files with split package issues
  • Loading branch information...
bravehorsie committed Nov 7, 2017
2 parents 3743e4e + 7d6e9fd commit f54663ac74a52649b455e6b83c8ec02ec2c77a55
Showing with 166 additions and 1,031 deletions.
  1. +0 −22 jaxb-ri/boms/bom/pom.xml
  2. +0 −349 jaxb-ri/bundles/core/pom.xml
  3. +0 −1 jaxb-ri/bundles/core/src/main/resources/META-INF/MANIFEST.MF
  4. +0 −83 jaxb-ri/bundles/core/src/test/java/jaxb/core/test/OSGiBundleVersionTest.java
  5. +1 −2 jaxb-ri/bundles/jxc/pom.xml
  6. +0 −288 jaxb-ri/bundles/mod/pom.xml
  7. +6 −17 jaxb-ri/bundles/osgi/osgi/pom.xml
  8. +0 −12 jaxb-ri/bundles/pom.xml
  9. +0 −22 jaxb-ri/bundles/ri/pom.xml
  10. +21 −12 jaxb-ri/bundles/runtime/pom.xml
  11. +1 −2 jaxb-ri/bundles/xjc/pom.xml
  12. +0 −52 jaxb-ri/core/exclude-core.xml
  13. +0 −121 jaxb-ri/core/pom.xml
  14. +0 −9 jaxb-ri/jaxb-jxc-jdk9/pom.xml
  15. +1 −1 jaxb-ri/jaxb-xjc-jdk9/pom.xml
  16. +0 −9 jaxb-ri/jxc/pom.xml
  17. +0 −11 jaxb-ri/pom.xml
  18. +3 −0 jaxb-ri/runtime/impl/exclude-runtime.xml
  19. +49 −1 jaxb-ri/runtime/impl/pom.xml
  20. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/Locatable.java
  21. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/Messages.java
  22. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/Util.java
  23. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java
  24. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java
  25. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/annotation/XmlIsSet.java
  26. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java
  27. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/api/ErrorListener.java
  28. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java
  29. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java
  30. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java
  31. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java
  32. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java
  33. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/Messages.java
  34. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java
  35. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java
  36. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java
  37. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java
  38. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java
  39. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/unmarshaller/InfosetScanner.java
  40. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/util/SecureLoader.java
  41. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/util/Which.java
  42. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/ClassFactory.java
  43. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/Messages.java
  44. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/TODO.java
  45. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java
  46. 0 ...ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java
  47. 0 ...ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java
  48. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java
  49. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/Adapter.java
  50. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java
  51. 0 ...-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java
  52. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java
  53. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ClassInfo.java
  54. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/Element.java
  55. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ElementInfo.java
  56. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java
  57. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/EnumConstant.java
  58. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java
  59. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java
  60. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ID.java
  61. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java
  62. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java
  63. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java
  64. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java
  65. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java
  66. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java
  67. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/PropertyKind.java
  68. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/Ref.java
  69. 0 ...-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java
  70. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/RegistryInfo.java
  71. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfo.java
  72. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfoSet.java
  73. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java
  74. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java
  75. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java
  76. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java
  77. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/core/package-info.java
  78. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java
  79. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java
  80. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java
  81. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java
  82. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java
  83. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java
  84. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java
  85. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java
  86. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java
  87. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java
  88. 0 ...i/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationException.java
  89. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/runtime/Location.java
  90. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/runtime/RuntimeUtil.java
  91. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapterMarker.java
  92. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorEx.java
  93. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java
  94. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java
  95. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java
  96. 0 ...-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java
  97. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java
  98. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java
  99. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java
  100. 0 jaxb-ri/{core → runtime/impl}/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java
  101. +5 −15 jaxb-ri/{bundles/mod/src/main/java → runtime/impl/src/main/jdk9}/module-info.java
  102. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages.properties
  103. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_de.properties
  104. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_es.properties
  105. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_fr.properties
  106. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_it.properties
  107. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_ja.properties
  108. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_ko.properties
  109. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_pt_BR.properties
  110. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_zh_CN.properties
  111. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/Messages_zh_TW.properties
  112. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties
  113. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties
  114. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties
  115. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties
  116. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties
  117. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties
  118. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties
  119. 0 ...ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties
  120. 0 ...ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties
  121. 0 ...ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties
  122. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages.properties
  123. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties
  124. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties
  125. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties
  126. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties
  127. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties
  128. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties
  129. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties
  130. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties
  131. 0 jaxb-ri/{core → runtime/impl}/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties
  132. +30 −0 jaxb-ri/txw/runtime/pom.xml
  133. +47 −0 jaxb-ri/txw/runtime/src/main/jdk9/module-info.java
  134. +2 −2 jaxb-ri/xjc/pom.xml
View
@@ -77,12 +77,6 @@
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
@@ -103,12 +97,6 @@
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
@@ -149,11 +137,6 @@
<artifactId>jaxb-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
@@ -171,11 +154,6 @@
<artifactId>jaxb-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -319,7 +319,6 @@
<include>org.glassfish.jaxb:jaxb-jxc</include>
</includes>
<excludes>
<exclude>org.glassfish.jaxb:jaxb-core</exclude>
<exclude>org.glassfish.jaxb:jaxb-xjc-jdk9</exclude>
<exclude>org.glassfish.jaxb:jaxb-xjc</exclude>
<exclude>org.glassfish.jaxb:jaxb-runtime</exclude>
@@ -349,7 +348,7 @@
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.sun.tools.jxc.SchemaGeneratorFacade</mainClass>
<manifestEntries>
<Class-Path>jaxb-core.jar jaxb-impl.jar jaxb-xjc.jar</Class-Path>
<Class-Path>jaxb-impl.jar jaxb-xjc.jar</Class-Path>
<Major-Version>${jaxb.majorVersion}.${jaxb.minorVersion}.${jaxb.incrementalVersion}</Major-Version>
<Specification-Version>${jaxb-api.majorVersion}.${jaxb-api.minorVersion}</Specification-Version>
<Git-Revision>${buildNumber}</Git-Revision>
Oops, something went wrong.

0 comments on commit f54663a

Please sign in to comment.