Jakarta Activation/XML Binding dependency update (#1562)
Signed-off-by: Tomas Kraus <tomas.kraus@oracle.com>
diff --git a/jaxb-ri/boms/bom/pom.xml b/jaxb-ri/boms/bom/pom.xml
index 884bd16..e081c68 100644
--- a/jaxb-ri/boms/bom/pom.xml
+++ b/jaxb-ri/boms/bom/pom.xml
@@ -32,12 +32,13 @@
<url>https://eclipse-ee4j.github.io/jaxb-ri/</url>
<properties>
- <xml.bind-api.version>3.0.1</xml.bind-api.version>
+ <xml.bind-api.version>4.0.0-RC1</xml.bind-api.version>
<jaxb-api-osgi.version>3.0</jaxb-api-osgi.version>
- <istack.version>4.0.1</istack.version>
+ <istack.version>4.1.0-M1</istack.version>
<fastinfoset.version>2.0.0</fastinfoset.version>
- <stax-ex.version>2.0.1</stax-ex.version>
- <activation.version>2.0.1</activation.version>
+ <stax-ex.version>2.1.0-M1</stax-ex.version>
+ <activation.version>2.1.0-RC1</activation.version>
+ <angus-activation.version>1.0.0-M1</angus-activation.version>
</properties>
<dependencyManagement>
@@ -229,9 +230,9 @@
<version>${activation.version}</version>
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${activation.version}</version>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <version>${angus-activation.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/jaxb-ri/bundles/core/pom.xml b/jaxb-ri/bundles/core/pom.xml
index 7fdd59a..3cfc3af 100644
--- a/jaxb-ri/bundles/core/pom.xml
+++ b/jaxb-ri/bundles/core/pom.xml
@@ -36,12 +36,6 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
-
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
diff --git a/jaxb-ri/bundles/jxc/pom.xml b/jaxb-ri/bundles/jxc/pom.xml
index f709323..53a2b7b 100644
--- a/jaxb-ri/bundles/jxc/pom.xml
+++ b/jaxb-ri/bundles/jxc/pom.xml
@@ -34,11 +34,6 @@
<dependencies>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
diff --git a/jaxb-ri/bundles/osgi/osgi/pom.xml b/jaxb-ri/bundles/osgi/osgi/pom.xml
index a8811fe..a9e3619 100644
--- a/jaxb-ri/bundles/osgi/osgi/pom.xml
+++ b/jaxb-ri/bundles/osgi/osgi/pom.xml
@@ -110,11 +110,6 @@
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
diff --git a/jaxb-ri/bundles/xjc/pom.xml b/jaxb-ri/bundles/xjc/pom.xml
index d6c29f7..261ef1d 100644
--- a/jaxb-ri/bundles/xjc/pom.xml
+++ b/jaxb-ri/bundles/xjc/pom.xml
@@ -41,11 +41,6 @@
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>provided</scope>
diff --git a/jaxb-ri/core/pom.xml b/jaxb-ri/core/pom.xml
index 00f2c1f..52a2937 100644
--- a/jaxb-ri/core/pom.xml
+++ b/jaxb-ri/core/pom.xml
@@ -40,8 +40,13 @@
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/jaxb-ri/jxc/pom.xml b/jaxb-ri/jxc/pom.xml
index 0a46e9c..eedcc7d 100644
--- a/jaxb-ri/jxc/pom.xml
+++ b/jaxb-ri/jxc/pom.xml
@@ -113,7 +113,7 @@
<configuration>
<outputDirectory>${project.build.directory}/schemagen-cp</outputDirectory>
<includeArtifactIds>
- jakarta.activation,jakarta.xml.bind-api,
+ jakarta.activation-api,angus-activation,jakarta.xml.bind-api,
jaxb-core,jaxb-runtime,jaxb-xjc,
stax-ex,istack-commons-runtime,istack-commons-tools,dtd-parser,
rngom,relaxng-datatype,xsom,codemodel,txw2
diff --git a/jaxb-ri/runtime/impl/pom.xml b/jaxb-ri/runtime/impl/pom.xml
index 3ac3feb..cf1b656 100644
--- a/jaxb-ri/runtime/impl/pom.xml
+++ b/jaxb-ri/runtime/impl/pom.xml
@@ -42,11 +42,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jaxb-core</artifactId>
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java
index 86b89d9..b63cadf 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java
@@ -716,10 +716,6 @@
return new UnmarshallerImpl(this,null);
}
- public Validator createValidator() {
- throw new UnsupportedOperationException(Messages.NOT_IMPLEMENTED_IN_2_0.format());
- }
-
@Override
public JAXBIntrospector createJAXBIntrospector() {
return new JAXBIntrospector() {
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java
index 0a58f49..b137cb0 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java
@@ -524,14 +524,14 @@
}
@Override
- public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A adapter) {
if(type==null)
throw new IllegalArgumentException();
serializer.putAdapter(type,adapter);
}
@Override
- public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+ public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
if(type==null)
throw new IllegalArgumentException();
if(serializer.containsAdapter(type))
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java
index bc81df7..f48b5ac 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java
@@ -20,7 +20,6 @@
ILLEGAL_PARAMETER, // 2 args
UNABLE_TO_FIND_CONVERSION_METHOD, // 3 args
MISSING_ID, // 1 arg
- NOT_IMPLEMENTED_IN_2_0,
UNRECOGNIZED_ELEMENT_NAME,
TYPE_MISMATCH, // 3 args
MISSING_OBJECT, // 1 arg
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java
index 44f0f3f..931d0d5 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java
@@ -499,7 +499,7 @@
/**
* @deprecated since 2.0
*/
- @Override
+ @Deprecated
public boolean isValidating() {
throw new UnsupportedOperationException();
}
@@ -507,13 +507,13 @@
/**
* @deprecated since 2.0
*/
- @Override
+ @Deprecated
public void setValidating(boolean validating) {
throw new UnsupportedOperationException();
}
@Override
- public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+ public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A adapter) {
if (type==null) {
throw new IllegalArgumentException();
}
@@ -521,7 +521,7 @@
}
@Override
- public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+ public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
if(type==null) {
throw new IllegalArgumentException();
}
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties
index 32d2f73..e0c7e6d 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties
@@ -31,9 +31,6 @@
MISSING_ID = \
Object "{0}" is found in an IDREF property but this object doesn't have an ID.
-NOT_IMPLEMENTED_IN_2_0 = \
- This feature is not available in JAXB RI 2.0
-
UNRECOGNIZED_ELEMENT_NAME = \
The tag name "{0}" is not known to this JAXBContext.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties
index 79f2217..cf92c3b 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties
@@ -25,8 +25,6 @@
MISSING_ID = Objekt "{0}" ist in einer IDREF-Eigenschaft enthalten, dieses Objekt hat jedoch keine ID.
-NOT_IMPLEMENTED_IN_2_0 = Dieses Feature ist in JAXB RI 2.0 nicht verf\u00fcgbar
-
UNRECOGNIZED_ELEMENT_NAME = Der Tag-Name "{0}" ist diesem JAXBContext nicht bekannt.
TYPE_MISMATCH = "{1}"-Eigenschaft eines "{0}"-Objekts enth\u00e4lt ein Objekt vom Typ "{2}", dies ist jedoch nicht zul\u00e4ssig. In javadoc f\u00fcr diese Eigenschaft wird beschrieben, was diese Eigenschaft akzeptieren kann.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties
index e0b62aa..b580eeb 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties
@@ -25,8 +25,6 @@
MISSING_ID = El objeto "{0}" se encuentra en una propiedad IDREF, pero este objeto no tiene un identificador.
-NOT_IMPLEMENTED_IN_2_0 = Esta funci\u00f3n no est\u00e1 disponible en la implantaci\u00f3n de referencia de JAXB 2.0.
-
UNRECOGNIZED_ELEMENT_NAME = El nombre de la etiqueta "{0}" no es conocido en este contexto de JAXB.
TYPE_MISMATCH = La propiedad "{1}" de un objeto "{0}" contiene un objeto del tipo "{2}", pero esto no est\u00e1 permitido. Consulte la documentaci\u00f3n javadoc de esta propiedad para saber qu\u00e9 permite.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties
index bfcb87b..630bf69 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties
@@ -25,8 +25,6 @@
MISSING_ID = L"objet "{0}" a \u00e9t\u00e9 d\u00e9tect\u00e9 dans une propri\u00e9t\u00e9 IDREF, mais cet objet ne comporte aucun ID.
-NOT_IMPLEMENTED_IN_2_0 = Cette fonctionnalit\u00e9 n'est pas disponible dans JAXB RI 2.0
-
UNRECOGNIZED_ELEMENT_NAME = Le nom de balise "{0}" est inconnu pour ce contexte JAXBContext.
TYPE_MISMATCH = La propri\u00e9t\u00e9 "{1}" d''un objet "{0}" contient un objet de type "{2}" mais cela n''est pas autoris\u00e9. Pour savoir ce que cette propri\u00e9t\u00e9 peut accepter, consultez Javadoc.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties
index ebbff0a..691ad5e 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties
@@ -25,8 +25,6 @@
MISSING_ID = Oggetto "{0}" trovato in una propriet\u00e0 IDREF ma questo oggetto non ha un ID.
-NOT_IMPLEMENTED_IN_2_0 = Questa funzione non \u00e8 disponibile in JAXB RI 2.0
-
UNRECOGNIZED_ELEMENT_NAME = Nome della tag "{0}" sconosciuto a questo JAXBContext.
TYPE_MISMATCH = La propriet\u00e0 "{1}" di un oggetto "{0}" contiene un oggetto di tipo "{2}" non consentito. Vedere il javadoc di questa propriet\u00e0 per quello che pu\u00f2 essere accettato dalla propriet\u00e0.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties
index 04f6bb7..72e2a55 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties
@@ -25,8 +25,6 @@
MISSING_ID = \u30aa\u30d6\u30b8\u30a7\u30af\u30c8"{0}"\u304cIDREF\u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u304c\u3001\u3053\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u306fID\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-NOT_IMPLEMENTED_IN_2_0 = \u3053\u306e\u6a5f\u80fd\u306fJAXB RI 2.0\u3067\u306f\u4f7f\u7528\u4e0d\u53ef\u3067\u3059
-
UNRECOGNIZED_ELEMENT_NAME = \u30bf\u30b0\u540d"{0}"\u306f\u3053\u306eJAXBContext\u3067\u306f\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093\u3002
TYPE_MISMATCH = "{0}"\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e"{1}"\u30d7\u30ed\u30d1\u30c6\u30a3\u306b\u306f"{2}"\u30bf\u30a4\u30d7\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u304c\u3001\u3053\u308c\u306f\u8a31\u53ef\u3055\u308c\u307e\u305b\u3093\u3002\u3053\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u53d7\u5165\u53ef\u80fd\u306a\u30bf\u30a4\u30d7\u306b\u3064\u3044\u3066\u306f\u3001\u3053\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306ejavadoc\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties
index 7185d06..275eeef 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties
@@ -25,8 +25,6 @@
MISSING_ID = "{0}" \uac1d\uccb4\uac00 IDREF \uc18d\uc131\uc5d0\uc11c \ubc1c\uacac\ub418\uc5c8\uc9c0\ub9cc \uc774 \uac1d\uccb4\uc5d0 ID\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
-NOT_IMPLEMENTED_IN_2_0 = \uc774 \uae30\ub2a5\uc740 JAXB RI 2.0\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-
UNRECOGNIZED_ELEMENT_NAME = \uc774 JAXBContext\uc5d0\uc11c \ud0dc\uadf8 \uc774\ub984 "{0}"\uc744(\ub97c) \uc778\uc2dd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
TYPE_MISMATCH = "{0}" \uac1d\uccb4\uc758 "{1}" \uc18d\uc131\uc5d0 "{2}" \uc720\ud615\uc758 \uac1d\uccb4\uac00 \ud3ec\ud568\ub418\uc5b4 \uc788\uc9c0\ub9cc \uc774 \uc720\ud615\uc740 \ud5c8\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc774 \uc18d\uc131\uc5d0 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 \uc720\ud615\uc740 \uc774 \uc18d\uc131\uc758 javadoc\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties
index 74df3c8..c5b9ca8 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties
@@ -25,8 +25,6 @@
MISSING_ID = O objeto "{0}" foi encontrado em uma propriedade IDREF, mas este objeto n\u00e3o tem um ID.
-NOT_IMPLEMENTED_IN_2_0 = Este recurso n\u00e3o est\u00e1 dispon\u00edvel no JAXB RI 2.0
-
UNRECOGNIZED_ELEMENT_NAME = O nome da tag "{0}" n\u00e3o \u00e9 conhecido para este JAXBContext.
TYPE_MISMATCH = a propriedade "{1}" de um objeto "{0}" cont\u00e9m um objeto do tipo "{2}", mas esse tipo n\u00e3o \u00e9 permitido. Consulte javadoc desta propriedade para saber o que essa propriedade pode aceitar.
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties
index 6b041ce..06bd23f 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties
@@ -25,8 +25,6 @@
MISSING_ID = \u53d1\u73b0\u5bf9\u8c61 "{0}" \u4f4d\u4e8e IDREF \u5c5e\u6027\u4e2d, \u4f46\u6b64\u5bf9\u8c61\u6ca1\u6709 ID\u3002
-NOT_IMPLEMENTED_IN_2_0 = \u6b64\u529f\u80fd\u5728 JAXB RI 2.0 \u4e2d\u4e0d\u53ef\u7528
-
UNRECOGNIZED_ELEMENT_NAME = \u6807\u8bb0\u540d\u79f0 "{0}" \u5bf9\u6b64 JAXBContext \u662f\u672a\u77e5\u7684\u3002
TYPE_MISMATCH = "{0}" \u5bf9\u8c61\u7684 "{1}" \u5c5e\u6027\u5305\u542b "{2}" \u7c7b\u578b\u7684\u5bf9\u8c61, \u4f46\u8fd9\u662f\u4e0d\u5141\u8bb8\u7684\u3002\u6709\u5173\u6b64\u5c5e\u6027\u53ef\u63a5\u53d7\u7684\u7c7b\u578b, \u8bf7\u53c2\u9605\u6b64\u5c5e\u6027\u7684 javadoc\u3002
diff --git a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties
index 59ea682..17c1f8a 100644
--- a/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties
+++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties
@@ -25,8 +25,6 @@
MISSING_ID = \u5728 IDREF \u7279\u6027\u4e2d\u627e\u5230\u7269\u4ef6 "{0}", \u4f46\u6b64\u7269\u4ef6\u6c92\u6709 ID.
-NOT_IMPLEMENTED_IN_2_0 = JAXB RI 2.0 \u4e2d\u672a\u63d0\u4f9b\u6b64\u529f\u80fd
-
UNRECOGNIZED_ELEMENT_NAME = JAXBContext \u4e0d\u8a8d\u5f97\u6a19\u8a18\u540d\u7a31 "{0}".
TYPE_MISMATCH = \u7269\u4ef6 "{0}" \u7684\u7279\u6027 "{1}" \u5305\u542b\u985e\u578b "{2}" \u7684\u7269\u4ef6, \u4f46\u9019\u662f\u4e0d\u5141\u8a31\u7684. \u8acb\u53c3\u95b1\u6b64\u7279\u6027\u7684 javadoc, \u77ad\u89e3\u6b64\u7279\u6027\u53ef\u63a5\u53d7\u7684\u7269\u4ef6\u985e\u578b.
diff --git a/jaxb-ri/xjc/pom.xml b/jaxb-ri/xjc/pom.xml
index f176b20..84a176d 100644
--- a/jaxb-ri/xjc/pom.xml
+++ b/jaxb-ri/xjc/pom.xml
@@ -145,7 +145,7 @@
<configuration>
<outputDirectory>${project.build.directory}/xjctask-cp</outputDirectory>
<includeArtifactIds>
- jakarta.activation,istack-commons-tools,istack-commons-runtime,
+ jakarta.activation-api,angus-activation,istack-commons-tools,istack-commons-runtime,
jaxb-core,jaxb-runtime,jakarta.xml.bind-api,
codemodel,xsom,relaxng-datatype,rngom,txw2
</includeArtifactIds>
