Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
0d3d43e0
Commit
0d3d43e0
authored
Jan 22, 2021
by
Matthias Betz
Browse files
updating jaxb dependencies to latest jakarta release
parent
b3aa90b9
Pipeline
#1888
passed with stage
in 1 minute and 56 seconds
Changes
32
Pipelines
1
Show whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorCheckResult/pom.xml
View file @
0d3d43e0
...
...
@@ -18,16 +18,13 @@
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.sun.xml.bind
</groupId>
<artifactId>
jaxb-core
</artifactId>
</dependency>
<dependency>
<groupId>
javax.xml.bind
</groupId>
<artifactId>
jaxb-api
</artifactId>
<groupId>
jakarta.xml.bind
</groupId>
<artifactId>
jakarta.xml.bind-api
</artifactId>
</dependency>
<dependency>
<groupId>
com.sun.xml.bind
</groupId>
<artifactId>
jaxb-impl
</artifactId>
<scope>
runtime
</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java
View file @
0d3d43e0
...
...
@@ -26,13 +26,6 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.Map
;
import
javax.xml.bind.JAXBContext
;
import
javax.xml.bind.JAXBException
;
import
javax.xml.bind.Marshaller
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlElement
;
import
javax.xml.bind.annotation.XmlRootElement
;
import
javax.xml.stream.XMLOutputFactory
;
import
javax.xml.stream.XMLStreamException
;
import
javax.xml.stream.XMLStreamWriter
;
...
...
@@ -42,6 +35,13 @@ import org.xml.sax.InputSource;
import
de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportParseException
;
import
de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportWriteException
;
import
de.hft.stuttgart.citydoctor2.checkresult.utility.IndentationXmlStreamWriter
;
import
jakarta.xml.bind.JAXBContext
;
import
jakarta.xml.bind.JAXBException
;
import
jakarta.xml.bind.Marshaller
;
import
jakarta.xml.bind.annotation.XmlAccessType
;
import
jakarta.xml.bind.annotation.XmlAccessorType
;
import
jakarta.xml.bind.annotation.XmlElement
;
import
jakarta.xml.bind.annotation.XmlRootElement
;
@XmlRootElement
(
name
=
"error_report"
)
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgeReport.java
View file @
0d3d43e0
...
...
@@ -18,10 +18,10 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
EdgeReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgesReport.java
View file @
0d3d43e0
...
...
@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
EdgesReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Environment.java
View file @
0d3d43e0
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Environment
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorDetails.java
View file @
0d3d43e0
...
...
@@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ErrorDetails
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorReport.java
View file @
0d3d43e0
...
...
@@ -18,10 +18,10 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ErrorReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorStatistic.java
View file @
0d3d43e0
...
...
@@ -18,10 +18,10 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlValue
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlValue
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ErrorStatistic
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Feature.java
View file @
0d3d43e0
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Feature
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/FeatureReport.java
View file @
0d3d43e0
...
...
@@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlElementWrapper
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlElementWrapper
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
FeatureReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GeometryReport.java
View file @
0d3d43e0
...
...
@@ -18,10 +18,10 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
GeometryReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java
View file @
0d3d43e0
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
GlobalErrorStatistics
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalStatistics.java
View file @
0d3d43e0
...
...
@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlElementWrapper
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlElementWrapper
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
GlobalStatistics
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Header.java
View file @
0d3d43e0
...
...
@@ -20,12 +20,11 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.time.ZonedDateTime
;
import
javax.xml.bind.annotation.XmlAccessType
;
import
javax.xml.bind.annotation.XmlAccessorType
;
import
javax.xml.bind.annotation.XmlElement
;
import
javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
;
import
de.hft.stuttgart.citydoctor2.marshaller.ZonedDateTimeAdapter
;
import
jakarta.xml.bind.annotation.XmlAccessType
;
import
jakarta.xml.bind.annotation.XmlAccessorType
;
import
jakarta.xml.bind.annotation.XmlElement
;
import
jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Header
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java
View file @
0d3d43e0
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ModelStatistics
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParameterReport.java
View file @
0d3d43e0
...
...
@@ -18,10 +18,10 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlValue
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlValue
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ParameterReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParentReport.java
View file @
0d3d43e0
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ParentReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanCheck.java
View file @
0d3d43e0
...
...
@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
PlanCheck
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanParameter.java
View file @
0d3d43e0
...
...
@@ -18,10 +18,10 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlValue
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlValue
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
PlanParameter
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonReport.java
View file @
0d3d43e0
...
...
@@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlElementWrapper
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlElementWrapper
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
PolygonReport
{
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment