Skip to content

Upgrade to JAXB 4, and newer maven plugin #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
doctau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to JAXB 4, and newer maven plugin #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jrecordbind-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>${maven-jaxb2-plugin.version}</version>
<configuration>
<schemaDirectory>src/main/resources</schemaDirectory>
Expand Down
2 changes: 1 addition & 1 deletion jrecordbind-example/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module org.fissore.jrecordbind.example {

requires org.fissore.jrecordbind;
requires java.xml.bind;
requires jakarta.xml.bind;

exports org.jrecordbind.schemas.jrb.example to org.fissore.jrecordbind;

Expand Down
4 changes: 2 additions & 2 deletions jrecordbind-example/src/main/xjb/bindings.xjb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<bindings xmlns="http://java.sun.com/xml/ns/jaxb" version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<globalBindings>
<javaType name="java.util.Calendar" xmlType="xs:date" parseMethod="javax.xml.bind.DatatypeConverter.parseDate" printMethod="javax.xml.bind.DatatypeConverter.printDate"/>
<javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="javax.xml.bind.DatatypeConverter.parseDate" printMethod="javax.xml.bind.DatatypeConverter.printDate"/>
<javaType name="java.util.Calendar" xmlType="xs:date" parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate" printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
<javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate" printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
</globalBindings>
</bindings>
4 changes: 2 additions & 2 deletions jrecordbind-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-maven-plugin</artifactId>
<version>${maven-jaxb2-plugin.version}</version>
<configuration>
<schemaDirectory>src/test/resources/record_definitions</schemaDirectory>
Expand Down
2 changes: 1 addition & 1 deletion jrecordbind-test/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module org.fissore.jrecordbindtests {

requires org.fissore.jrecordbind;
requires java.xml.bind;
requires jakarta.xml.bind;

// the following `exports` go here because maven-jaxb2-plugin generates sources
// into generated-sources rather than generated-test-sources
Expand Down
6 changes: 3 additions & 3 deletions jrecordbind-test/src/test/java/org/fissore/jrecordbindtests/DefinitionLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void simple() {
var birthdayProperty = definition.getProperties().stream().filter(p -> "birthday".equals(p.getName())).findFirst().get();
assertEquals("birthday", birthdayProperty.getName());
assertEquals("org.fissore.jrecordbindtests.test.TestConverters$SimpleRecordDateConverter", birthdayProperty.getConverter());
assertEquals("java.util.Date", birthdayProperty.getType());
assertEquals("java.time.LocalDate", birthdayProperty.getType());
assertEquals(8, birthdayProperty.getLength());
assertNull(birthdayProperty.getPadder());

Expand Down Expand Up @@ -386,7 +386,7 @@ public void hierarchical() {

property = subDefinition.getProperties().get(1);
assertEquals("when", property.getName());
assertEquals("java.util.Date", property.getType());
assertEquals("java.time.LocalDate", property.getType());
assertEquals(8, property.getLength());
assertEquals("org.fissore.jrecordbindtests.test.TestConverters$SimpleRecordDateConverter", property.getConverter());
}
Expand Down Expand Up @@ -429,7 +429,7 @@ public void multiRow() {

property = definition.getProperties().get(3);
assertEquals("birthday", property.getName());
assertEquals("java.util.Date", property.getType());
assertEquals("java.time.LocalDateTime", property.getType());
assertEquals(8, property.getLength());
assertEquals("org.fissore.jrecordbindtests.test.TestConverters$SimpleRecordDateConverter", property.getConverter());
assertEquals(0, property.getRow());
Expand Down
4 changes: 2 additions & 2 deletions jrecordbind-test/src/test/xjb/bindings.xjb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<bindings xmlns="http://java.sun.com/xml/ns/jaxb" version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<globalBindings>
<javaType name="java.util.Calendar" xmlType="xs:date" parseMethod="javax.xml.bind.DatatypeConverter.parseDate" printMethod="javax.xml.bind.DatatypeConverter.printDate"/>
<javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="javax.xml.bind.DatatypeConverter.parseDate" printMethod="javax.xml.bind.DatatypeConverter.printDate"/>
<javaType name="java.util.Calendar" xmlType="xs:date" parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate" printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
<javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="jakarta.xml.bind.DatatypeConverter.parseDate" printMethod="jakarta.xml.bind.DatatypeConverter.printDate"/>
</globalBindings>
</bindings>
5 changes: 5 additions & 0 deletions jrecordbind/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<url>https://jrecordbind.org</url>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion jrecordbind/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
exports org.fissore.jrecordbind.util;

requires java.logging;
requires com.sun.xml.bind;
requires jakarta.xml.bind;
requires com.sun.xml.xsom;
requires org.glassfish.jaxb.core;

}
10 changes: 7 additions & 3 deletions jrecordbind/src/main/java/org/fissore/jrecordbind/Evaluators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

package org.fissore.jrecordbind;

import com.sun.xml.bind.api.impl.NameConverter;
import org.glassfish.jaxb.core.api.impl.NameConverter;
import com.sun.xml.xsom.*;
import org.fissore.jrecordbind.RecordDefinition.Property;

Expand All @@ -31,6 +31,9 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;

import static org.fissore.jrecordbind.Constants.JRECORDBIND_XSD;

Expand Down Expand Up @@ -206,8 +209,9 @@ static final class Type implements Evaluator<Property, XSType> {
XML_TYPE_TO_JAVA_TYPE.put("decimal", BigDecimal.class.getName());
XML_TYPE_TO_JAVA_TYPE.put("base64Binary", "byte[]");
XML_TYPE_TO_JAVA_TYPE.put("short", Short.class.getName());
XML_TYPE_TO_JAVA_TYPE.put("date", Date.class.getName());
XML_TYPE_TO_JAVA_TYPE.put("dateTime", Date.class.getName());
XML_TYPE_TO_JAVA_TYPE.put("date", LocalDate.class.getName());
XML_TYPE_TO_JAVA_TYPE.put("dateTime", LocalDateTime.class.getName());
XML_TYPE_TO_JAVA_TYPE.put("time", LocalTime.class.getName());
}

public void eval(Property target, XSType source) {
Expand Down
2 changes: 1 addition & 1 deletion jrecordbind/src/main/java/org/fissore/jrecordbind/PropertyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

package org.fissore.jrecordbind;

import com.sun.xml.bind.api.impl.NameConverter;
import org.glassfish.jaxb.core.api.impl.NameConverter;

import java.lang.reflect.Method;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion jrecordbind/src/main/java/org/fissore/jrecordbind/Visitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

package org.fissore.jrecordbind;

import com.sun.xml.bind.api.impl.NameConverter;
import org.glassfish.jaxb.core.api.impl.NameConverter;
import com.sun.xml.xsom.*;
import org.fissore.jrecordbind.RecordDefinition.Property;

Expand Down
22 changes: 11 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,20 +137,20 @@

<javadoc.url>https://docs.oracle.com/javase/11/docs/api/</javadoc.url>

<jaxb.version>2.3.2</jaxb.version>
<jaxb.version>4.0.2</jaxb.version>
<junit.version>4.13.2</junit.version>

<maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
<maven-jaxb2-plugin.version>4.0.8</maven-jaxb2-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-site-plugin.version>3.12.0</maven-site-plugin.version>
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-project-info-reports-plugin-bcel.version>6.3.1</maven-project-info-reports-plugin-bcel.version>
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
<maven-project-info-reports-plugin-bcel.version>6.10.0</maven-project-info-reports-plugin-bcel.version>
<minimum-maven.version>3.6.0</minimum-maven.version>
</properties>

Expand Down