CXFXJC-36 Use Jakarta API dependencies (#9)
diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml
index 86c565a..e678f9f 100644
--- a/boolean-test/pom.xml
+++ b/boolean-test/pom.xml
@@ -45,11 +45,6 @@
</dependency>
<dependency>
- <groupId>jaxme</groupId>
- <artifactId>jaxme2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/boolean-test/src/test/java/org/apache/cxf/xjc/bg/BooleanGetterPluginTest.java b/boolean-test/src/test/java/org/apache/cxf/xjc/bg/BooleanGetterPluginTest.java
index 156f73e..16ad608 100644
--- a/boolean-test/src/test/java/org/apache/cxf/xjc/bg/BooleanGetterPluginTest.java
+++ b/boolean-test/src/test/java/org/apache/cxf/xjc/bg/BooleanGetterPluginTest.java
@@ -18,10 +18,7 @@
*/
package org.apache.cxf.xjc.bg;
-import javax.xml.bind.DatatypeConverter;
-
import org.apache.cxf.configuration.foo.Foo;
-import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
import org.junit.Test;
@@ -30,8 +27,6 @@
@Test
public void testBooleanGetter() throws Exception {
- DatatypeConverter.setDatatypeConverter(new DatatypeConverterImpl());
-
Foo foo = new org.apache.cxf.configuration.foo.ObjectFactory().createFoo();
foo.getBooleanAttr();
diff --git a/boolean-test/src/test/java/org/apache/cxf/xjc/bgi/BooleanGetAndIsPluginTest.java b/boolean-test/src/test/java/org/apache/cxf/xjc/bgi/BooleanGetAndIsPluginTest.java
index ef8a108..0acf46a 100644
--- a/boolean-test/src/test/java/org/apache/cxf/xjc/bgi/BooleanGetAndIsPluginTest.java
+++ b/boolean-test/src/test/java/org/apache/cxf/xjc/bgi/BooleanGetAndIsPluginTest.java
@@ -18,10 +18,7 @@
*/
package org.apache.cxf.xjc.bgi;
-import javax.xml.bind.DatatypeConverter;
-
import org.apache.cxf.configuration.foo1.Foo;
-import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
import org.junit.Test;
@@ -30,8 +27,6 @@
@Test
public void testBooleanGetAndIs() throws Exception {
- DatatypeConverter.setDatatypeConverter(new DatatypeConverterImpl());
-
Foo foo = new org.apache.cxf.configuration.foo1.ObjectFactory().createFoo();
foo.getBooleanAttr();
diff --git a/dv-test/pom.xml b/dv-test/pom.xml
index 5e862ce..27f2bc0 100644
--- a/dv-test/pom.xml
+++ b/dv-test/pom.xml
@@ -48,11 +48,6 @@
</dependency>
<dependency>
- <groupId>jaxme</groupId>
- <artifactId>jaxme2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java b/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
index 1c4e09d..1e5d0b2 100644
--- a/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
+++ b/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
@@ -36,7 +36,6 @@
import javax.xml.validation.SchemaFactory;
import org.apache.cxf.configuration.foo.Foo;
-import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -48,8 +47,6 @@
@Test
public void testFooDefaultValues() throws Exception {
- DatatypeConverter.setDatatypeConverter(new DatatypeConverterImpl());
-
Foo foo = new org.apache.cxf.configuration.foo.ObjectFactory().createFoo();
// verify default values
@@ -82,9 +79,9 @@
assertEquals("Unexpected value for attribute decimalAttr",
new BigDecimal("115"), foo.getDecimalAttr());
assertEquals("Unexpected value for attribute floatAttr",
- new Float(116F), new Float(foo.getFloatAttr()));
+ 116F, foo.getFloatAttr(), 0F);
assertEquals("Unexpected value for attribute doubleAttr",
- new Double(117D), new Double(foo.getDoubleAttr()));
+ 117D, foo.getDoubleAttr(), 0D);
assertEquals("Unexpected value for attribute byteAttr",
118, foo.getByteAttr());
@@ -189,9 +186,9 @@
assertEquals("Unexpected value for element decimalElem",
new BigDecimal("15"), foo.getDecimalElem());
assertEquals("Unexpected value for element floatElem",
- new Float(16F), foo.getFloatElem());
+ 16F, foo.getFloatElem(), 0F);
assertEquals("Unexpected value for element doubleElem",
- new Double(17D), foo.getDoubleElem());
+ 17D, foo.getDoubleElem(), 0D);
assertEquals("Unexpected value for element byteElem",
(byte)18, foo.getByteElem().byteValue());
diff --git a/dv-test/src/test/resources/schemas/configuration/foo.xsd b/dv-test/src/test/resources/schemas/configuration/foo.xsd
index 98d0633..bc0e0ec 100644
--- a/dv-test/src/test/resources/schemas/configuration/foo.xsd
+++ b/dv-test/src/test/resources/schemas/configuration/foo.xsd
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/configuration/foo" targetNamespace="http://cxf.apache.org/configuration/foo" elementFormDefault="qualified">
+<xs:schema attributeFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://cxf.apache.org/configuration/foo" targetNamespace="http://cxf.apache.org/configuration/foo" elementFormDefault="qualified">
<xs:element name="foo" type="tns:foo"/>
diff --git a/pom.xml b/pom.xml
index cc54430..61134bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,11 +108,6 @@
<version>4.12</version>
</dependency>
<dependency>
- <groupId>jaxme</groupId>
- <artifactId>jaxme2</artifactId>
- <version>0.5.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.3.3</version>
@@ -581,19 +576,19 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.1</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>1.3.5</version>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>1.2.1</version>
</dependency>
</dependencies>
</profile>