Commit b0bdd91b authored by Matthias Betz's avatar Matthias Betz
Browse files

revert to old javax imports because of citygml4j

parent 0d3d43e0
Pipeline #1892 passed with stage
in 3 minutes and 6 seconds
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class RingReport { public class RingReport {
......
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class Statistics { public class Statistics {
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class SurfaceReport { public class SurfaceReport {
......
...@@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ValidationPlan { public class ValidationPlan {
......
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ValidationResults { public class ValidationResults {
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class VertexReport { public class VertexReport {
......
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
}) })
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNs;
import jakarta.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlNsForm;
import jakarta.xml.bind.annotation.XmlSchema; import javax.xml.bind.annotation.XmlSchema;
\ No newline at end of file \ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
package de.hft.stuttgart.citydoctor2.marshaller; package de.hft.stuttgart.citydoctor2.marshaller;
import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlAdapter;
public class DoubleAdapter extends XmlAdapter<String, Double> { public class DoubleAdapter extends XmlAdapter<String, Double> {
......
...@@ -21,7 +21,7 @@ package de.hft.stuttgart.citydoctor2.marshaller; ...@@ -21,7 +21,7 @@ package de.hft.stuttgart.citydoctor2.marshaller;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import jakarta.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlAdapter;
public class ZonedDateTimeAdapter extends XmlAdapter<String, ZonedDateTime> { public class ZonedDateTimeAdapter extends XmlAdapter<String, ZonedDateTime> {
......
...@@ -148,12 +148,12 @@ ...@@ -148,12 +148,12 @@
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId> <artifactId>jaxb-impl</artifactId>
<version>3.0.0</version> <version>2.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>3.0.0</version> <version>2.3.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment