Skip to content

Commit b363106

Browse files
authored
Fix jakarta-koordinater på generert kode (#381)
1 parent 5858069 commit b363106

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

inntektsmelding/pom.xml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313

1414
<properties>
1515
<xsd.packagename></xsd.packagename>
16-
<jaxb.version>2.4.0-b180830.0438</jaxb.version>
1716
</properties>
1817

1918
<dependencies>
2019
<dependency>
2120
<groupId>org.glassfish.jaxb</groupId>
2221
<artifactId>jaxb-runtime</artifactId>
23-
<version>${jaxb.version}</version>
22+
<version>4.0.3</version>
2423
<scope>provided</scope>
2524
</dependency>
2625
</dependencies>
@@ -53,7 +52,7 @@
5352
<dependency>
5453
<groupId>org.glassfish.jaxb</groupId>
5554
<artifactId>jaxb-xjc</artifactId>
56-
<version>${jaxb.version}</version>
55+
<version>2.4.0-b180830.0438</version>
5756
</dependency>
5857
<dependency>
5958
<groupId>javax.xml.bind</groupId>
@@ -63,10 +62,27 @@
6362
<dependency>
6463
<groupId>com.sun.xml.bind</groupId>
6564
<artifactId>jaxb-impl</artifactId>
66-
<version>${jaxb.version}</version>
65+
<version>2.4.0-b180830.0438</version>
6766
</dependency>
6867
</dependencies>
6968
</plugin>
69+
<plugin>
70+
<artifactId>maven-antrun-plugin</artifactId>
71+
<executions>
72+
<execution>
73+
<!-- så lenge plugin for å generere java-klasser ikke støtter å generere med jakarta-koordinater for importene, må det fikses slik -->
74+
<phase>process-sources</phase>
75+
<configuration>
76+
<target>
77+
<replace token= "javax.xml.bind" value="jakarta.xml.bind" dir="target/generated-sources/jaxb/no" summary="true" failOnNoReplacements="true" />
78+
</target>
79+
</configuration>
80+
<goals>
81+
<goal>run</goal>
82+
</goals>
83+
</execution>
84+
</executions>
85+
</plugin>
7086

7187
<plugin>
7288
<groupId>org.apache.maven.plugins</groupId>

inntektsmelding/src/main/java/no/seres/xsd/nav/inntektsmelding_m/DateAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.time.format.DateTimeParseException;
66
import java.util.Objects;
77

8-
import javax.xml.bind.annotation.adapters.XmlAdapter;
8+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
99

1010
public class DateAdapter extends XmlAdapter<String, LocalDate> {
1111

inntektsmelding/src/main/java/no/seres/xsd/nav/inntektsmelding_m/DateTimeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.time.format.DateTimeParseException;
66
import java.util.Objects;
77

8-
import javax.xml.bind.annotation.adapters.XmlAdapter;
8+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
99

1010
public class DateTimeAdapter extends XmlAdapter<String, LocalDateTime> {
1111

0 commit comments

Comments
 (0)