Skip to content
Permalink
Browse files
CXFXJC-36 Use Jakarta API dependencies (#9)
  • Loading branch information
amarkevich committed Nov 18, 2019
1 parent 921c6cd commit 710ecbef2bc4d686bc1a1d56ce588292dc744fc1
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 42 deletions.
@@ -44,11 +44,6 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>

<dependency>
<groupId>jaxme</groupId>
<artifactId>jaxme2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -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 @@ public class BooleanGetterPluginTest {
@Test
public void testBooleanGetter() throws Exception {

DatatypeConverter.setDatatypeConverter(new DatatypeConverterImpl());

Foo foo = new org.apache.cxf.configuration.foo.ObjectFactory().createFoo();

foo.getBooleanAttr();
@@ -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 @@ public class BooleanGetAndIsPluginTest {
@Test
public void testBooleanGetAndIs() throws Exception {

DatatypeConverter.setDatatypeConverter(new DatatypeConverterImpl());

Foo foo = new org.apache.cxf.configuration.foo1.ObjectFactory().createFoo();

foo.getBooleanAttr();
@@ -47,11 +47,6 @@
<artifactId>jaxb-xjc</artifactId>
</dependency>

<dependency>
<groupId>jaxme</groupId>
<artifactId>jaxme2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -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 @@ public class DefaultValueTest extends Assert {
@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 @@ private void assertDefaultAttributeValues(Foo foo) {
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 @@ private void assertDefaultElementValues(Foo foo) {
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());

@@ -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"/>

23 pom.xml
@@ -107,11 +107,6 @@
<artifactId>junit</artifactId>
<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>
@@ -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>

0 comments on commit 710ecbe

Please sign in to comment.